UPD: Cleanup, silence some warnings.

components/viewer/unicodeutils.pas

@@ -396,12 +396,10 @@ end;
 
 function Utf8ReplaceBroken(const s: UTF8String): UTF8String;
 var
-  i: Integer;
   Src, Dst, LastGoodPos: PByte;
   BytesLeft: Integer;
   InvalidCharLen: Integer;
   CharLen: Integer;
-  GoodLen: Integer = 0;
 begin
   if Length(s) = 0 then
     Exit(s);
@@ -452,4 +450,4 @@ begin
 end;
 
 end.
-
+

src/doublecmd.lpr

@@ -20,7 +20,6 @@ uses
   uGlobs,
   fHackForm,
   fMain,
-  fAbout,
   fMkDir,
   dmHigh, dmHelpManager, dmCommonData,
   uShowMsg,
@@ -103,4 +102,4 @@ begin
      end;
 
   DebugLn('Finished Double Commander');
-end.
+end.

src/fAbout.pas

@@ -19,7 +19,6 @@ unit fAbout;
 interface
 
 uses
-  LResources,
   Graphics, Forms, Controls,  StdCtrls, ExtCtrls,
   SysUtils, Classes, LCLType;
 

src/fFileOpDlg.pas

@@ -18,7 +18,6 @@ unit fFileOpDlg;
 interface
 
 uses
-  LResources,
   SysUtils, Classes, Controls, Forms, StdCtrls, ComCtrls, Buttons, ExtCtrls,
   uOperationsManager, uFileSourceOperation, uFileSourceOperationUI, fViewOperations;
 

src/fMsg.pas

@@ -3,9 +3,7 @@ unit fMsg;
 interface
 
 uses
-  LResources,
-  SysUtils, Classes, Graphics, Controls, Forms,
-  Dialogs, StdCtrls, Buttons;
+  SysUtils, Classes, Controls, Forms, StdCtrls;
 
 var
   cButtonWidth: Integer = 90;

src/fattributesedit.pas

@@ -27,7 +27,7 @@ unit fAttributesEdit;
 interface
 
 uses
-  Classes, SysUtils, LResources, Forms, ExtCtrls, StdCtrls, Buttons;
+  Classes, SysUtils, Forms, ExtCtrls, StdCtrls, Buttons;
 
 type
 

src/fcalendar.pas

@@ -5,8 +5,7 @@ unit fCalendar;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  Calendar, LCLType;
+  Classes, SysUtils, Forms, Controls, Calendar;
 
 type
 
@@ -28,6 +27,9 @@ implementation
 
 {$R *.lfm}
 
+uses
+  LCLType;
+
 function ShowCalendarDialog(ADate: String; APosition: TPoint): String;
 var
   dtDate: TDateTime;

src/fchecksumcalc.pas

@@ -28,8 +28,7 @@ unit fCheckSumCalc;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, Buttons, uHash;
+  Classes, SysUtils, Forms, Controls, StdCtrls, Buttons, uHash;
 
 type
 

src/fchecksumverify.pas

@@ -28,8 +28,7 @@ unit fCheckSumVerify;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, Buttons;
+  Classes, SysUtils, Forms, StdCtrls, Buttons;
 
 type
 

src/fcolumnssetconf.pas

@@ -32,7 +32,7 @@ unit fColumnsSetConf;
 interface
 
 uses
-  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls,
+  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls,
   ExtCtrls, Buttons, Grids,  ComCtrls, Menus, LCLType, uColumns, uGlobs, Spin,
   uColumnsFileView,
   ColorBox;

src/fconfigtoolbar.pas

@@ -27,7 +27,7 @@ unit fConfigToolBar;
 interface
 
 uses
-  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Menus,
+  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, Menus,
   StdCtrls, Buttons, KASToolBar, ExtCtrls, ComCtrls, KASBarFiles;
 
 type
@@ -123,7 +123,7 @@ implementation
 {$R *.lfm}
 
 uses
