Order uses sections some more.

git-svn-id: trunk@53741 -

components/pochecker/pofamilies.pp

@@ -7,8 +7,13 @@ unit PoFamilies;
 interface
 
 uses
-  Classes, SysUtils, ContNrs, Math, LCLProc, FileUtil, LazFileUtils,
+  Classes, SysUtils, ContNrs, Math,
-  Masks, Translations, PoCheckerConsts;
+  // LCL
+  LCLProc, Masks,
+  // LazUtils
+  FileUtil, LazFileUtils, Translations,
+  // PoChecker
+  PoCheckerConsts;
 
 Type
 

ide/buildmodediffdlg.pas

@@ -30,10 +30,13 @@ unit BuildModeDiffDlg;
 interface
 
 uses
-  Classes, sysutils, LazUTF8, LazLogger, AvgLvlTree, Forms, ButtonPanel,
+  Classes, sysutils,
-  StdCtrls, ComCtrls,
+  // LCL
-  LazarusIDEStrConsts, EnvironmentOpts, Project, ModeMatrixOpts,
+  StdCtrls, ComCtrls, Forms, ButtonPanel,
-  CompOptsModes;
+  // LazUtils
+  LazUTF8, LazLogger, AvgLvlTree,
+  // IDE
+  LazarusIDEStrConsts, EnvironmentOpts, Project, ModeMatrixOpts, CompOptsModes;
 
 type
 

ide/etquickfixes.pas

@@ -54,14 +54,17 @@ interface
 
 uses
   Classes, SysUtils,
-  LazLogger, AvgLvlTree, LazFileUtils, LazUTF8,
+  // LCL
   Menus, Dialogs, Controls,
-  CodeToolManager, CodeCache, CodeTree, CodeAtom, BasicCodeTools,
+  // LazUtils
-  KeywordFuncLists,
+  LazLogger, AvgLvlTree, LazFileUtils, LazUTF8,
+  // Codetools
+  CodeToolManager, CodeCache, CodeTree, CodeAtom, BasicCodeTools, KeywordFuncLists,
+  // IdeIntf
   IDEExternToolIntf, IDEMsgIntf, LazIDEIntf, IDEDialogs, MenuIntf,
   ProjectIntf, PackageIntf, CompOptsIntf,
-  LazarusIDEStrConsts,
+  // IDE
-  etFPCMsgParser, AbstractsMethodsDlg, QFInitLocalVarDlg;
+  LazarusIDEStrConsts, etFPCMsgParser, AbstractsMethodsDlg, QFInitLocalVarDlg;
 
 type
 

ide/etsrceditmarks.pas

@@ -32,10 +32,17 @@ unit etSrcEditMarks;
 interface
 
 uses
-  Classes, SysUtils, math, LazLogger, LazFileUtils, AvgLvlTree,
+  Classes, SysUtils, math,
-  KeywordFuncLists, Graphics, Controls, Forms, ImgList,
+  // LCL
+  Graphics, Controls, Forms, ImgList,
+  // LazUtils
+  LazLogger, LazFileUtils, AvgLvlTree,
+  // Codetools
+  KeywordFuncLists,
+  // SynEdit
   SynEditMarkupGutterMark,
   SynEditMarks, SynEditMiscClasses, SynEditTypes, SynEdit, LazSynEditText,
+  // IdeIntf
   IDEExternToolIntf;
 
 type

ide/frames/compiler_other_options.pas

@@ -28,12 +28,20 @@ unit Compiler_Other_Options;
 interface
 
 uses
-  Classes, SysUtils, math, AVL_Tree, LazLogger, Forms, Controls, Graphics,
+  Classes, SysUtils, math, AVL_Tree,
-  Dialogs, StdCtrls, ComCtrls, ExtCtrls, Buttons, LCLType, LazUTF8,
+  // LCL
-  CodeToolsCfgScript, KeywordFuncLists, LazarusIDEStrConsts,
+  Forms, Controls, Graphics, Dialogs, StdCtrls, ComCtrls, ExtCtrls, Buttons, LCLType,
-  IDEOptionsIntf, CompOptsIntf, IDECommands, PackageDefs,
+  // LazUtils
-  CompilerOptions, Compiler, AllCompilerOptions, DefinesGui,
+  LazUTF8, LazLogger,
-  EditorOptions, SynEdit, SynEditKeyCmds, SynCompletion, SourceSynEditor;
+  // Codetools
+  CodeToolsCfgScript, KeywordFuncLists,
+  // IdeIntf
+  IDEOptionsIntf, CompOptsIntf, IDECommands,
+  // SynEdit
+  SynEdit, SynEditKeyCmds, SynCompletion,
+  // IDE
+  LazarusIDEStrConsts, CompilerOptions, Compiler, AllCompilerOptions, DefinesGui,
+  EditorOptions, PackageDefs, SourceSynEditor;
 
 type
 

