Refactor: reorder uses sections.

git-svn-id: trunk@58207 -

components/ideintf/baseideintf.pas

@@ -16,7 +16,11 @@ unit BaseIDEIntf;
 interface
 
 uses
-  Classes, SysUtils, LazUTF8, LazConfigStorage, Dialogs, MacroIntf;
+  Classes, SysUtils,
+  // LazUtils
+  LazUTF8, LazConfigStorage,
+  // IdeIntf
+  MacroIntf;
   
 type
   TGetIDEConfigStorage = function(const Filename: string; LoadFromDisk: Boolean

components/ideintf/columndlg.pp

@@ -11,8 +11,12 @@ unit ColumnDlg;
 interface
 
 uses
-  Classes, SysUtils, LCLProc, Forms, Controls, Graphics, Dialogs, LResources,
+  Classes, SysUtils,
-  ComCtrls, StdCtrls, Buttons, ExtCtrls, ObjInspStrConsts;
+  // LCL
+  LCLProc, Forms, Controls, Graphics, Dialogs, LResources,
+  ComCtrls, StdCtrls, Buttons, ExtCtrls,
+  // IdeIntf
+  ObjInspStrConsts;
 
 type
   // TODO create more generic collection editor.

components/ideintf/formeditingintf.pas

@@ -16,8 +16,13 @@ unit FormEditingIntf;
 interface
 
 uses
-  Math, Classes, SysUtils, LCLProc, TypInfo, types, Forms, Controls, LCLClasses,
+  Classes, SysUtils, TypInfo, types, Math,
-  ProjectIntf, ComponentEditors, ObjectInspector, UnitResources, CompWriterPas;
+  // LCL
+  LCLProc, LCLClasses, Forms, Controls,
+  // LazUtils
+  CompWriterPas,
+  // IdeIntf
+  ProjectIntf, ComponentEditors, ObjectInspector, UnitResources;
   
 const
   ComponentPaletteImageWidth = 24;

components/ideintf/helpfpdoc.pas

@@ -20,8 +20,13 @@ unit HelpFPDoc;
 interface
 
 uses
-  Classes, SysUtils, LCLProc, LazFileUtils, MacroIntf, HelpIntfs, LazHelpIntf,
+  Classes, SysUtils,
-  LazHelpHTML;
+  // LazUtils,
+  LazFileUtils,
+  // LCL
+  LCLProc, HelpIntfs, LazHelpIntf, LazHelpHTML,
+  // IdeIntf
+  MacroIntf;
 
 type
   { TFPDocHTMLHelpDatabase }

components/ideintf/ideexterntoolintf.pas

@@ -15,12 +15,10 @@ interface
 
 uses
   Classes, SysUtils, Math, Laz_AVL_Tree,
-  // LCL
-  LCLProc,
   // LazUtils
-  UTF8Process, LazFileUtils, LazFileCache, LazMethodList,
+  UTF8Process, LazFileUtils, LazFileCache, LazMethodList, LazLoggerBase,
   // IdeIntf
-  ObjInspStrConsts, LazLoggerBase, Menus;
+  ObjInspStrConsts;
 
 const
   SubToolFPC = 'FPC';

components/ideintf/idehelpintf.pas

@@ -19,8 +19,7 @@ interface
 uses
   Classes, Types, SysUtils,
   // LCL
-  LMessages, LCLType, LCLProc, Forms, Controls, Graphics,
+  LMessages, LCLType, LCLIntf, Forms, Controls, Graphics, HelpIntfs, LazHelpIntf,
-  HelpIntfs, LazHelpIntf, LCLIntf,
   // IdeIntf
   TextTools;
 

components/ideintf/ideimagesintf.pas

@@ -25,8 +25,9 @@ unit IDEImagesIntf;
 interface
 
 uses
-  Classes, SysUtils, LCLProc, LCLType, ImgList, Controls, Graphics, LResources,
+  Classes, SysUtils, Math,
-  Math, Buttons;
+  // LCL
+  LCLProc, LCLType, LResources, ImgList, Controls, Graphics, Buttons;
 
 type
 

components/ideintf/idemsgintf.pas

@@ -16,8 +16,13 @@ unit IDEMsgIntf;
 interface
 
 uses
-  Classes, SysUtils, contnrs, Forms, Menus,
+  Classes, SysUtils, contnrs,
-  IDECommands, IDEExternToolIntf, MenuIntf, LazFileUtils, LazLoggerBase;
+  // LCL
+  Forms, Menus,
+  // LazUtils
+  IDEExternToolIntf, LazFileUtils, LazLoggerBase,
+  // IdeIntf
+  MenuIntf;
 
 type
   TMsgQuickFixes = class;

components/ideintf/idetextconverter.pas

@@ -21,8 +21,13 @@ unit IDETextConverter;
 interface
 
 uses
-  Classes, SysUtils, TypInfo, LCLProc, Controls, Forms, FileUtil, LazFileUtils,
+  Classes, SysUtils, TypInfo,
-  LazUTF8, LazUTF8Classes, SrcEditorIntf, PropEdits, ObjInspStrConsts;
+  // LCL
+  LCLProc, Controls, Forms,
+  // LazUtils
+  FileUtil, LazFileUtils, LazUTF8, LazUTF8Classes,
+  // IdeIntf
+  SrcEditorIntf, PropEdits, ObjInspStrConsts;
   
 type
   TCustomTextConverterTool = class;

components/ideintf/ideutils.pas

@@ -14,7 +14,11 @@ unit IDEUtils;
 interface
 
 uses
-  Classes, SysUtils, StdCtrls, LazUTF8, LazFileUtils;
+  Classes, SysUtils,
+  // LCL
+  StdCtrls,
+  // LazUtils
+  LazUTF8, LazFileUtils;
 
 type
   TCmpStrType = (

components/ideintf/macrointf.pas

@@ -15,7 +15,11 @@ unit MacroIntf;
 interface
 
 uses
-  Classes, SysUtils, LazFileUtils, MacroDefIntf;
+  Classes, SysUtils,
+  // LazUtils
+  LazFileUtils,
+  // IdeIntf
+  MacroDefIntf;
 
 type
   { TIDEMacros - macros for paths and compiler settings }

components/ideintf/packagelinkintf.pas

@@ -5,8 +5,8 @@ unit PackageLinkIntf;
 interface
 
 uses
-  SysUtils,
+  SysUtils, Classes,
-  Classes,
+  // LCL
   Forms,
   // LazUtils
   LazFileUtils,

components/ideintf/projectintf.pas

@@ -17,10 +17,13 @@ interface
 
 uses
   Classes, SysUtils, Contnrs,
+  // LazUtils
   FileUtil, LazFileUtils, LazFileCache, LazMethodList, AvgLvlTree,
+  // LCL
   Controls, Forms, ImgList, Graphics,
-  IDEOptionsIntf, NewItemIntf, ProjPackIntf, CompOptsIntf, ObjInspStrConsts,
+  // IdeIntf
-  IDEImagesIntf;
+  IDEOptionsIntf, NewItemIntf, ProjPackIntf, CompOptsIntf, IDEImagesIntf,
+  ObjInspStrConsts;
 
 const
   FileDescGroupName = 'File';

components/ideintf/projectresourcesintf.pas

@@ -11,7 +11,9 @@ unit ProjectResourcesIntf;
 interface
 
 uses
-  Classes, SysUtils, CompOptsIntf, ProjectIntf, resource;
+  Classes, SysUtils, resource,
+  // IdeIntf
+  CompOptsIntf, ProjectIntf;
 
 type
   TAbstractProjectResources = class;

components/pas2js/pjsdsgnoptions.pas

@@ -10,8 +10,13 @@ unit PJSDsgnOptions;
 interface
 
 uses
-  Classes, SysUtils, LazFileCache, LazConfigStorage, LazFileUtils, FileUtil,
+  Classes, SysUtils,
-  MacroIntf, BaseIDEIntf, IDEUtils, DefineTemplates;
+  // LazUtils
+  LazFileCache, LazConfigStorage, LazFileUtils, FileUtil,
+  // Codetools
+  DefineTemplates,
+  // IdeIntf
+  MacroIntf, BaseIDEIntf;
 
 const
   PJSDsgnOptsFile = 'pas2jsdsgnoptions.xml';

components/pas2js/pjsdsgnoptsframe.pas

@@ -10,9 +10,15 @@ unit PJSDsgnOptsFrame;
 interface
 
 uses
-  Classes, SysUtils, Forms, Controls, StdCtrls, Dialogs, Spin, IDEOptionsIntf,
+  Classes, SysUtils,
-  IDEUtils, LazFileCache, PJSDsgnOptions,
+  // LCL
-  LazFileUtils;
+  Forms, StdCtrls, Dialogs, Spin,
+  // LazUtils
+  LazFileCache, LazFileUtils,
+  // IdeIntf
+  IDEOptionsIntf, IDEUtils,
+  // Pas2Js
+  PJSDsgnOptions;
 
 Type
   { TPas2jsOptionsFrame }

ide/buildfiledlg.pas

@@ -7,12 +7,17 @@ unit BuildFileDlg;
 interface
 
 uses
-  Classes, SysUtils, LCLProc, LCLType, Forms, Controls, Graphics, ComCtrls,
+  Classes, SysUtils,
-  Dialogs, Buttons, ExtCtrls, StdCtrls, LazFileUtils, ButtonPanel,
+  // LCL
+  LCLProc, LCLType, Forms, Controls, Graphics, ComCtrls, Dialogs, StdCtrls, ButtonPanel,
+  // LazUtils
+  LazFileUtils,
+  // CodeTools
   BasicCodeTools,
-  IDEHelpIntf,
+  // IdeIntf
-  IDEProcs, InputHistory, LazarusIDEStrConsts, EnvironmentOpts, TransferMacros,
+  IDEHelpIntf, MacroDefIntf, LazIDEIntf, IDEUtils,
-  MacroDefIntf, IDEUtils, LazIDEIntf;
+  // IDE
+  IDEProcs, InputHistory, LazarusIDEStrConsts, EnvironmentOpts, TransferMacros;
 
 type
 

ide/frames/editor_color_options.pas

@@ -25,13 +25,22 @@ unit editor_color_options;
 interface
 
 uses
-  Classes, Controls, math, types, typinfo, sysutils, Laz2_XMLCfg, LazFileUtils,
+  Classes, Controls, math, types, typinfo, sysutils,
-  LCLProc, LCLType, LCLIntf, LazUTF8, StdCtrls, ExtCtrls, Graphics,
+  // LazUtils
-  ComCtrls, Dialogs, Menus, SynEdit, SynEditMiscClasses,
+  Laz2_XMLCfg, LazFileUtils, LazUTF8,
-  SynGutterCodeFolding, SynGutterLineNumber, SynEditTypes, SynGutterChanges,
+  // LCL
-  SynEditMouseCmds, SynEditHighlighter, SynTextDrawer, SynColorAttribEditor,
+  LCLProc, LCLType, LCLIntf, StdCtrls, ExtCtrls, Graphics, ComCtrls, Dialogs, Menus,
-  DividerBevel, IDEOptionsIntf, IDEImagesIntf, IDEUtils, EditorOptions,
+  // LazControls
-  editor_general_options, LazarusIDEStrConsts, IDEProcs, LazConf, SourceMarks;
+  DividerBevel,
+  // SynEdit
+  SynEdit, SynEditMiscClasses, SynGutterCodeFolding, SynGutterLineNumber,
+  SynEditTypes, SynGutterChanges, SynEditMouseCmds, SynEditHighlighter,
+  SynColorAttribEditor,
+  // IdeIntf
+  IDEOptionsIntf, IDEImagesIntf, IDEUtils,
+  // IDE
+  EditorOptions, editor_general_options, LazarusIDEStrConsts, IDEProcs, LazConf,
+  SourceMarks;
 
 type