-  ActnList, LCLProc, HelpIntfs, uClassesEx, uOSForms, uPixMapManager,
+  LCLProc, HelpIntfs, uClassesEx, uOSForms, uPixMapManager,
   uGlobsPaths, uGlobs, uDCUtils, uOSUtils;
 
 function ShowConfigToolbar(const aBarFileName: UTF8String; iButtonIndex : Integer = -1): Boolean;

src/fcopymovedlg.pas

@@ -5,8 +5,7 @@ unit fCopyMoveDlg;
 interface
 
 uses
-  LResources, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls,
-  Buttons, ExtCtrls, lclproc, EditBtn, ComCtrls, Menus,
+  SysUtils, Classes, Controls, Forms, StdCtrls, Buttons, ExtCtrls, Menus,
   uFileSystemCopyOperation, uFileSystemMoveOperation, uFileViewNotebook,
   uOperationsManager;
 

src/fdescredit.pas

@@ -27,8 +27,7 @@ unit fDescrEdit;
 interface
 
 uses
-  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  Buttons, uDescr;
+  Classes, SysUtils, Forms, Controls, StdCtrls, Buttons, uDescr;
 
 type
 

src/fdiffer.pas

@@ -28,9 +28,9 @@ unit fDiffer;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  Menus, ComCtrls, ActnList, ExtCtrls, EditBtn, StdCtrls, Buttons, StdActns,
-  SynEdit, uSynDiffControls, uPariterControls, uDiff;
+  Classes, SysUtils, FileUtil, Forms, Controls, Dialogs, Menus, ComCtrls,
+  ActnList, ExtCtrls, EditBtn, Buttons, SynEdit, uSynDiffControls,
+  uPariterControls, uDiff;
 
 type
 
@@ -810,8 +810,6 @@ begin
 end;
 
 procedure TfrmDiffer.OpenFileLeft(const FileName: UTF8String);
-var
-  fsFileStream: TFileStreamEx = nil;
 begin
   if not mbFileExists(FileName) then Exit;
   try
@@ -827,8 +825,6 @@ begin
 end;
 
 procedure TfrmDiffer.OpenFileRight(const FileName: UTF8String);
-var
-  fsFileStream: TFileStreamEx = nil;
 begin
   if not mbFileExists(FileName) then Exit;
   try

src/feditor.pas

@@ -19,10 +19,8 @@ unit fEditor;
 interface
 
 uses
-  LResources,
-  SysUtils, Classes, Graphics, Controls, Forms,
-  Dialogs, ActnList, Menus, SynEdit,
-  ComCtrls,  SynEditSearch, uClassesEx;
+  SysUtils, Classes, Controls, Forms, ActnList, Menus, SynEdit,
+  ComCtrls, SynEditSearch;
 
 type
 
@@ -183,10 +181,8 @@ implementation
 {$R *.lfm}
 
 uses
-  dmCommonData, dmHigh, uLng,
-  SynEditHighlighter, uShowMsg, fMsg, fEditSearch,
-  SynEditTypes, uGlobsPaths, uGlobs, fEditorConf, LCLType, LConvEncoding,
-  uOSUtils;
+  dmCommonData, dmHigh, SynEditHighlighter, SynEditTypes, LCLType, LConvEncoding,
+  uLng, uShowMsg, fEditSearch, uGlobsPaths, uGlobs, fEditorConf, uOSUtils, uClassesEx;
 
 procedure ShowEditor(const sFileName:String);
 var

src/feditorconf.pas

@@ -3,10 +3,8 @@ unit fEditorConf;
 interface
 
 uses
-  LResources,
-  SysUtils, Classes, Graphics, Controls, Forms,
-  Dialogs, StdCtrls, SynEditHighlighter, SynEditStrConst,
-  Grids, Buttons, ComCtrls, uGlobsPaths, SynEdit;
+  SysUtils, Classes, Graphics, Controls, Forms, StdCtrls, SynEditHighlighter, SynEditStrConst,
+  Grids, Buttons, uGlobsPaths, SynEdit;
 
 type
   TLittleAttr= Packed Record

src/feditsearch.pas

@@ -60,8 +60,7 @@ unit fEditSearch;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, ExtCtrls, Buttons;
+  Classes, SysUtils, Forms, Controls, StdCtrls, ExtCtrls, Buttons;
 
 type
 

