OpkMan: Use Socket.IOTimeout in FPC 3.0.2. Clean and order uses sections.

git-svn-id: trunk@54351 -

components/onlinepackagemanager/fpcmod/opkman_httpclient.pas

@@ -489,7 +489,7 @@ procedure TFPCustomHTTPClient.SetIOTimeout(AValue: Integer);
 begin
   if AValue=FIOTimeout then exit;
   FIOTimeout:=AValue;
-  {$IFDEF FPC311}
+  {$IFDEF FPC302}
    if Assigned(FSocket) then
      FSocket.IOTimeout:=AValue;
   {$ENDIF}
@@ -596,7 +596,7 @@ begin
   G:=GetSocketHandler(UseSSL);    
   FSocket:=TInetSocket.Create(AHost,APort,G);
   try
-    {$IFDEF FPC311}
+    {$IFDEF FPC302}
     if FIOTimeout<>0 then
       FSocket.IOTimeout:=FIOTimeout;
     {$ENDIF}

components/onlinepackagemanager/opkman_categoriesfrm.pas

@@ -28,8 +28,11 @@ unit opkman_categoriesfrm;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
+  Classes, SysUtils,
-  StdCtrls, opkman_VirtualTrees;
+  // LCL
+  Forms, Controls, Graphics, ExtCtrls, StdCtrls,
+  // OpkMan
+  opkman_const, opkman_common, opkman_VirtualTrees;
 
 type
 
@@ -72,7 +75,7 @@ var
   CategoriesFrm: TCategoriesFrm;
 
 implementation
-uses opkman_const, opkman_common;
+
 {$R *.lfm}
 
 type

components/onlinepackagemanager/opkman_common.pas

@@ -29,8 +29,11 @@ unit opkman_common;
 interface
 
 uses
-  Classes, SysUtils, Dialogs, Forms, Controls, LazIDEIntf, LazFileUtils, contnrs,
+  Classes, SysUtils, contnrs,
-  opkman_const;
+  // LCL
+  Dialogs, Forms, Controls, LazIDEIntf, LazFileUtils,
+  // OpkMan
+  opkman_const, opkman_options;
 
 type
   TPackageAction = (paDownloadTo, paInstall, paUpdate);
@@ -122,7 +125,6 @@ procedure FindAllFilesEx(const ADirName: String; AFileList: TStrings);
 function FixProtocol(const AURL: String): String;
 
 implementation
-uses opkman_options;
 
 function MessageDlgEx(const AMsg: string; ADlgType: TMsgDlgType;
   AButtons: TMsgDlgButtons; AParent: TForm): TModalResult;

components/onlinepackagemanager/opkman_createjsonforupdates.pas

@@ -28,9 +28,12 @@ unit opkman_createjsonforupdates;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
+  Classes, SysUtils, fpjson,
-  StdCtrls, EditBtn, LCLIntf, MaskEdit, fpjson,
+  // LCL
-  opkman_VirtualTrees, opkman_serializablepackages;
+  Forms, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls, LCLIntf,
+  // OpkMan
+  opkman_serializablepackages, opkman_const, opkman_common, opkman_updates,
+  opkman_VirtualTrees;
 
 type
 
@@ -75,7 +78,7 @@ var
   CreateJSONForUpdatesFrm: TCreateJSONForUpdatesFrm;
 
 implementation
-uses opkman_const, opkman_common, opkman_updates;
+
 {$R *.lfm}
 
 { TCreateJSONForUpdatesFrm }

components/onlinepackagemanager/opkman_createrepositorypackage.pas

@@ -28,8 +28,10 @@ unit opkman_createrepositorypackage;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, opkman_createrepositorypackagefr, Forms,
+  // LCL
-  Controls, Graphics, Dialogs, ExtCtrls;
+  Forms,
+  // OpkMan
+  opkman_const, opkman_createrepositorypackagefr;
 
 type
 
@@ -50,7 +52,6 @@ var
 
 implementation
 
-uses opkman_const;
 {$R *.lfm}
 
 { TCreateRepositoryPackagesFrm }

components/onlinepackagemanager/opkman_downloader.pas

@@ -31,10 +31,11 @@ unit opkman_downloader;
 interface
 
 uses