ide/frames/modematrixctrl.pas

@@ -26,9 +26,16 @@ unit ModeMatrixCtrl;
 interface
 
 uses
-  Classes, SysUtils, math, types, contnrs, Controls, LCLType, LCLIntf, Grids,
+  Classes, SysUtils, math, types, contnrs,
-  Graphics, StdCtrls, Menus, LazLogger,
+  // LCL
-  FileProcs, IDEUtils,
+  Controls, LCLType, LCLIntf, Grids, Graphics, StdCtrls, Menus,
+  // LazUtils
+  LazLogger,
+  // Codetools
+  FileProcs,
+  // IdeIntf
+  IDEUtils,
+  // IDE
   IDEProcs, LazarusIDEStrConsts;
 
 const

ide/idetranslations.pas

@@ -32,11 +32,13 @@ unit IDETranslations;
 interface
 
 uses
-  Classes, SysUtils, GetText, LazUTF8, Translations,
+  Classes, SysUtils, GetText,
-  IDEProcs, FileProcs, LazFileUtils, LazFileCache,
+  // LazUtils
-  CodeToolManager, DirectoryCacher, CodeCache,
+  LazFileUtils, LazFileCache, LazUTF8, Translations,
-  LazarusIDEStrConsts;
+  // Codetools
-  { IDE Language (Human, not computer) }
+  FileProcs, CodeToolManager, DirectoryCacher, CodeCache,
+  // IDE
+  IDEProcs, LazarusIDEStrConsts;  { IDE Language (Human, not computer) }
 
 type
   { TLazarusTranslation }

ide/modematrixopts.pas

@@ -26,8 +26,13 @@ unit ModeMatrixOpts;
 interface
 
 uses
-  Classes, SysUtils, contnrs, LazConfigStorage, Laz2_XMLCfg, LazLogger, LazUTF8,
+  Classes, SysUtils, contnrs,
-  FileProcs, KeywordFuncLists, CodeToolsCfgScript, LazarusIDEStrConsts;
+  // LazUtils
+  LazConfigStorage, Laz2_XMLCfg, LazLogger, LazUTF8,
+  // Codetools
+  FileProcs, KeywordFuncLists, CodeToolsCfgScript,
+  // IDE
+  LazarusIDEStrConsts;
 
 const
   BuildMatrixProjectName = '#project';

ide/qfinitlocalvardlg.pas

@@ -33,10 +33,16 @@ unit QFInitLocalVarDlg;
 interface
 
 uses
-  Classes, SysUtils, Math, contnrs, LazLogger,
+  Classes, SysUtils, Math, contnrs,
-  Forms, Controls, Graphics, Dialogs, ButtonPanel, ExtCtrls,
+  // LCL
+  Forms, Controls, Dialogs, ButtonPanel, ExtCtrls,
+  // LazUtils
+  LazLogger,
+  // Codetools
   CodeToolManager, CodeCache, StdCodeTools,
+  // IdeIntf
   LazIDEIntf, IDEDialogs,
+  // IDE
   LazarusIDEStrConsts;
 
 type

ide/sourceeditor.pp

@@ -48,12 +48,12 @@ uses
   // LCL
   Controls, Forms, ComCtrls, StdCtrls, Graphics, Dialogs, Extctrls, Menus,
   LCLProc, LCLType, LResources, LCLIntf, FileUtil, LazFileUtils,
-  Translations, ClipBrd, HelpIntfs, Messages,
+  ClipBrd, HelpIntfs, Messages,
   // LazControls
   ExtendedNotebook,
   // LazUtils
-  LConvEncoding, LazLoggerBase, LazUTF8Classes, LazLogger, AvgLvlTree,
+  LConvEncoding, LazUTF8Classes, LazFileCache, LazUTF8, AvgLvlTree,
-  LazFileCache, LazUTF8,
+  LazLoggerBase, LazLogger, Translations,
   // codetools
   BasicCodeTools, CodeBeautifier, CodeToolManager, CodeCache, SourceLog,
   LinkScanner, CodeTree, SourceChanger,

lcl/interfaces/gtk2/gtk2wsforms.pp

@@ -27,9 +27,11 @@ uses
   {$ENDIF}
   Math, types, Classes,
   // LCL
-  LazLogger, LCLType, Controls, LMessages, InterfaceBase,
+  LCLType, Controls, LMessages, InterfaceBase, Graphics, Forms,
-  Graphics, Forms, WSForms, WSProc,
+  Gtk2Int, Gtk2Proc, Gtk2Def, Gtk2Extra, Gtk2Globals, Gtk2WSControls,
-  Gtk2Int, Gtk2Proc, Gtk2Def, Gtk2Extra, Gtk2Globals, Gtk2WSControls;
+  WSForms, WSProc,
+  // LazUtils
+  LazLogger;
 
 type
 