src/fextractdlg.pas

@@ -28,7 +28,7 @@ unit fExtractDlg;
 interface
 
 uses
-  Classes, SysUtils, LResources, Forms, Controls, StdCtrls, EditBtn,
+  Classes, SysUtils, Forms, Controls, StdCtrls, EditBtn,
   uFile, uFileSource;
 
 type

src/ffileassoc.pas

@@ -27,7 +27,7 @@ unit fFileAssoc;
 interface
 
 uses
-  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs,
+  Classes, SysUtils, Forms, Controls, Graphics, Dialogs,
   StdCtrls, Buttons, ExtCtrls, EditBtn, uExts, ExtDlgs, Menus;
 
 type

src/ffileexecuteyourself.pas

@@ -28,8 +28,8 @@ unit fFileExecuteYourSelf;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, Buttons, uFile, uFileSource, uFileView;
+  Classes, SysUtils, Forms, Controls, StdCtrls, Buttons,
+  uFile, uFileSource, uFileView;
 
 type
 

src/ffindview.pas

@@ -18,9 +18,7 @@ unit fFindView;
 interface
 
 uses
-  LResources, LClType,
-  SysUtils, Classes, Graphics, Controls, Forms,
-  Dialogs, StdCtrls, Buttons;
+  SysUtils, Classes, Controls, Forms, StdCtrls, Buttons;
 
 type
   TfrmFindView = class(TForm)
@@ -44,7 +42,7 @@ implementation
 {$R *.lfm}
 
 uses
-  LCLProc, uDCUtils;
+  LCLProc, LCLType, uDCUtils;
 
 procedure TfrmFindView.FormShow(Sender: TObject);
 begin

src/fhackform.pas

@@ -5,7 +5,7 @@ unit fHackForm;
 interface
 
 uses
-  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs; 
+  Classes, SysUtils, Forms;
 
 type
 

src/fhardlink.pas

@@ -3,7 +3,6 @@ unit fHardLink;
 interface
 
 uses
-  LResources,
   SysUtils, Classes, Controls, Forms, StdCtrls, Buttons;
 
 type

src/fhotdir.pas

@@ -5,9 +5,7 @@ unit fHotDir;
 interface
 
 uses
-  LResources,
-  SysUtils, Classes, Graphics, Controls, Forms,
-  Dialogs, StdCtrls, Buttons;
+  SysUtils, Classes, Controls, Forms, StdCtrls, Buttons;
 
 type
   
@@ -48,7 +46,7 @@ implementation
 {$R *.lfm}
 
 uses
-  uDCUtils, uGlobs, uLng;
+  Dialogs, uDCUtils, uGlobs, uLng;
 
 procedure TfrmHotDir.LoadFromGlob;
 begin

src/flinker.pas

@@ -17,9 +17,7 @@ unit fLinker;
 interface
 
 uses
-  LResources,
-  SysUtils, Classes, Graphics, Controls, Forms,
-  Dialogs, StdCtrls, ComCtrls, Buttons;
+  SysUtils, Classes, Forms, Dialogs, StdCtrls, ComCtrls;
 
 type
   TfrmLinker = class(TForm)

src/fmain.pas

@@ -40,7 +40,6 @@ unit fMain;
 interface
 
 uses
-  LResources,
   Graphics, Forms, Menus, Controls, StdCtrls, ExtCtrls, ActnList,
   Buttons, SysUtils, Classes, SynEdit, LCLType, ComCtrls,
   KASToolBar, KASBarMenu, KASBarFiles,

src/fmaskinputdlg.pas

@@ -27,8 +27,7 @@ unit fMaskInputDlg;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, Buttons;
+  Classes, Forms, Controls, StdCtrls, Buttons;
 
 type
 

src/fmkdir.pas

@@ -5,9 +5,7 @@ unit fMkDir;
 interface
 
 uses
-  LResources,
-  SysUtils, Classes, Graphics, Controls, Forms,
-  Dialogs, StdCtrls, Buttons;
+  SysUtils, Classes, Controls, Forms, StdCtrls, Buttons;
 
 type
 