-  Classes, SysUtils, fpjson, opkman_timer, opkman_common, opkman_serializablepackages,
+  Classes, SysUtils, fpjson,
+  // OpkMan
+  opkman_timer, opkman_common, opkman_serializablepackages, opkman_const, opkman_options,
   {$IFDEF FPC311}fphttpclient{$ELSE}opkman_httpclient{$ENDIF};
 
-
 type
   TDownloadType = (dtJSON, dtPackage, dtUpdate);
   TErrorType = (etNone, etConfig, etTimeOut, etHTTPClient);
@@ -182,8 +183,6 @@ var
 
 implementation
 
-uses opkman_const, opkman_options;
-
 { TDownloadStream }
 constructor TDownloadStream.Create(AStream: TStream);
 begin

components/onlinepackagemanager/opkman_fpcdef.inc

@@ -1,7 +1,11 @@
 {$IF FPC_VERSION = 3}
-  {$IF FPC_RELEASE > 0}
+  {$IF FPC_RELEASE = 0}
-   {$IF FPC_PATCH > 0}
+    {$IF FPC_PATCH > 1}
-     {$DEFINE FPC311}
+      {$DEFINE FPC302}
+    {$ENDIF}
+  {$ELSE}
+    {$IF FPC_PATCH > 0}
+      {$DEFINE FPC311}
     {$ENDIF}
   {$ENDIF}
-{$ENDIF}
+{$ENDIF}

components/onlinepackagemanager/opkman_installer.pas

@@ -31,10 +31,13 @@ unit opkman_installer;
 interface
 
 uses
-  Classes, SysUtils, contnrs, Controls, Forms, PackageIntf, LCLVersion,
+  Classes, SysUtils, contnrs,
-  opkman_serializablepackages;
+  // LCL
-
+  Controls, LCLVersion,
-
+  // IdeIntf
+  PackageIntf,
+  // OpkMan
+  opkman_serializablepackages, opkman_const, opkman_common;
 
 type
   TInstallStatus = (isSuccess, isPartiallyFailed, isFailed);
@@ -86,7 +89,6 @@ var
 
 implementation
 
-uses opkman_const, opkman_common;
 { TPackageInstaller }
 
 constructor TPackageInstaller.Create;

components/onlinepackagemanager/opkman_mainfrm.pas

@@ -29,10 +29,20 @@ unit opkman_mainfrm;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, contnrs,
+  Classes, SysUtils, contnrs, fpjson, md5,
-  StdCtrls, ExtCtrls, Buttons, Menus, ComCtrls, IDECommands, LazFileUtils,
+  // LCL
-  LCLIntf, fpjson, opkman_VirtualTrees, opkman_downloader, opkman_installer,
+  Forms, Controls, Dialogs, StdCtrls, ExtCtrls, Buttons, Menus, ComCtrls, Clipbrd,
-  PackageIntf, Clipbrd, md5;
+  LCLIntf, LCLVersion,
+  // LazUtils
+  LazFileUtils,
+  // IdeIntf
+  IDECommands,
+  // OpkMan
+  opkman_VirtualTrees, opkman_downloader, opkman_installer,
+  opkman_serializablepackages, opkman_visualtree, opkman_const, opkman_common,
+  opkman_progressfrm, opkman_zipper, opkman_packagelistfrm, opkman_options,
+  opkman_optionsfrm, opkman_createrepositorypackage, opkman_updates,
+  opkman_createjsonforupdates;
 
 type
 
@@ -145,11 +155,6 @@ var
 
 implementation
 
-uses LCLVersion,
-     opkman_serializablepackages, opkman_visualtree, opkman_const, opkman_common,
-     opkman_progressfrm, opkman_zipper, opkman_packagelistfrm, opkman_options,
-     opkman_optionsfrm, opkman_createrepositorypackage, opkman_updates,
-     opkman_createjsonforupdates;
 {$R *.lfm}
 
 { TMainFrm }

components/onlinepackagemanager/opkman_options.pas

@@ -27,7 +27,13 @@ unit opkman_options;
 interface
 
 uses
-  Classes, SysUtils, LazIDEIntf, Laz2_XMLCfg, LazFileUtils;
+  Classes, SysUtils,
+  // LazUtils
+  Laz2_XMLCfg, LazFileUtils,
+  // IdeIntf
+  LazIDEIntf,
+  // OpkMan
+  opkman_const;
 
 const
   OpkVersion = 1;