lcl/interfaces/gtk3/gtk3int.pas

@@ -26,11 +26,10 @@ uses
   {$ENDIF}
   SysUtils, Classes, types,
   // LazUtils
-  LazUTF8,
+  LazUTF8, Translations,
   // LCL
-  LCLPlatformDef, InterfaceBase, Translations,
+  LCLPlatformDef, InterfaceBase, LCLProc, LCLStrConsts, LCLType, LMessages,
   Controls, Forms, FPImage, Graphics, GraphUtil, GraphType, IntfGraphics,
-  LCLProc, LCLStrConsts, LCLType, LMessages,
   LazGtk3, LazGdk3, LazGlib2, LazGObject2, LazCairo1, LazPango1, LazPangoCairo1, LazGio2,
   LazGdkPixbuf2, gtk3widgets, gtk3objects, gtk3procs;
 

lcl/interfaces/win32/win32int.pp

@@ -29,11 +29,14 @@ interface
 }
 uses
   Windows, // keep as first
-  Classes, RtlConsts, ActiveX, MultiMon,
+  Classes, SysUtils, RtlConsts, ActiveX, MultiMon, CommCtrl,
   // LCL
-  LCLPlatformDef, InterfaceBase, LCLIntf, LclProc, LazUTF8, LCLType, LMessages,
+  LCLPlatformDef, InterfaceBase, LCLIntf, LclProc, LCLType, LMessages,
-  Translations, Controls, Buttons, Forms, Dialogs, GraphMath, GraphType, StdCtrls,
+  Controls, Buttons, Forms, Dialogs, GraphMath, GraphType, StdCtrls,
-  SysUtils, Win32Def, Graphics, Menus, CommCtrl, ComCtrls, Themes{, Win32Debug};
+  Graphics, Menus, ComCtrls, Themes, Win32Def,
+  // LazUtils
+  LazUTF8, Translations;
+  {, Win32Debug}
 
 const
   // standard windows cursors

lcl/lclproc.pas

@@ -26,10 +26,10 @@ interface
 
 uses
   {$IFDEF Darwin}MacOSAll, {$ENDIF}
-  {$IFnDEF WithOldDebugln} LazLogger, {$ENDIF}
   Classes, SysUtils, Math, TypInfo, Types,
   // LazUtils
   FPCAdds, AvgLvlTree, LazFileUtils, LazMethodList, LazUTF8, LazUTF8Classes,
+  {$IFnDEF WithOldDebugln} LazLogger, {$ENDIF}
   // LCL
   LCLStrConsts, LCLType;
 

lcl/lcltranslator.pas

@@ -38,9 +38,9 @@ uses
   // RTL + FCL
   Classes, SysUtils, typinfo, GetText,
   // LCL
-  LResources, Translations, Forms,
+  LResources, Forms,
   // LazUtils
-  LazFileUtils, LazUTF8;
+  Translations, LazFileUtils, LazUTF8;
 
 type
 

packager/pkgmanager.pas

@@ -48,10 +48,10 @@ uses
   // RTL, FCL
   TypInfo, math, Classes, SysUtils, contnrs,
   // LCL
-  LCLProc, Forms, Controls, Dialogs, Menus, ComCtrls,
+  LCLProc, Forms, Controls, Dialogs, Menus, ComCtrls, LResources,
-  Translations, LResources,
   // LazUtils
   LazUTF8, Laz2_XMLCfg, lazutf8classes, LazFileUtils, LazFileCache, StringHashList,
+  Translations,
   // Codetools
   CodeToolsConfig, CodeToolManager, CodeCache, CodeToolsStructs, BasicCodeTools,
   FileProcs, CodeTree,

tools/lazdatadesktop/frmmain.pp

@@ -37,10 +37,14 @@ unit frmmain;
 interface
 
 uses
-  Classes, SysUtils, Forms, Controls, Dialogs, Menus, ActnList, StdActns,
+  Classes, SysUtils, fpdatadict,
-  ComCtrls, IniPropStorage, LCLType, ExtCtrls, LCLProc, Translations,
+  // LCL
-  dicteditor, fraconnection, ddfiles, fpdatadict, lazdatadeskstr,
+  Forms, Controls, Dialogs, Menus, ActnList, StdActns, ComCtrls, ExtCtrls,
-  FileUtil, LazFileUtils, LazUTF8;
+  IniPropStorage, LCLType, LCLProc,
+  // LazUtils
+  FileUtil, LazFileUtils, LazUTF8, Translations,
+  // LazDataDesktop
+  dicteditor, fraconnection, ddfiles, lazdatadeskstr;
 
 type
   TEngineMenuItem = Class(TMenuItem)