@@ -30,8 +28,6 @@ type
 var  frmMkDir: TfrmMkDir;  // 21.05.2009  - создаем из файла проекта
 
 implementation
-//uses      // 21.05.2009 - закомментировал неиспользуемый
-//  uLng;
 
 {$R *.lfm}
 
@@ -87,4 +83,4 @@ begin
   end;
 end;
 
-end.
+end.

src/fmodview.pas

@@ -5,9 +5,8 @@ unit fModView;
 interface
 
 uses
-  LResources, LClType,
-  SysUtils, Classes, Graphics, Controls, Forms,
-  Dialogs, StdCtrls, Buttons, FileUtil, ExtCtrls, ComCtrls;
+  SysUtils, Classes, Controls, Forms,
+  Dialogs, StdCtrls, Buttons, ExtCtrls, ComCtrls;
 
 type
 

src/fmultirename.pas

@@ -18,9 +18,7 @@ unit fMultiRename;
 interface
 
 uses
-  LResources,
-  SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  StdCtrls, ComCtrls, Menus, Buttons, SynRegExpr, LCLType,
+  SysUtils, Classes, Graphics, Forms, StdCtrls, ComCtrls, Menus, SynRegExpr,
   uClassesEx, uFile, uFileSource, StringHashList, uXmlConfig;
 
 type
@@ -1128,4 +1126,4 @@ begin
 end;
 
 end.
-
+

src/foptions.pas

@@ -31,7 +31,6 @@ unit fOptions;
 interface
 
 uses
-  LResources,
   SysUtils, Classes, Graphics, Controls, Forms,
   Dialogs, StdCtrls, ExtCtrls, ComCtrls, Buttons, Spin, ColorBox,
   EditBtn, Grids, uDSXModule, uWCXModule, uWDXModule,

src/fpackdlg.pas

@@ -28,8 +28,7 @@ unit fPackDlg;
 interface
 
 uses
-  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  Buttons, EditBtn, ExtCtrls, uWcxArchiveFileSource,
+  SysUtils, Forms, Controls, Dialogs, StdCtrls, EditBtn, ExtCtrls, uWcxArchiveFileSource,
   uArchiveFileSource, uFile, uFileSource;
 
 type

src/fpackinfodlg.pas

@@ -28,7 +28,7 @@ unit fPackInfoDlg;
 interface
 
 uses
-  SysUtils, Classes, LResources, Forms, StdCtrls, ExtCtrls, Controls,
+  SysUtils, Classes, Forms, StdCtrls, ExtCtrls, Controls,
   uFile, uArchiveFileSource, uFileSourceExecuteOperation;
 
 type

src/fsetfileproperties.pas

@@ -27,9 +27,8 @@ unit fSetFileProperties;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  ExtCtrls, ComCtrls, StdCtrls, Buttons, EditBtn,
-  uFileProperty, uFileSourceSetFilePropertyOperation, uTypes;
+  Classes, SysUtils, Forms, Controls, ExtCtrls, ComCtrls, StdCtrls, Buttons,
+  EditBtn, uFileSourceSetFilePropertyOperation, uTypes;
 
 type
 
@@ -115,7 +114,7 @@ implementation
 {$R *.lfm}
 
 uses
-  LCLType, fCalendar, uFileAttributes, uDCUtils;
+  LCLType, fCalendar, uFileAttributes, uDCUtils, uFileProperty;
 
 function ShowChangeFilePropertiesDialog(const aOperation: TFileSourceSetFilePropertyOperation): Boolean;
 begin
@@ -304,4 +303,4 @@ begin
 end;
 
 end.
-
+

src/fsplitter.pas

@@ -11,13 +11,13 @@ contributors:
 }
 
 unit fSplitter;
+
 {$mode objfpc}{$H+}
+
 interface
 
 uses
-  LResources,
-  SysUtils, Classes, Graphics, Controls, Forms,
-  Dialogs, StdCtrls, ComCtrls, Buttons;
+  SysUtils, Classes, Controls, Forms, Dialogs, StdCtrls, ComCtrls;
 
 type
 