@@ -107,7 +113,6 @@ var
   Options: TOptions = nil;
 
 implementation
-uses opkman_const;
 
 { TOptions }
 

components/onlinepackagemanager/opkman_optionsfrm.pas

@@ -30,8 +30,13 @@ unit opkman_optionsfrm;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, opkman_VirtualTrees, Forms, Controls, Graphics, Dialogs,
+  SysUtils, Math,
-  StdCtrls, ExtCtrls, Spin, ComCtrls, Buttons, EditBtn, LazFileUtils, Math;
+  // LCL
+  Forms, Controls, Dialogs, StdCtrls, ExtCtrls, Spin, ComCtrls, EditBtn,
+  // LazUtils
+  LazFileUtils,
+  // OpkMan
+  opkman_options, opkman_common, opkman_const, opkman_repositories;
 
 type
 
@@ -121,7 +126,7 @@ var
   OptionsFrm: TOptionsFrm;
 
 implementation
-uses opkman_options, opkman_common, opkman_const, opkman_repositories;
+
 {$R *.lfm}
 
 { TOptionsFrm }

components/onlinepackagemanager/opkman_packagedetailsfrm.pas

@@ -28,8 +28,8 @@ unit opkman_packagedetailsfrm;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
+  // LCL
-  ExtCtrls;
+  Forms, StdCtrls, ExtCtrls;
 
 type
 

components/onlinepackagemanager/opkman_packagelistfrm.pas

@@ -26,8 +26,11 @@ unit opkman_packagelistfrm;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
+  SysUtils,
-  StdCtrls, opkman_VirtualTrees;
+  // LCL
+  Forms, Controls, Graphics, ExtCtrls, StdCtrls,
+  // OpkMan
+  opkman_VirtualTrees, opkman_const, opkman_serializablepackages;
 
 type
 
@@ -69,7 +72,6 @@ var
   PackageListFrm: TPackageListFrm;
 
 implementation
-uses opkman_const, opkman_serializablepackages;
 
 {$R *.lfm}
 

components/onlinepackagemanager/opkman_progressfrm.pas

@@ -27,8 +27,12 @@ unit opkman_progressfrm;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
+  SysUtils,
-  StdCtrls, ExtCtrls, opkman_serializablepackages, opkman_installer, opkman_VirtualTrees;
+  // LCL
+  Forms, Controls, Graphics, Dialogs, ComCtrls, StdCtrls, ExtCtrls,
+  // OpkMan
+  opkman_installer, opkman_common, opkman_const, opkman_downloader, opkman_zipper,
+  opkman_VirtualTrees;
 
 type
 
@@ -102,7 +106,7 @@ var
   ProgressFrm: TProgressFrm;
 
 implementation
-uses opkman_common, opkman_const, opkman_downloader, opkman_zipper;
+
 {$R *.lfm}
 
 { TProgressFrm }

components/onlinepackagemanager/opkman_repositories.pas

@@ -28,8 +28,11 @@ unit opkman_repositories;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
+  Classes, SysUtils,
-  StdCtrls, Menus, opkman_VirtualTrees;
+  // LCL
+  Forms, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls,
+  // OpkMan
+  opkman_const, opkman_common, opkman_options, opkman_VirtualTrees;
 
 type
 
@@ -74,7 +77,7 @@ var
   RepositoriesFrm: TRepositoriesFrm;
 
 implementation
-uses opkman_const, opkman_common, opkman_options;
+
 {$R *.lfm}
 
 type

components/onlinepackagemanager/opkman_serializablepackages.pas

@@ -31,8 +31,13 @@ unit opkman_serializablepackages;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Variants, fpjson, jsonparser, contnrs,
+  Classes, SysUtils, Variants, contnrs, dateutils, fpjson, jsonparser,
-  PackageIntf, Laz2_XMLCfg, LazFileUtils, dateutils;
+  // LazUtils
+  FileUtil, Laz2_XMLCfg, LazFileUtils,
+  // IdeIntf
+  PackageIntf,
+  // OpkMan
+  opkman_common, opkman_const, opkman_options;
 
 
 type
@@ -312,7 +317,6 @@ var
 
 
 implementation
-uses opkman_common, opkman_const, opkman_options;
 
 { TPackageVersion }
 

components/onlinepackagemanager/opkman_timer.pas

@@ -29,7 +29,6 @@ interface
 uses
   Classes, SysUtils;
 
-
 type
    { TThreadTimer }
    TThreadTimer = class(TThread)

components/onlinepackagemanager/opkman_updates.pas

@@ -30,8 +30,12 @@ unit opkman_updates;
 interface
 
 uses
-  Classes, SysUtils, LazIDEIntf, Laz2_XMLCfg, LazFileUtils, fpjson, fpjsonrtti,
+  Classes, SysUtils, fpjson, fpjsonrtti, dateutils,
-  opkman_timer, opkman_serializablepackages, dateutils,
+  // LazUtils
+  Laz2_XMLCfg,
+  // OpkMan
+  opkman_timer, opkman_serializablepackages,
+  opkman_options, opkman_common,
   {$IFDEF FPC311}fphttpclient{$ELSE}opkman_httpclient{$ENDIF};
 
 const
@@ -131,9 +135,6 @@ var
 
 implementation
 
-uses opkman_options, opkman_common, opkman_const,
-     {$IFDEF FPC311}zipper{$ELSE}opkman_zip{$ENDIF};
-
 { TUpdatePackage }
 
 procedure TUpdatePackage.Clear;
@@ -403,9 +404,11 @@ begin
 end;
 
 procedure TUpdates.CheckForOpenSSL;
+{$IFDEF MSWINDOWS}
 var
   ZipFile: String;
   UnZipper: TUnZipper;
+{$ENDIF}
 begin
   {$IFDEF MSWINDOWS}
    FOpenSSLAvaialable := FileExistsUTF8(ExtractFilePath(ParamStr(0)) + 'libeay32.dll') and

components/onlinepackagemanager/opkman_uploader.pas

@@ -31,11 +31,13 @@ unit opkman_uploader;
 interface
 
 uses
- Classes, SysUtils, fpjson, base64, LazFileUtils,
+ Classes, SysUtils, base64,
+ // LazUtils
+ LazFileUtils,
+ // OpkMan
+ opkman_options, opkman_const,
  {$IFDEF FPC311}fphttpclient{$ELSE}opkman_httpclient{$ENDIF};
 
-
-
 type
  TOnUploadProgress = procedure(Sender: TObject; AFileName: String) of object;
  TOnUploadError = procedure(Sender: TObject; AErrMsg: String) of object;
@@ -78,7 +80,6 @@ var
  Uploader: TUploader = nil;
 
 implementation
-uses opkman_options, opkman_const;
 
 { TUploader }
 

components/onlinepackagemanager/opkman_visualtree.pas

@@ -30,9 +30,12 @@ unit opkman_visualtree;
 interface
 
 uses
-  Classes, SysUtils, Controls, Graphics, Menus, Dialogs, Forms, LCLIntf, contnrs,
+  Classes, SysUtils, contnrs, Math, dateutils,
-  PackageIntf, Buttons, Math, dateutils, opkman_VirtualTrees, opkman_common,
+  // LCL
-  opkman_serializablepackages;
+  Controls, Graphics, Menus, Dialogs, Forms, LCLIntf, Buttons,
+  // OpkMan
+  opkman_VirtualTrees, opkman_common, opkman_serializablepackages, opkman_const,
+  opkman_options, opkman_packagedetailsfrm;
 
 
 type
@@ -161,7 +164,6 @@ var
   VisualTree: TVisualTree = nil;
 
 implementation
-uses opkman_const, opkman_options, opkman_packagedetailsfrm;
 
 { TVisualTree }
 

components/onlinepackagemanager/opkman_zipper.pas

@@ -31,7 +31,11 @@ unit opkman_zipper;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LazFileUtils, strutils, opkman_timer,
+  Classes, SysUtils, strutils,
+  // LazUtils
+  FileUtil, LazFileUtils,
+  // OpkMan
+  opkman_timer, opkman_serializablepackages, opkman_common,
   {$IFDEF FPC311}zipper{$ELSE}opkman_zip{$ENDIF};
 
 type
@@ -117,8 +121,6 @@ var
 
 implementation
 
-uses opkman_serializablepackages, opkman_common;
-
 { TPackageUnZipper }
 
 procedure TPackageUnzipper.DoOnZipProgress;