src/fsymlink.pas

@@ -3,7 +3,6 @@ unit fSymLink;
 interface
 
 uses
-  LResources,
   SysUtils, Classes, Controls, Forms, StdCtrls, Buttons;
 
 type

src/ftweakplugin.pas

@@ -28,8 +28,8 @@ unit fTweakPlugin;
 interface
 
 uses
-  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, ExtCtrls,
-  StdCtrls, uTypes, uWCXModule;
+  Classes, SysUtils, Forms, Controls, ExtCtrls, StdCtrls,
+  uWCXModule, uTypes;
 
 type
 
@@ -98,7 +98,7 @@ implementation
 {$R *.lfm}
 
 uses
-  fOptions, WcxPlugin, uDCUtils, uLng, LCLVersion;
+  Dialogs, fOptions, WcxPlugin, uDCUtils, uLng, LCLVersion;
 
 function ShowTweakPluginDlg(PluginType: TPluginType; PluginIndex: Integer): Boolean;
 var
@@ -345,4 +345,4 @@ begin
 end;
 
 end.
-
+

src/fviewer.pas

@@ -37,8 +37,8 @@ unit fViewer;
 interface
 
 uses
-  LResources, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls, ComCtrls,
-  LCLProc, Menus, Dialogs, ExtDlgs, EditBtn, StdCtrls, Buttons, ColorBox, Spin,
+  SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls, ComCtrls,
+  LCLProc, Menus, Dialogs, ExtDlgs, StdCtrls, Buttons, ColorBox, Spin,
   Grids, viewercontrol, GifAnim, fFindView, WLXPlugin, uWLXModule,
   uFileSource, fModView, uOSUtils, Types, uThumbnails;
 
@@ -742,8 +742,6 @@ begin
 end;
 
 procedure TfrmViewer.miSaveAsClick(Sender: TObject);
-var
-  sFile: string;
 begin
   if not Assigned(FModSizeDialog) then
      FModSizeDialog:= TfrmModView.Create(Application);
@@ -910,7 +908,7 @@ end;
 
 procedure TfrmViewer.CheckXY;
 var
-  tmp, RealWidth, RealHeight: integer;
+  tmp: integer;
 begin
   if EndX<StartX then
     begin
@@ -1158,7 +1156,6 @@ procedure TfrmViewer.DrawPreviewDrawCell(Sender: TObject; aCol, aRow: Integer;
 var
   i,z,t: Integer;
   sExt, sName, shortName: UTF8String;
-  c: AnsiChar;
   bmpThumb: TBitmap;
 begin
   i:= (aRow * DrawPreview.ColCount) + aCol; // Calculate FileList index

src/newdesign/fviewoperations.pas

@@ -5,7 +5,7 @@ unit fViewOperations;
 interface
 
 uses
-  Classes, SysUtils, LResources, Forms, Controls, Graphics, StdCtrls, ExtCtrls,
+  Classes, SysUtils, Forms, Controls, Graphics, StdCtrls, ExtCtrls,
   ComCtrls, Buttons, uFileSourceOperation, uOperationsManager;
 
 type

src/newdesign/ucolumnsfileview.pas

@@ -487,7 +487,6 @@ uses
   uDCUtils, uOSUtils, math, fMain, fMaskInputDlg, uSearchTemplate,
   uInfoToolTip, dmCommonData,
   uFileSourceProperty,
-  uFileSourceOperation,
   uFileSourceOperationTypes,
   uFileSystemFileSource,
   fColumnsSetConf,

src/newdesign/ufilesource.pas

@@ -178,7 +178,7 @@ type
     constructor Create; virtual;
     destructor Destroy; override;
 
-    function Equals(aFileSource: IFileSource): Boolean;
+    function Equals(aFileSource: IFileSource): Boolean; overload;
     function IsInterface(InterfaceGuid: TGuid): Boolean;
     function IsClass(aClassType: TClass): Boolean;
     function GetClassName: String; // For debugging purposes.

src/newdesign/ufilesourceutil.pas

@@ -62,7 +62,7 @@ begin
     sOpenCmd:= gExts.GetExtActionCmd(aFile, 'open');
     if (sOpenCmd<>'') then
     begin
-{
+(*
       if Pos('{!VFS}',sOpenCmd)>0 then
       begin
         if fVFS.FindModule(sName) then
@@ -71,7 +71,7 @@ begin
           Exit;
         end;
       end;
-}
+*)
       ReplaceExtCommand(sOpenCmd, aFile, aFileView.CurrentPath);
       if ProcessExtCommand(sOpenCmd, aFileView.CurrentPath) then
         Exit;

src/newdesign/ufilesystemcalcchecksumoperation.pas

@@ -54,7 +54,7 @@ implementation
 uses
   uDCUtils, uOSUtils, uLng,
   uFileSystemUtil, LCLProc,
-  FileUtil, StrUtils, fCheckSumVerify,
+  FileUtil, StrUtils,
   uFileSystemFileSource;
 
 type

src/newdesign/uoperationsmanager.pas

@@ -5,8 +5,7 @@ unit uOperationsManager;
 interface
 
 uses
-  Classes, SysUtils, ExtCtrls, LCLIntf, uLng,
-  uOperationThread, uFileSourceOperation, lclproc;
+  Classes, SysUtils, uLng, uOperationThread, uFileSourceOperation;
 
 type
 

src/newdesign/uwcxarchivelistoperation.pas

@@ -23,7 +23,7 @@ type
 implementation
 
 uses
-  LCLProc, uOSUtils, uDCUtils, uWCXmodule, uFile;
+  uOSUtils, uDCUtils, uWCXmodule, uFile;
 
 constructor TWcxArchiveListOperation.Create(aFileSource: IFileSource; aPath: String);
 begin

src/platform/uClipboard.pas

@@ -76,7 +76,7 @@ implementation
 
 uses
 {$IFDEF MSWINDOWS}
-  Windows, Win32Proc, ActiveX, uOleDragDrop, fMain;
+  Windows, ActiveX, uOleDragDrop, fMain;
 {$ELSE IFDEF UNIX}
   LCLIntf, Clipbrd;
 {$ENDIF}

src/platform/uOSUtils.pas

@@ -27,7 +27,7 @@ unit uOSUtils;
 interface
 
 uses
-    SysUtils, Classes, LCLProc, LCLType, uClassesEx, uTypes
+    SysUtils, Classes, LCLType, uClassesEx, uTypes
     {$IF DEFINED(UNIX)}
     , uFileAttributes
       {$IFDEF DARWIN}
@@ -279,7 +279,7 @@ procedure FixFormIcon(Handle: LCLType.HWND);
 implementation
 
 uses
-  FileUtil, uDCUtils, uGlobs
+  LCLProc, FileUtil, uDCUtils, uGlobs
   {$IF DEFINED(MSWINDOWS)}
   , Windows, uNTFSLinks, uMyWindows, JwaWinNetWk, uShlObjAdditional
   {$ENDIF}
@@ -1815,4 +1815,4 @@ begin
 {$ENDIF}
 end;
 
-end.
+end.

src/platform/uicontheme.pas

@@ -102,14 +102,14 @@ const
 
 function LookupFallbackIcon (AIconName: String): UTF8String;
 begin
-{
+(*
   for each directory in $(basename list) {
     for extension in ("png", "svg", "xpm") {
       if exists directory/iconname.extension
         return directory/iconname.extension
     }
   }
-}
+*)
   Result := EmptyStr;
 end;
 
@@ -319,7 +319,7 @@ var
     Result:= FBaseDirList[J] + PathDelim + FTheme + PathDelim +
              FDirectories.Strings[I] + PathDelim +
              AIconName + '.' +
-             IconExtensionList[Integer(FDirectories.Items[I]^.FileListCache[J].List[FoundIndex]^.Data)];
+             IconExtensionList[PtrInt(FDirectories.Items[I]^.FileListCache[J].List[FoundIndex]^.Data)];
   end;
 
 begin

src/platform/unix/uunixterm.pas

@@ -458,7 +458,7 @@ end;
 
 function TUnixTerm.Fork_pty(const rows, cols: integer; const cmd:UTF8string; const params:UTF8string=''): System.THandle;
 var ws:TWinSize;
-    ChildPid:THandle;
+    ChildPid:System.THandle;
 begin
   FCols:=cols;
   Frows:=rows;

src/platform/uosforms.pas

@@ -27,13 +27,8 @@ unit uOSForms;
 interface
 
 uses
-  Forms, Classes, SysUtils, Menus, Controls, ExtDlgs, LCLType,
-  uFile, uFileSource, uDrive,
-  {$IFDEF UNIX}
-  Graphics, BaseUnix, Unix, fFileProperties;
-  {$ELSE}
-  FileUtil, Windows, ShlObj, uShlObjAdditional;
-  {$ENDIF}
+  Forms, Classes, SysUtils, Controls,
+  uDrive, uFile, uFileSource;
 
 {en
    Must be called on main form create
@@ -76,11 +71,14 @@ function ShowOpenIconDialog(Owner: TCustomControl; var sFileName : String) : Boo
 implementation
 
 uses
-  LCLProc, Dialogs, fMain, uOSUtils, uShellContextMenu, uFileSystemFileSource
+  ExtDlgs, LCLProc, uShellContextMenu
   {$IF DEFINED(MSWINDOWS)}
-  , Graphics, ComObj, uTotalCommander
+  , Graphics, ComObj, fMain, uOSUtils, uFileSystemFileSource, uTotalCommander
+  , FileUtil, Windows, ShlObj, uShlObjAdditional
   {$ENDIF}
-  ;
+  {$IFDEF UNIX}
+  , BaseUnix, fFileProperties
+  {$ENDIF};
 
 var
   ShellContextMenu : TShellContextMenu = nil;
@@ -260,4 +258,4 @@ finalization
   FreeThenNil(ShellContextMenu);
 
 end.
-
+

src/platform/upixmapmanager.pas

@@ -1516,7 +1516,7 @@ begin
       try
         Result := FExtList.Find(Ext);
         if Result >= 0 then
-          Exit(PtrInt(FExtList.List[Result]^.Data));
+          Exit(PtrInt(PtrUInt(FExtList.List[Result]^.Data)));
 
         if gShowIcons <= sim_standart then
           Exit(FiDefaultIconID);

src/platform/utrash.pas

@@ -37,11 +37,10 @@ function mbCheckTrash(sPath: UTF8String): Boolean;
 implementation
 
 uses
-  uOSUtils, uDCUtils, uFileProcs
   {$IF DEFINED(MSWINDOWS)}
-  , Windows, ShellApi, Win32Int, InterfaceBase, uMyWindows
+  Windows, ShellApi, Win32Int, InterfaceBase, uMyWindows, uOSUtils
   {$ELSEIF DEFINED(UNIX)}
-  , BaseUnix, Unix, uMyUnix
+  BaseUnix, uMyUnix, uDCUtils
     {$IFDEF DARWIN}
     , MacOSAll
     {$ENDIF}

src/uacts.pas

@@ -273,7 +273,7 @@ implementation
 
 uses Forms, Controls, Clipbrd, strutils, LCLProc, HelpIntfs, dmHelpManager,
      fMain, fPackDlg, fFileOpDlg, fMkDir, fFileAssoc, fExtractDlg, fAbout,
-     fOptions, fDiffer, fFindDlg, fSymLink, fHardLink, fMultiRename, fConnectionManager,
+     fOptions, fDiffer, fFindDlg, fSymLink, fHardLink, fMultiRename,
      fLinker, fSplitter, fDescrEdit, fCheckSumVerify, fCheckSumCalc, fSetFileProperties,
      uGlobs, uLng, uLog, uShowMsg, uOSForms, uOSUtils, uDCUtils, uGlobsPaths,
      uClassesEx, uShowForm, uShellExecute, uClipboard, uHash,

src/ucryptproc.pas

@@ -192,7 +192,7 @@ end;
 function TPasswordStore.ReadPassword(Prefix, Name, Connection: UTF8String;
                                      out Password: AnsiString): Boolean;
 var
-  Data: AnsiString;
+  Data: AnsiString = '';
 begin
   Result:= False;
   if CheckMasterKey = False then Exit;

src/ufilesorting.pas

@@ -107,7 +107,7 @@ type
 implementation
 
 uses
-  uTypes, uOSUtils, uGlobs, uDCUtils;
+  uTypes, uGlobs, uDCUtils;
 
 
 function HasSortFunction(FileFunctions: TFileFunctions;

src/ufileviewnotebook.pas

@@ -119,7 +119,6 @@ type
 implementation
 
 uses
-  WSExtCtrls,
   LCLProc,
   uGlobs
   {$IF DEFINED(LCLGTK2)}

src/uhash.pas

@@ -105,8 +105,6 @@ begin
 end;
 
 procedure HashFinal(var Context: THashContext; out Hash: String);
-var
-  I: Integer;
 begin
   case Context.HashAlgorithm of
     HASH_MD5:

src/umultiarc.pas

@@ -340,7 +340,7 @@ end;
 
 procedure TMultiArcItem.SetSignature(const AValue: AnsiString);
 var
-  I, J: Integer;
+  I: Integer;
   Sign: AnsiString;
   Value: AnsiString;
   Signature: PSignature;

src/uparitercontrols.pas

@@ -32,17 +32,10 @@ unit uPariterControls;
 interface
 
 uses
-  LCLType,
-  Forms,
-  Messages,
   Controls,
   SysUtils,
-  Graphics,
   Classes,
-  SynEditKeyCmds,
-  SynEditTextBuffer,
   SynEditHighlighter,
-  SynEdit,
   uSynDiffControls,
   uDiff;
 
@@ -97,7 +90,7 @@ type
 implementation
 
 uses
-  SynEditTypes, uHash;
+  SynEditTypes, Graphics, uHash;
 
 { TSynDiffHighlighter }
 
@@ -368,4 +361,4 @@ begin
 end;
 
 end.
-
+

src/ushellexecute.pas

@@ -44,7 +44,7 @@ uses
   Process, UTF8Process, uDCUtils, uShowForm, uGlobs, uOSUtils,
   uFileSystemFileSource;
 
-{
+(*
   Functions (without parameters they give output for all selected files):
   %f - only filename
   %d - only path, without trailing delimiter
@@ -85,7 +85,7 @@ uses
     %f1{-first }%f2{ -second }
          - if only 1 file selected      : -first <file_1>
          - if 2 (or more) files selected: -first <file_1> -second <file_2>
-}
+*)
 procedure ReplaceExtCommand(var sCmd: String;
                             leftPanel: TFileView;
                             rightPanel: TFileView;
@@ -422,7 +422,7 @@ begin
     sCmd:= StringReplace(sCmd,'%p',QuoteStr(Path + Name),[rfReplaceAll]);
     sCmd:= Trim(sCmd);
 
-    {
+    (*
       Check for <? ?> command.
       This command is used to put output of some console program to a file so
       that the file can then be viewed. The command is between '<?' and '?>'.
@@ -431,7 +431,7 @@ begin
       For example:
       {!VIEWER} <?rpm -qivlp --scripts %p?>
       Show in Viewer information about RPM package
-    }
+    *)
     if Pos('<?', sCmd) <> 0 then
       begin
         iStart:= Pos('<?', sCmd) + 2;

src/uthumbnails.pas

@@ -194,7 +194,7 @@ end;
 function TThumbnailManager.CreatePreview(const aFile: TFile): TBitmap;
 var
   sFullPathToFile, sThumbFileName,
-  sExt, sOnlyFileName: UTF8String;
+  sExt: UTF8String;
   fsFileStream: TFileStreamEx = nil;
   Picture: TPicture = nil;
 begin

src/uwcxmodule.pas

@@ -68,7 +68,6 @@ Type
   TWCXModule = class
   private
     FModuleHandle: TLibHandle;  // Handle to .DLL or .so
-    FArchiveName: String;
 
   public
     // module's functions