diff --git a/components/anchordocking/design/anchordesktopoptions.pas b/components/anchordocking/design/anchordesktopoptions.pas index e77e989454..61fbcf1a1f 100644 --- a/components/anchordocking/design/anchordesktopoptions.pas +++ b/components/anchordocking/design/anchordesktopoptions.pas @@ -9,9 +9,9 @@ interface uses Classes, SysUtils, // LCL - LCLProc, Forms, Controls, LCLType, LResources, + Forms, Controls, LResources, // LazUtils - LazFileUtils, LazConfigStorage, Laz2_XMLCfg, LazUTF8, + LazFileUtils, LazConfigStorage, LazLoggerBase, Laz2_XMLCfg, LazUTF8, // IdeIntf IDEOptionsIntf, LazIDEIntf, BaseIDEIntf, // AnchorDocking diff --git a/components/anchordocking/design/registeranchordocking.pas b/components/anchordocking/design/registeranchordocking.pas index 82de0b4a36..da15bc1585 100644 --- a/components/anchordocking/design/registeranchordocking.pas +++ b/components/anchordocking/design/registeranchordocking.pas @@ -38,9 +38,9 @@ interface uses Math, Classes, SysUtils, // LCL - LCLProc, Forms, Controls, Dialogs, StdCtrls, + Forms, Controls, Dialogs, StdCtrls, // LazUtils - LazFileCache, LazFileUtils, + LazFileCache, LazFileUtils, LazLoggerBase, // IdeIntf LCLIntf, IDEWindowIntf, IDEOptionsIntf, IDEOptEditorIntf, LazIDEIntf, // AnchorDocking diff --git a/components/chmhelp/lhelp/lhelpcore.pas b/components/chmhelp/lhelp/lhelpcore.pas index 3df080da0d..d066a04e08 100644 --- a/components/chmhelp/lhelp/lhelpcore.pas +++ b/components/chmhelp/lhelp/lhelpcore.pas @@ -35,10 +35,10 @@ unit LHelpCore; interface uses - Classes, SysUtils, SimpleIPC, Laz2_XMLCfg, + Classes, SysUtils, Types, SimpleIPC, Laz2_XMLCfg, // LCL - Forms, Controls, Graphics, Dialogs, Buttons, ComCtrls, ExtCtrls, Menus, StdCtrls, Types, - LCLProc, LCLType, LCLIntf, DefaultTranslator, + Forms, Controls, Graphics, Dialogs, ComCtrls, ExtCtrls, Menus, StdCtrls, + LCLType, LCLIntf, DefaultTranslator, // LazUtils LazFileUtils, LazUTF8, LazLoggerBase, // ChmHelp diff --git a/components/customdrawn/customdrawnextras.pas b/components/customdrawn/customdrawnextras.pas index 2fae80d67f..29f6ff51e0 100644 --- a/components/customdrawn/customdrawnextras.pas +++ b/components/customdrawn/customdrawnextras.pas @@ -14,10 +14,10 @@ unit customdrawnextras; interface uses - Classes, SysUtils, Graphics, Controls, LCLType, LCLIntf, IntfGraphics, - Math, types, contnrs, componenteditors, LMessages, Messages, - LCLProc, PropEdits, ExtCtrls, ImgList, Forms, Menus, LResources, + Classes, SysUtils, Math, Types, Contnrs, + Graphics, Controls, ExtCtrls, ImgList, Forms, Menus, LCLType, customdrawncontrols, + componenteditors, PropEdits, // fpimage fpcanvas, fpimgcanv, fpimage {$ifdef CUSTOMDRAWN_USE_FREETYPE} diff --git a/components/fppkg/src/fppkg_environmentoptions.pas b/components/fppkg/src/fppkg_environmentoptions.pas index 463d30a453..c7039d47fa 100644 --- a/components/fppkg/src/fppkg_environmentoptions.pas +++ b/components/fppkg/src/fppkg_environmentoptions.pas @@ -42,7 +42,7 @@ uses LazIDEIntf, LazFileCache, LazFileUtils, - LCLProc, + LazLoggerBase, XMLConf, StdCtrls, ExtCtrls, diff --git a/components/fppkg/src/fppkg_initializeoptionsfrm.pas b/components/fppkg/src/fppkg_initializeoptionsfrm.pas index ad375a5ea8..6fcecd3ef1 100644 --- a/components/fppkg/src/fppkg_initializeoptionsfrm.pas +++ b/components/fppkg/src/fppkg_initializeoptionsfrm.pas @@ -5,9 +5,10 @@ unit fppkg_initializeoptionsfrm; interface uses - Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls, EditBtn, - ButtonPanel, - fpTemplate, + Classes, SysUtils, fpTemplate, + Forms, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls, EditBtn, ButtonPanel, + // LazUtils + LazFileUtils, // IDEIntf IDEOptionsIntf, // fppkg diff --git a/components/fppkg/src/lazfppkgmanagerintf.pas b/components/fppkg/src/lazfppkgmanagerintf.pas index 58545c69e6..3e2c7f8e49 100644 --- a/components/fppkg/src/lazfppkgmanagerintf.pas +++ b/components/fppkg/src/lazfppkgmanagerintf.pas @@ -32,7 +32,8 @@ unit lazfppkgmanagerintf; interface uses - LCLtype, LResources, LCLProc, + LCLtype, LResources, + LazUtilities, fppkg_mainfrm, fppkg_const; procedure Register; diff --git a/components/lazcontrols/checkboxthemed.pas b/components/lazcontrols/checkboxthemed.pas index dd70c95118..b4d7e2dcb7 100644 --- a/components/lazcontrols/checkboxthemed.pas +++ b/components/lazcontrols/checkboxthemed.pas @@ -17,8 +17,7 @@ interface uses Classes, SysUtils, Types, Math, // LCL - Controls, StdCtrls, Graphics, ActnList, Forms, - LCLIntf, LMessages, LCLProc, LCLType, Themes, + Controls, StdCtrls, Graphics, ActnList, Forms, LCLIntf, LMessages, LCLType, Themes, // LazUtils LazMethodList; diff --git a/components/lazcontrols/extendednotebook.pas b/components/lazcontrols/extendednotebook.pas index 34f8461bf8..c06ead26bc 100644 --- a/components/lazcontrols/extendednotebook.pas +++ b/components/lazcontrols/extendednotebook.pas @@ -26,7 +26,7 @@ uses Classes, sysutils, math, // LCL LCLIntf, LCLType, LMessages, Controls, ComCtrls - {$IFDEF ExtNBookDebug} , LCLProc {$ENDIF}; + {$IFDEF ExtNBookDebug} , LazLoggerBase {$ENDIF}; type diff --git a/components/lazcontrols/spinex.pp b/components/lazcontrols/spinex.pp index 9b2c6814de..dbc844637a 100644 --- a/components/lazcontrols/spinex.pp +++ b/components/lazcontrols/spinex.pp @@ -74,7 +74,7 @@ interface uses Classes, SysUtils, Math, // LCL - LCLType, LCLProc, Controls, ClipBrd, ComCtrls, GroupedEdit, LResources; + LCLType, Controls, ClipBrd, ComCtrls, GroupedEdit, LResources; {.$define debugspinex} diff --git a/components/lazdebuggers/lazdebuggerfp/fpdebugvalueconvertors.pas b/components/lazdebuggers/lazdebuggerfp/fpdebugvalueconvertors.pas index 0fb4f1d6b3..d720887943 100644 --- a/components/lazdebuggers/lazdebuggerfp/fpdebugvalueconvertors.pas +++ b/components/lazdebuggers/lazdebuggerfp/fpdebugvalueconvertors.pas @@ -8,7 +8,7 @@ interface uses Classes, SysUtils, FpDbgInfo, FpdMemoryTools, FpDbgCallContextInfo, FpPascalBuilder, FpErrorMessages, FpDbgClasses, FpDbgUtil, DbgIntfBaseTypes, - LazClasses, LCLProc, Forms, StdCtrls, Controls, StrUtils, FpDebugDebuggerBase, + LazClasses, Forms, StdCtrls, Controls, StrUtils, FpDebugDebuggerBase, FpDebugStringConstants, LazDebuggerValueConverter, LazDebuggerIntfBaseTypes, LazDebuggerIntf; diff --git a/components/lazsvnpkg/lazsvnintf.pas b/components/lazsvnpkg/lazsvnintf.pas index f0a9f6aa06..360c17a0f8 100644 --- a/components/lazsvnpkg/lazsvnintf.pas +++ b/components/lazsvnpkg/lazsvnintf.pas @@ -23,7 +23,9 @@ unit LazSVNIntf; interface uses - SysUtils, LCLtype, LResources, LCLProc; + SysUtils, + LazLoggerBase, + LCLtype, LResources; procedure ProcSVNLog(Sender: TObject); procedure ProcSVNCommit(Sender: TObject); diff --git a/components/lazsvnpkg/svnclasses.pas b/components/lazsvnpkg/svnclasses.pas index 6dc48c62e6..7af9dbd930 100644 --- a/components/lazsvnpkg/svnclasses.pas +++ b/components/lazsvnpkg/svnclasses.pas @@ -23,8 +23,9 @@ unit SVNClasses; interface uses - Classes, SysUtils, ComCtrls, FileUtil, UTF8Process, LCLProc, Controls, - XMLRead, DOM, Process, StdCtrls, Forms, fgl; + Classes, SysUtils, XMLRead, DOM, Process, fgl, + FileUtil, UTF8Process, LazLoggerBase, + ComCtrls, Controls, StdCtrls, Forms; resourcestring rsAction = 'Action'; diff --git a/components/lazsvnpkg/svncommitform.pas b/components/lazsvnpkg/svncommitform.pas index 90200d07d4..cc848b520c 100644 --- a/components/lazsvnpkg/svncommitform.pas +++ b/components/lazsvnpkg/svncommitform.pas @@ -5,8 +5,9 @@ unit SVNCommitForm; interface uses - Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs, - ButtonPanel, StdCtrls, Process, LCLProc; + Classes, SysUtils, Process, + FileUtil, + LResources, Forms, Controls, Graphics, Dialogs, ButtonPanel, StdCtrls; type diff --git a/components/lazsvnpkg/svnlogform.pas b/components/lazsvnpkg/svnlogform.pas index f6f99fa4fa..8846f53def 100644 --- a/components/lazsvnpkg/svnlogform.pas +++ b/components/lazsvnpkg/svnlogform.pas @@ -23,9 +23,10 @@ unit SVNLogForm; interface uses - Classes, SysUtils, Forms, Dialogs, Controls, FileUtil, LazFileUtils, - ComCtrls, StdCtrls, ButtonPanel, ExtCtrls, Spin, DOM, - Menus, LCLProc, LazIDEIntf, fgl; + Classes, SysUtils, fgl, DOM, + LazFileUtils, LazLoggerBase, + Forms, Dialogs, Controls, ComCtrls, StdCtrls, ButtonPanel, ExtCtrls, Spin, Menus, + LazIDEIntf; type TActionItem = record diff --git a/components/lazsvnpkg/svnstatusform.pas b/components/lazsvnpkg/svnstatusform.pas index 5705f306ef..8df81ebf0b 100644 --- a/components/lazsvnpkg/svnstatusform.pas +++ b/components/lazsvnpkg/svnstatusform.pas @@ -23,10 +23,10 @@ unit SVNStatusForm; interface uses - Classes, SysUtils, Process, LCLProc, + Classes, SysUtils, Process, Forms, Controls, Dialogs, ComCtrls, StdCtrls, ButtonPanel, ExtCtrls, Menus, // LazUtils - FileUtil, LazFileUtils, LazConfigStorage, UTF8Process, + LazFileUtils, LazConfigStorage, UTF8Process, LazLoggerBase, // IDEIntf LazIDEIntf, BaseIDEIntf, // LazSvn diff --git a/components/lazsvnpkg/svnupdateform.pas b/components/lazsvnpkg/svnupdateform.pas index 68a8b1bcb8..5e83f58e13 100644 --- a/components/lazsvnpkg/svnupdateform.pas +++ b/components/lazsvnpkg/svnupdateform.pas @@ -23,8 +23,10 @@ unit SVNUpdateForm; interface uses - Classes, SysUtils, FileUtil, UTF8Process, LResources, Forms, Controls, - Graphics, Dialogs, ComCtrls, ButtonPanel, Process, Buttons, Menus, LCLProc, + Classes, SysUtils, + FileUtil, UTF8Process, LazLoggerBase, + LResources, Forms, Controls, + Graphics, Dialogs, ComCtrls, ButtonPanel, Process, Buttons, Menus, IDEImagesIntf; type diff --git a/components/lclextensions/delphicompat.pas b/components/lclextensions/delphicompat.pas index 300d4b82ad..5f4861dace 100644 --- a/components/lclextensions/delphicompat.pas +++ b/components/lclextensions/delphicompat.pas @@ -135,7 +135,7 @@ implementation uses {$i uses.inc} - maps, LazUTF8, LCLProc, LCLMessageGlue, Controls + maps, LazUTF8, LCLMessageGlue, Controls {$ifdef DEBUG_DELPHICOMPAT} ,multiloglcl, filechannel {$endif} diff --git a/components/printers/unix/cupslcl.pas b/components/printers/unix/cupslcl.pas index d01b292d0c..9cdc00fcc2 100644 --- a/components/printers/unix/cupslcl.pas +++ b/components/printers/unix/cupslcl.pas @@ -14,8 +14,8 @@ interface uses Classes, SysUtils, + {$ifdef DebugCUPS}LazLoggerBase,{$endif} // LCL - {$ifdef DebugCUPS}LCLProc,{$endif} StdCtrls, Printers, // Printers OsPrinters, CupsDyn, Printer4LazStrConst; diff --git a/components/printers/unix/cupsprinters_h.inc b/components/printers/unix/cupsprinters_h.inc index 4ec56c248c..71db597999 100644 --- a/components/printers/unix/cupsprinters_h.inc +++ b/components/printers/unix/cupsprinters_h.inc @@ -53,7 +53,9 @@ {$ENDIF} uses - Classes, SysUtils, LCLProc, PostScriptCanvas, Printers, Dialogs, Controls, + Classes, SysUtils, + LazLoggerBase, + PostScriptCanvas, Printers, Dialogs, CUPSDyn {$IFDEF UseCairo} ,CairoCanvas diff --git a/components/printers/unix/framepagesetup.pas b/components/printers/unix/framepagesetup.pas index 7d0b921921..de29b87641 100644 --- a/components/printers/unix/framepagesetup.pas +++ b/components/printers/unix/framepagesetup.pas @@ -15,8 +15,7 @@ interface uses Classes, SysUtils, // LCL - LCLIntf, LCLProc, LResources, Controls, Graphics, Forms, ExtCtrls, StdCtrls, - Spin, Printers, + Graphics, Forms, ExtCtrls, StdCtrls, Spin, Printers, // Printers CupsLCL, Printer4LazStrConst; diff --git a/components/printers/unix/udlgpropertiesprinter.pp b/components/printers/unix/udlgpropertiesprinter.pp index 42dfe36452..488be4faa0 100644 --- a/components/printers/unix/udlgpropertiesprinter.pp +++ b/components/printers/unix/udlgpropertiesprinter.pp @@ -30,8 +30,8 @@ interface uses Classes, SysUtils, // LCL - LResources, Forms, Controls, Graphics, Dialogs, ComCtrls, ExtCtrls, StdCtrls, - LCLProc, LCLType, ButtonPanel, Printers, + Forms, Controls, Graphics, Dialogs, ComCtrls, ExtCtrls, StdCtrls, + ButtonPanel, Printers, // Printers OSPrinters, CupsLCL, CupsDyn, Printer4LazStrConst; diff --git a/components/printers/unix/udlgselectprinter.pp b/components/printers/unix/udlgselectprinter.pp index ab9e3960dc..4f441c6882 100644 --- a/components/printers/unix/udlgselectprinter.pp +++ b/components/printers/unix/udlgselectprinter.pp @@ -39,8 +39,8 @@ interface uses Classes, SysUtils, Types, // LCL - LResources, Forms, Controls, Graphics, Dialogs, StdCtrls, Buttons, ExtCtrls, - Spin, ComCtrls, LCLType, LCLPlatformDef, InterfaceBase, Printers, LCLProc, + Forms, Controls, Graphics, Dialogs, StdCtrls, Buttons, ExtCtrls, + Spin, ComCtrls, LCLType, LCLPlatformDef, InterfaceBase, Printers, // Printers Printer4LazStrConst, OsPrinters, CUPSDyn; diff --git a/components/synedit/lazsyntextarea.pp b/components/synedit/lazsyntextarea.pp index 4392bee308..2e767ef103 100644 --- a/components/synedit/lazsyntextarea.pp +++ b/components/synedit/lazsyntextarea.pp @@ -8,7 +8,7 @@ interface uses Classes, SysUtils, // LCL - Graphics, Controls, LCLType, LCLIntf, LCLProc, + Graphics, Controls, LCLType, LCLIntf, // LazUtils LazMethodList, // SynEdit diff --git a/components/synedit/synbeautifier.pas b/components/synedit/synbeautifier.pas index 884f263f3e..f2db827809 100644 --- a/components/synedit/synbeautifier.pas +++ b/components/synedit/synbeautifier.pas @@ -41,7 +41,6 @@ interface uses Classes, SysUtils, StrUtils, - LCLProc, LazStringUtils, SynEditMiscClasses, SynEditMiscProcs, LazSynEditText, SynEditPointClasses, SynEditKeyCmds, SynEditTypes; diff --git a/components/synedit/syncompletion.pas b/components/synedit/syncompletion.pas index d3ad1a34ea..1ab8558f76 100644 --- a/components/synedit/syncompletion.pas +++ b/components/synedit/syncompletion.pas @@ -46,10 +46,10 @@ interface uses Classes, SysUtils, Types, Character, // LCL - LCLProc, LCLIntf, LCLType, LMessages, Graphics, Forms, + LCLIntf, LCLType, LMessages, Graphics, Forms, Controls, StdCtrls, ExtCtrls, Menus, Themes, // LazUtils - LazUTF8, + LazUTF8, LazLoggerBase, // SynEdit SynEditMiscProcs, SynEditKeyCmds, SynEdit, SynEditTypes, SynEditPlugins; diff --git a/components/synedit/syneditautocomplete.pp b/components/synedit/syneditautocomplete.pp index 8c3cb95248..04651faf53 100644 --- a/components/synedit/syneditautocomplete.pp +++ b/components/synedit/syneditautocomplete.pp @@ -45,7 +45,7 @@ interface uses Classes, SysUtils, StrUtils, - LCLIntf, LCLType, Controls, LCLProc, + LCLIntf, LCLType, Controls, LazStringUtils, LazUTF8, SynEdit, SynEditKeyCmds, SynEditPlugins; diff --git a/components/synedit/syneditexport.pas b/components/synedit/syneditexport.pas index f33bb61e1f..6cbfce8b73 100644 --- a/components/synedit/syneditexport.pas +++ b/components/synedit/syneditexport.pas @@ -48,10 +48,9 @@ unit SynEditExport; interface uses - Classes, - SysUtils, + Classes, SysUtils, SynEditHighlighter, SynEditTextBase, SynEditTextBuffer, - FileUtil, LazUTF8, FPCAdds, LCLType, LCLProc, + FileUtil, LazUTF8, FPCAdds, LCLType, Graphics, Clipbrd, SynEditMiscProcs, SynEditStrConst; diff --git a/components/synedit/syneditfoldedview.pp b/components/synedit/syneditfoldedview.pp index f6a8412f39..d78a4f02d7 100644 --- a/components/synedit/syneditfoldedview.pp +++ b/components/synedit/syneditfoldedview.pp @@ -46,7 +46,7 @@ interface uses Classes, SysUtils, // LCL - LCLProc, Graphics, LCLType, + Graphics, LCLType, // LazUtils LazLoggerBase, LazMethodList, // SynEdit diff --git a/components/synedit/synedithighlighter.pp b/components/synedit/synedithighlighter.pp index 8dd821da86..5cc3cbc702 100644 --- a/components/synedit/synedithighlighter.pp +++ b/components/synedit/synedithighlighter.pp @@ -34,7 +34,7 @@ interface uses SysUtils, Classes, Registry, IniFiles, // LCL - LCLProc, LCLIntf, LCLType, Graphics, + LCLType, Graphics, // LazUtils LazUTF8, LazMethodList, // SynEdit diff --git a/components/synedit/synedithighlighterfoldbase.pas b/components/synedit/synedithighlighterfoldbase.pas index b58e5c575b..a6f2dd1ce0 100644 --- a/components/synedit/synedithighlighterfoldbase.pas +++ b/components/synedit/synedithighlighterfoldbase.pas @@ -58,10 +58,8 @@ interface uses SysUtils, Classes, math, Laz_AVL_Tree, - // LCL - LCLProc, // LazUtils - LazClasses, LazLoggerBase, + LazClasses, LazLoggerBase, LazTracer, // SynEdit SynEditHighlighter, SynEditTypes, LazSynEditText; diff --git a/components/synedit/syneditmarks.pp b/components/synedit/syneditmarks.pp index 86a59b1c28..f7be8c9efd 100644 --- a/components/synedit/syneditmarks.pp +++ b/components/synedit/syneditmarks.pp @@ -11,8 +11,8 @@ unit SynEditMarks; interface uses - Classes, Controls, SysUtils, math, SynEditMiscClasses, LazSynEditText, - LCLProc, ImgList; + Classes, Controls, SysUtils, Math, SynEditMiscClasses, LazSynEditText, + ImgList; type diff --git a/components/synedit/syneditmarkup.pp b/components/synedit/syneditmarkup.pp index 19719c9446..b390e52b82 100644 --- a/components/synedit/syneditmarkup.pp +++ b/components/synedit/syneditmarkup.pp @@ -26,8 +26,8 @@ unit SynEditMarkup; interface uses - Classes, SysUtils, Graphics, SynEditTypes, LazSynEditText, SynEditPointClasses, - SynEditMiscClasses, Controls, SynEditHighlighter, SynEditMiscProcs, LCLProc; + Classes, SysUtils, Graphics, Controls, LazLoggerBase, SynEditTypes, + LazSynEditText, SynEditPointClasses, SynEditMiscClasses, SynEditHighlighter; type TLazSynDisplayRtlInfo = record diff --git a/components/synedit/syneditmarkupbracket.pp b/components/synedit/syneditmarkupbracket.pp index 0fdc651c71..48af34718f 100644 --- a/components/synedit/syneditmarkupbracket.pp +++ b/components/synedit/syneditmarkupbracket.pp @@ -26,7 +26,7 @@ unit SynEditMarkupBracket; interface uses - Classes, SysUtils, Graphics, SynEditMarkup, SynEditMiscClasses, SynEditTypes, Controls, LCLProc; + Classes, SysUtils, Graphics, Controls, SynEditMarkup, SynEditMiscClasses, SynEditTypes; type TSynEditBracketHighlightStyle = ( diff --git a/components/synedit/syneditmarkupctrlmouselink.pp b/components/synedit/syneditmarkupctrlmouselink.pp index 4b7d8f7de0..a75d6c6146 100644 --- a/components/synedit/syneditmarkupctrlmouselink.pp +++ b/components/synedit/syneditmarkupctrlmouselink.pp @@ -26,8 +26,8 @@ unit SynEditMarkupCtrlMouseLink; interface uses - Classes, SysUtils, Graphics, SynEditMarkup, SynEditMiscClasses, - SynEditMouseCmds, LazSynEditText, SynEditTypes, Controls, LCLProc; + Classes, SysUtils, Graphics, Controls, SynEditMarkup, SynEditMiscClasses, + SynEditMouseCmds, LazSynEditText, SynEditTypes; type diff --git a/components/synedit/syneditmarkupfoldcoloring.pas b/components/synedit/syneditmarkupfoldcoloring.pas index 3e2763c4c5..08441fa9c7 100644 --- a/components/synedit/syneditmarkupfoldcoloring.pas +++ b/components/synedit/syneditmarkupfoldcoloring.pas @@ -49,8 +49,9 @@ unit SynEditMarkupFoldColoring; interface uses - Classes, SysUtils, Graphics, SynEditMarkup, SynEditMiscClasses, Controls, - LCLProc, LCLType, SynEditHighlighter, + Classes, SysUtils, Graphics, Controls, + SynEditMarkup, SynEditMiscClasses, + SynEditHighlighter, SynEditHighlighterFoldBase, LazSynEditText, SynEditTextBase, SynEditTypes, {$IFDEF WithSynMarkupFoldColorDebugGutter}SynGutterBase, SynTextDrawer,{$ENDIF} SynEditMiscProcs, diff --git a/components/synedit/syneditmarkupguttermark.pp b/components/synedit/syneditmarkupguttermark.pp index 261928c52d..f08754fac9 100644 --- a/components/synedit/syneditmarkupguttermark.pp +++ b/components/synedit/syneditmarkupguttermark.pp @@ -26,7 +26,7 @@ unit SynEditMarkupGutterMark; interface uses - Classes, SysUtils, Graphics, Controls, LCLProc, + Classes, SysUtils, Graphics, Controls, SynEditMarkup, SynEditMiscClasses, SynEditMarks; type diff --git a/components/synedit/syneditmarkupselection.pp b/components/synedit/syneditmarkupselection.pp index 762800047f..5a5dd20450 100644 --- a/components/synedit/syneditmarkupselection.pp +++ b/components/synedit/syneditmarkupselection.pp @@ -26,7 +26,7 @@ unit SynEditMarkupSelection; interface uses - Classes, SysUtils, Graphics, Controls, LCLProc, + Classes, SysUtils, Graphics, Controls, SynEditMarkup, SynEditMiscClasses, SynEditPointClasses, SynEditTypes; type diff --git a/components/synedit/syneditmarkupspecialchar.pp b/components/synedit/syneditmarkupspecialchar.pp index 4400ff6e48..e3bfb26996 100644 --- a/components/synedit/syneditmarkupspecialchar.pp +++ b/components/synedit/syneditmarkupspecialchar.pp @@ -26,7 +26,7 @@ unit SynEditMarkupSpecialChar; interface uses - Classes, SysUtils, Graphics, Controls, LCLProc, + Classes, SysUtils, Graphics, Controls, SynEditMarkup, SynEditTypes, SynEditMiscClasses; type diff --git a/components/synedit/syneditmarkupspecialline.pp b/components/synedit/syneditmarkupspecialline.pp index b778cb9b32..6def5ab999 100644 --- a/components/synedit/syneditmarkupspecialline.pp +++ b/components/synedit/syneditmarkupspecialline.pp @@ -26,7 +26,7 @@ unit SynEditMarkupSpecialLine; interface uses - Classes, SysUtils, Graphics, SynEditMarkup, SynEditMiscClasses, Controls, LCLProc; + Classes, SysUtils, Graphics, SynEditMarkup, SynEditMiscClasses; type diff --git a/components/synedit/syneditmarkupwordgroup.pp b/components/synedit/syneditmarkupwordgroup.pp index 261caff4da..7f2def8e2b 100644 --- a/components/synedit/syneditmarkupwordgroup.pp +++ b/components/synedit/syneditmarkupwordgroup.pp @@ -27,7 +27,7 @@ interface uses Classes, SysUtils, Graphics, SynEditMarkup, SynEditMiscClasses, Controls, - LCLProc, SynEditHighlighter, SynEditHighlighterFoldBase; + SynEditHighlighter, SynEditHighlighterFoldBase; type diff --git a/components/synedit/syneditmousecmds.pp b/components/synedit/syneditmousecmds.pp index c25bde715e..af449bdd0e 100644 --- a/components/synedit/syneditmousecmds.pp +++ b/components/synedit/syneditmousecmds.pp @@ -37,7 +37,7 @@ interface uses Classes, SysUtils, // LCL - LCLProc, Controls, Dialogs, Menus, + Controls, Dialogs, Menus, // LazUtils LazMethodList, // SynEdit diff --git a/components/synedit/synedittextbase.pas b/components/synedit/synedittextbase.pas index c9df9bd9c8..44668d6a43 100644 --- a/components/synedit/synedittextbase.pas +++ b/components/synedit/synedittextbase.pas @@ -38,8 +38,6 @@ interface uses Classes, SysUtils, - // LCL - LCLProc, // LazUtils LazMethodList, // SynEdit diff --git a/components/synedit/synedittextbuffer.pp b/components/synedit/synedittextbuffer.pp index d389d4fb52..3b594aea51 100644 --- a/components/synedit/synedittextbuffer.pp +++ b/components/synedit/synedittextbuffer.pp @@ -47,7 +47,7 @@ unit SynEditTextBuffer; interface uses - Classes, SysUtils, Graphics, LCLProc, LCLIntf, LCLType, + Classes, SysUtils, Graphics, LCLProc, SynEditTypes, LazSynEditText, SynEditTextBase, SynEditMiscProcs, SynEditMiscClasses, SynEditHighlighter; diff --git a/components/synedit/synedittexttabexpander.pas b/components/synedit/synedittexttabexpander.pas index 88883dd744..e882e58de1 100644 --- a/components/synedit/synedittexttabexpander.pas +++ b/components/synedit/synedittexttabexpander.pas @@ -26,7 +26,7 @@ unit SynEditTextTabExpander; interface uses - LCLProc, Classes, SysUtils, math, LazSynEditText, SynEditTextBase; + Classes, SysUtils, Math, LazSynEditText, SynEditTextBase; type diff --git a/components/synedit/synedittexttrimmer.pas b/components/synedit/synedittexttrimmer.pas index 46986e5703..3453b10f14 100644 --- a/components/synedit/synedittexttrimmer.pas +++ b/components/synedit/synedittexttrimmer.pas @@ -27,7 +27,6 @@ unit SynEditTextTrimmer; interface uses -LCLProc, Classes, SysUtils, LazSynEditText, SynEditTextBase, SynEditTypes, SynEditHighlighter, SynEditPointClasses, SynEditMiscProcs; diff --git a/components/synedit/synexporthtml.pas b/components/synedit/synexporthtml.pas index 0429f66ff2..71fbae980b 100644 --- a/components/synedit/synexporthtml.pas +++ b/components/synedit/synexporthtml.pas @@ -45,9 +45,9 @@ unit SynExportHTML; interface uses - Classes, + Classes, SysUtils, LCLIntf, LCLType, Graphics, ClipBrd, - SynEditHighlighter, SynEditExport, LCLProc, LazUtf8, SysUtils, SynEditStrConst; + SynEditHighlighter, SynEditExport, LazUtf8, SynEditStrConst; type THTMLFontSize = (fs01, fs02, fs03, fs04, fs05, fs06, fs07, fsDefault); //eb 2000-10-12 diff --git a/components/synedit/syngutter.pp b/components/synedit/syngutter.pp index f5e0ec8dd4..41e1378623 100644 --- a/components/synedit/syngutter.pp +++ b/components/synedit/syngutter.pp @@ -5,7 +5,7 @@ unit SynGutter; interface uses - SysUtils, Classes, Controls, Graphics, LCLType, LCLIntf, LCLProc, Menus, + SysUtils, Classes, Controls, Graphics, LCLType, LCLIntf, Menus, SynEditMarks, SynEditTypes, SynEditMiscClasses, SynEditMiscProcs, LazSynTextArea, SynTextDrawer, SynGutterBase, SynGutterLineNumber, SynGutterCodeFolding, SynGutterMarks, SynGutterChanges, SynEditMouseCmds, SynGutterLineOverview; diff --git a/components/synedit/syngutterbase.pp b/components/synedit/syngutterbase.pp index 3fd4ac7a9f..b197f805ac 100644 --- a/components/synedit/syngutterbase.pp +++ b/components/synedit/syngutterbase.pp @@ -7,7 +7,7 @@ interface uses Classes, SysUtils, math, // LCL - LCLProc, Graphics, Controls, Menus, LCLIntf, LCLType, + Graphics, Controls, Menus, LCLIntf, LCLType, // LazUtils LazMethodList, // SynEdit diff --git a/components/synedit/synguttercodefolding.pp b/components/synedit/synguttercodefolding.pp index 94e69db63d..085d66272d 100644 --- a/components/synedit/synguttercodefolding.pp +++ b/components/synedit/synguttercodefolding.pp @@ -29,7 +29,7 @@ interface uses SysUtils, Classes, Controls, Graphics, Menus, LCLIntf, SynGutterBase, SynEditMiscProcs, SynEditFoldedView, SynEditMouseCmds, - SynEditHighlighterFoldBase, LCLProc, LCLType, ImgList, Forms; + SynEditHighlighterFoldBase, LCLType, ImgList, Forms; type diff --git a/components/synedit/synguttermarks.pp b/components/synedit/synguttermarks.pp index 92f1225240..33056369c0 100644 --- a/components/synedit/synguttermarks.pp +++ b/components/synedit/synguttermarks.pp @@ -5,7 +5,7 @@ unit SynGutterMarks; interface uses - Classes, SysUtils, Graphics, LCLType, LCLIntf, LCLProc, Controls, ImgList, + Classes, SysUtils, Graphics, LCLType, LCLIntf, Controls, ImgList, SynGutterBase, SynEditMiscClasses, SynEditMarks, LazSynEditText, SynEditMiscProcs; diff --git a/components/synedit/synhighlightermulti.pas b/components/synedit/synhighlightermulti.pas index b51e6c88bf..84f85dcdc2 100644 --- a/components/synedit/synhighlightermulti.pas +++ b/components/synedit/synhighlightermulti.pas @@ -51,7 +51,7 @@ unit SynHighlighterMulti; interface uses - Classes, Graphics, SysUtils, LCLProc, math, RegExpr, + Classes, Graphics, SysUtils, Math, RegExpr, SynEditStrConst, SynEditTypes, SynEditTextBase, SynEditHighlighter, {$IFDEF SynDebugMultiHL}LazLoggerBase{$ELSE}LazLoggerDummy{$ENDIF}, LazUTF8 diff --git a/components/synedit/synhighlighterpas.pp b/components/synedit/synhighlighterpas.pp index f48a4c1247..a134e38903 100644 --- a/components/synedit/synhighlighterpas.pp +++ b/components/synedit/synhighlighterpas.pp @@ -51,8 +51,7 @@ unit SynHighlighterPas; interface uses - SysUtils, LCLProc, - Classes, Registry, Graphics, SynEditHighlighterFoldBase, SynEditMiscProcs, + SysUtils, Classes, Registry, Graphics, SynEditHighlighterFoldBase, SynEditMiscProcs, SynEditTypes, SynEditHighlighter, SynEditTextBase, SynEditStrConst, SynEditMiscClasses; type diff --git a/components/synedit/synpluginsyncronizededitbase.pp b/components/synedit/synpluginsyncronizededitbase.pp index 2f1b11c229..811dee5b70 100644 --- a/components/synedit/synpluginsyncronizededitbase.pp +++ b/components/synedit/synpluginsyncronizededitbase.pp @@ -26,7 +26,7 @@ unit SynPluginSyncronizedEditBase; interface uses - Classes, SysUtils, Graphics, LCLProc, + Classes, SysUtils, Graphics, SynEditMiscClasses, SynEdit, SynEditMarkup, SynEditMiscProcs, LazSynEditText, SynEditTextTrimmer, SynEditKeyCmds, SynEditTextBase; diff --git a/components/synedit/synplugintemplateedit.pp b/components/synedit/synplugintemplateedit.pp index 52d440dc7e..a0408de7bf 100644 --- a/components/synedit/synplugintemplateedit.pp +++ b/components/synedit/synplugintemplateedit.pp @@ -27,8 +27,7 @@ interface uses Classes, SysUtils, Graphics, LCLType, - SynPluginSyncronizedEditBase, SynEditKeyCmds, SynEdit, SynEditMiscProcs, - LCLProc; + SynPluginSyncronizedEditBase, SynEditKeyCmds, SynEdit, SynEditMiscProcs; type diff --git a/components/synedit/test/SynTest.lpi b/components/synedit/test/SynTest.lpi index a364a8f398..99a483d44d 100644 --- a/components/synedit/test/SynTest.lpi +++ b/components/synedit/test/SynTest.lpi @@ -552,7 +552,7 @@ - + diff --git a/components/synedit/test/testbookmarks.pas b/components/synedit/test/testbookmarks.pas index 42f3528213..6033ff7450 100644 --- a/components/synedit/test/testbookmarks.pas +++ b/components/synedit/test/testbookmarks.pas @@ -7,7 +7,7 @@ unit TestBookMarks; interface uses - Classes, SysUtils, testregistry, TestBase, LCLProc, + Classes, SysUtils, testregistry, TestBase, SynEdit, SynEditMarks, SynEditKeyCmds; type diff --git a/components/synedit/test/testfoldedview.pas b/components/synedit/test/testfoldedview.pas index b864fd144f..7e4f2e4eb1 100644 --- a/components/synedit/test/testfoldedview.pas +++ b/components/synedit/test/testfoldedview.pas @@ -12,7 +12,7 @@ interface uses Classes, SysUtils, math, testregistry, TestBase, TestHighlightPas, Forms, - LCLProc, SynEdit, SynHighlighterPas, SynEditFoldedView, + LazLoggerBase, SynEdit, SynHighlighterPas, SynEditFoldedView, SynEditHighlighterFoldBase, SynGutterCodeFolding, SynEditKeyCmds, SynEditTypes, SynEditMiscProcs; diff --git a/components/synedit/test/testhighlightmulti.pas b/components/synedit/test/testhighlightmulti.pas index db8e15f73f..0bb2b7de5a 100644 --- a/components/synedit/test/testhighlightmulti.pas +++ b/components/synedit/test/testhighlightmulti.pas @@ -5,7 +5,7 @@ unit TestHighlightMulti; interface uses - Classes, SysUtils, math, LCLProc, testregistry, TestBase, Forms, SynEditHighlighter, + Classes, SysUtils, Math, testregistry, TestBase, Forms, SynEditHighlighter, SynHighlighterMulti, SynHighlighterLFM, SynHighlighterXML, SynHighlighterPas, SynEditKeyCmds, LazSynEditText, SynEditTextBuffer, SynEditTypes, LazLoggerBase; diff --git a/components/synedit/test/testhighlightpas.pas b/components/synedit/test/testhighlightpas.pas index ac32143952..33d174321f 100644 --- a/components/synedit/test/testhighlightpas.pas +++ b/components/synedit/test/testhighlightpas.pas @@ -5,7 +5,7 @@ unit TestHighlightPas; interface uses - Classes, SysUtils, testregistry, TestBase, Forms, LCLProc, + Classes, SysUtils, testregistry, TestBase, Forms, LazLoggerBase, TestHighlightFoldBase, SynEdit, SynEditTypes, SynHighlighterPas, SynEditHighlighterFoldBase, SynEditHighlighter; diff --git a/components/synedit/test/testmarkupfoldcoloring.pas b/components/synedit/test/testmarkupfoldcoloring.pas index b943f5576c..ac5d594851 100644 --- a/components/synedit/test/testmarkupfoldcoloring.pas +++ b/components/synedit/test/testmarkupfoldcoloring.pas @@ -6,7 +6,7 @@ interface uses Classes, SysUtils, math, testregistry, TestBase, TestHighlightPas, Forms, - LCLProc, LCLType, SynEdit, SynHighlighterPas, SynEditMarkupFoldColoring, + LCLType, SynEdit, SynHighlighterPas, SynEditMarkupFoldColoring, SynEditMiscClasses, SynEditMarkup, SynEditHighlighterFoldBase; type diff --git a/components/synedit/test/testmarkuphighall.pas b/components/synedit/test/testmarkuphighall.pas index 235e94a7d7..dd548a6261 100644 --- a/components/synedit/test/testmarkuphighall.pas +++ b/components/synedit/test/testmarkuphighall.pas @@ -5,8 +5,8 @@ unit TestMarkupHighAll; interface uses - Classes, SysUtils, testregistry, TestBase, LCLProc, Controls, - Graphics, SynEdit, SynEditMarkupHighAll; + Classes, SysUtils, testregistry, TestBase, Controls, Graphics, LazLoggerBase, + SynEdit, SynEditMarkupHighAll; type diff --git a/components/synedit/test/testmarkupifdef.pas b/components/synedit/test/testmarkupifdef.pas index 74586afc3c..32926d95cb 100644 --- a/components/synedit/test/testmarkupifdef.pas +++ b/components/synedit/test/testmarkupifdef.pas @@ -5,7 +5,7 @@ unit TestMarkupIfDef; interface uses - Classes, SysUtils, testregistry, TestBase, TestHighlightFoldBase, LCLProc, + Classes, SysUtils, testregistry, TestBase, TestHighlightFoldBase, LazLoggerBase, SynEdit, SynEditMarkupIfDef, SynHighlighterPas, SynEditHighlighterFoldBase, SynEditMiscClasses, SynEditFoldedView; diff --git a/components/synedit/test/testmarkupwordgroup.pas b/components/synedit/test/testmarkupwordgroup.pas index 15ade634db..bf894db291 100644 --- a/components/synedit/test/testmarkupwordgroup.pas +++ b/components/synedit/test/testmarkupwordgroup.pas @@ -5,7 +5,7 @@ unit TestMarkupwordGroup; interface uses - Classes, SysUtils, testregistry, TestBase, TestHighlightPas, Forms, LCLProc, + Classes, SysUtils, testregistry, TestBase, TestHighlightPas, Forms, SynEdit, SynHighlighterPas, SynEditMarkupWordGroup; type diff --git a/components/synedit/test/testsynbeautifier.pas b/components/synedit/test/testsynbeautifier.pas index 8375dfa384..0639a0ee15 100644 --- a/components/synedit/test/testsynbeautifier.pas +++ b/components/synedit/test/testsynbeautifier.pas @@ -7,7 +7,7 @@ interface uses Classes, SysUtils, testregistry, TestBase, TestHighlightPas, SynEdit, SynEditTextTrimmer, SynEditKeyCmds, SynBeautifier, SynEditTypes, SynBeautifierPascal, - LCLType, LCLProc; + LCLType, LazLoggerBase; type diff --git a/components/synedit/test/testsyncroedit.pas b/components/synedit/test/testsyncroedit.pas index 8a941c1aeb..2ef4c20de6 100644 --- a/components/synedit/test/testsyncroedit.pas +++ b/components/synedit/test/testsyncroedit.pas @@ -5,7 +5,7 @@ unit TestSyncroEdit; interface uses - Classes, SysUtils, math, testregistry, LCLProc, LCLType, Forms, TestBase, + Classes, SysUtils, Math, testregistry, LCLType, LazLoggerBase, Forms, TestBase, SynEdit, SynPluginSyncroEdit, SynEditKeyCmds, SynPluginTemplateEdit, SynPluginSyncronizedEditBase, SynEditTypes; diff --git a/components/synedit/test/testsynselection.pas b/components/synedit/test/testsynselection.pas index c040bc5ee9..aee7ef6e0b 100644 --- a/components/synedit/test/testsynselection.pas +++ b/components/synedit/test/testsynselection.pas @@ -19,7 +19,7 @@ interface uses Classes, SysUtils, testregistry, TestBase, Forms, SynEdit, SynEditTypes, SynEditTextTrimmer, SynEditKeyCmds, - LCLType, LCLProc; + LCLType, LazLoggerBase; type diff --git a/components/synedit/test/testsynsharededits.pas b/components/synedit/test/testsynsharededits.pas index 43890327f5..fd39daf277 100644 --- a/components/synedit/test/testsynsharededits.pas +++ b/components/synedit/test/testsynsharededits.pas @@ -7,7 +7,7 @@ unit TestSynSharedEdits; interface uses - Classes, SysUtils, testregistry, TestBase, LCLProc, + Classes, SysUtils, testregistry, TestBase, SynEdit, SynEditMarks, SynEditKeyCmds; type diff --git a/components/synedit/test/testtrimspace.pas b/components/synedit/test/testtrimspace.pas index a725bb8c83..61a0c471af 100644 --- a/components/synedit/test/testtrimspace.pas +++ b/components/synedit/test/testtrimspace.pas @@ -16,7 +16,7 @@ or between two empty lines *) uses - Classes, SysUtils, Forms, testregistry, TestBase, LCLProc, LCLType, + Classes, SysUtils, Forms, testregistry, TestBase, LCLType, SynEdit, SynEditKeyCmds, SynEditTextTrimmer, SynEditTypes; type diff --git a/converter/chgencodingdlg.pas b/converter/chgencodingdlg.pas index 5ab4394f30..92d21d57ed 100644 --- a/converter/chgencodingdlg.pas +++ b/converter/chgencodingdlg.pas @@ -33,7 +33,7 @@ uses // RTL + FCL Classes, SysUtils, RegExpr, Laz_AVL_Tree, // LCL - LCLProc, Forms, Controls, ExtCtrls, StdCtrls, ComCtrls, Buttons, + Forms, Controls, ExtCtrls, StdCtrls, ComCtrls, Buttons, // CodeTools CodeCache, CodeToolManager, FileProcs, // LazUtils diff --git a/converter/convertdelphi.pas b/converter/convertdelphi.pas index d219e2cab6..7869b16774 100644 --- a/converter/convertdelphi.pas +++ b/converter/convertdelphi.pas @@ -35,11 +35,12 @@ uses // RTL + FCL Classes, SysUtils, contnrs, IniFiles, // LCL - LCLProc, Forms, Controls, Dialogs, + Forms, Controls, Dialogs, // CodeTools - CodeToolManager, DefineTemplates, CodeCache, LinkScanner, FileProcs, + CodeToolManager, DefineTemplates, CodeCache, LinkScanner, // LazUtils - LConvEncoding, FileUtil, LazFileUtils, LazUTF8, LazStringUtils, AvgLvlTree, + LConvEncoding, FileUtil, LazFileUtils, LazUTF8, LazStringUtils, LazLoggerBase, + AvgLvlTree, // IDEIntf ComponentReg, IDEDialogs, LazIDEIntf, PackageIntf, ProjectIntf, IDEExternToolIntf, IDEOptEditorIntf, diff --git a/converter/lazxmlforms.pas b/converter/lazxmlforms.pas index fc8a58d34c..843049d19e 100644 --- a/converter/lazxmlforms.pas +++ b/converter/lazxmlforms.pas @@ -36,8 +36,8 @@ unit LazXMLForms; interface uses - Classes, SysUtils, LCLProc, - laz2_DOM, Laz2_XMLCfg, Laz_XMLStreaming; + Classes, SysUtils, + laz2_DOM, Laz2_XMLCfg, Laz_XMLStreaming, LazLoggerBase; function CreateXMLWriter(ADoc: TDOMDocument; const Path: string; Append: Boolean; var DestroyDriver: boolean): TWriter; diff --git a/converter/missingpropertiesdlg.pas b/converter/missingpropertiesdlg.pas index 43857c00e4..5a03fbf003 100644 --- a/converter/missingpropertiesdlg.pas +++ b/converter/missingpropertiesdlg.pas @@ -33,10 +33,10 @@ interface uses // FCL+LCL - Classes, SysUtils, contnrs, - LCLProc, Forms, Controls, Grids, LResources, Dialogs, Buttons, StdCtrls, ExtCtrls, + Classes, SysUtils, Contnrs, + Forms, Controls, Grids, LResources, Dialogs, Buttons, StdCtrls, ExtCtrls, // LazUtils - LazFileUtils, LazUTF8, AvgLvlTree, + LazFileUtils, LazUTF8, LazLoggerBase, AvgLvlTree, // components SynHighlighterLFM, SynEdit, SynEditMiscClasses, // codetools diff --git a/converter/missingunits.pas b/converter/missingunits.pas index 82b18da736..57c8cb5870 100644 --- a/converter/missingunits.pas +++ b/converter/missingunits.pas @@ -34,10 +34,7 @@ uses // FCL Classes, SysUtils, // LCL - LCLProc, LResources, Forms, Controls, Graphics, Dialogs, Buttons, StdCtrls, - CheckLst, Menus, ExtCtrls, - // LazUtils - FileUtil, + Forms, Controls, Graphics, Dialogs, Buttons, StdCtrls, CheckLst, Menus, ExtCtrls, // CodeTools DefineTemplates, // IdeIntf diff --git a/debugger/frames/debugger_class_options.pas b/debugger/frames/debugger_class_options.pas index efd4edf447..4085baa4f8 100644 --- a/debugger/frames/debugger_class_options.pas +++ b/debugger/frames/debugger_class_options.pas @@ -40,10 +40,9 @@ uses // IdeDebugger Debugger, IdeDebuggerOpts, EnvDebuggerOptions, // IdeConfig - EnvironmentOpts, + EnvironmentOpts, TransferMacros, // IDE - TransferMacros, LazarusIDEStrConsts, PathEditorDlg, DialogProcs, - Project, EnvGuiOptions; + LazarusIDEStrConsts, PathEditorDlg, DialogProcs, Project, EnvGuiOptions; type diff --git a/designer/changeclassdialog.pas b/designer/changeclassdialog.pas index 93b695f6a5..e031ae6e52 100644 --- a/designer/changeclassdialog.pas +++ b/designer/changeclassdialog.pas @@ -37,7 +37,9 @@ interface uses Classes, SysUtils, AvgLvlTree, // LCL - LCLProc, LCLType, LResources, Forms, Controls, Dialogs, StdCtrls, ButtonPanel, + LCLType, Forms, Controls, Dialogs, StdCtrls, ButtonPanel, + // LazUtils + LazLoggerBase, // Codetools LFMTrees, CodeCache, CodeToolManager, // IdeIntf diff --git a/designer/controlselection.pp b/designer/controlselection.pp index f8912199f9..c7f059d234 100644 --- a/designer/controlselection.pp +++ b/designer/controlselection.pp @@ -39,7 +39,7 @@ interface uses Types, Classes, SysUtils, Math, FPCanvas, // LCL - LCLIntf, LCLType, LCLProc, Controls, Forms, Graphics, Menus, ComCtrls, + LCLIntf, LCLProc, Controls, Forms, Graphics, Menus, ComCtrls, // LazUtils GraphType, GraphMath, // IDEIntf diff --git a/ide/abstractsmethodsdlg.pas b/ide/abstractsmethodsdlg.pas index 04005e8a2f..19a974c006 100644 --- a/ide/abstractsmethodsdlg.pas +++ b/ide/abstractsmethodsdlg.pas @@ -33,8 +33,9 @@ unit AbstractsMethodsDlg; interface uses - Classes, SysUtils, LCLProc, Forms, Controls, Graphics, Dialogs, - CheckLst, StdCtrls, ExtCtrls, Buttons, + Classes, SysUtils, + Forms, Controls, Graphics, Dialogs, CheckLst, StdCtrls, ExtCtrls, Buttons, + LazLoggerBase, CodeTree, PascalParserTool, CodeCache, CodeToolManager, LazIDEIntf, SrcEditorIntf, IDEDialogs, IdeIntfStrConsts, LazarusIDEStrConsts; diff --git a/ide/allcompileroptions.pas b/ide/allcompileroptions.pas index b2166a79d9..da994f7f15 100644 --- a/ide/allcompileroptions.pas +++ b/ide/allcompileroptions.pas @@ -28,9 +28,14 @@ unit AllCompilerOptions; interface uses - Classes, SysUtils, math, contnrs, + Classes, SysUtils, Math, Contnrs, + // LCL Forms, Controls, StdCtrls, Buttons, ButtonPanel, EditBtn, ExtCtrls, - LCLProc, LazUTF8, Compiler, IDEImagesIntf, LazarusIDEStrConsts; + // LazUtils + LazUTF8, LazLoggerBase, + // IdeIntf + IDEImagesIntf, + Compiler, LazarusIDEStrConsts; type diff --git a/ide/buildfiledlg.pas b/ide/buildfiledlg.pas index 068437987c..5ac75ee8fc 100644 --- a/ide/buildfiledlg.pas +++ b/ide/buildfiledlg.pas @@ -9,17 +9,17 @@ interface uses Classes, SysUtils, // LCL - LCLProc, LCLType, Forms, Controls, Graphics, ComCtrls, Dialogs, StdCtrls, ButtonPanel, + LCLType, Forms, Controls, Graphics, ComCtrls, Dialogs, StdCtrls, ButtonPanel, // LazUtils - LazFileUtils, LazStringUtils, + LazFileUtils, LazStringUtils, LazTracer, // CodeTools BasicCodeTools, // IdeIntf IdeIntfStrConsts, IDEHelpIntf, MacroDefIntf, LazIDEIntf, IDEUtils, InputHistory, // IdeConfig - EnvironmentOpts, + EnvironmentOpts, TransferMacros, // IDE - LazarusIDEStrConsts, TransferMacros; + LazarusIDEStrConsts; type diff --git a/ide/buildlazdialog.pas b/ide/buildlazdialog.pas index 31bc50a8a6..53c104c398 100644 --- a/ide/buildlazdialog.pas +++ b/ide/buildlazdialog.pas @@ -48,7 +48,7 @@ uses {$IFDEF Windows} Windows, {$ENDIF} - LCLProc, Forms, Controls, LCLType, StdCtrls, ExtCtrls, Buttons, Dialogs, + Forms, Controls, StdCtrls, ExtCtrls, Buttons, Dialogs, LCLPlatformDef, CheckLst, Menus, ComCtrls, // LazUtils FPCAdds, FileUtil, LazFileUtils, LazUTF8, LazLoggerBase, LazFileCache, @@ -59,9 +59,10 @@ uses // IDEIntf IdeIntfStrConsts, LazIDEIntf, IDEMsgIntf, IDEHelpIntf, IDEImagesIntf, IDEWindowIntf, PackageIntf, IDEExternToolIntf, IDEDialogs, IDEUtils, + // IdeConfig + EnvironmentOpts, LazConf, TransferMacros, // IDE - LazarusIDEStrConsts, TransferMacros, LazConf, DialogProcs, - MainBar, EnvironmentOpts, + LazarusIDEStrConsts, DialogProcs, MainBar, ApplicationBundle, ModeMatrixOpts, CompilerOptions, BuildProfileManager, GenericListEditor, GenericCheckList, PackageSystem, PackageDefs; diff --git a/ide/buildmodesmanager.pas b/ide/buildmodesmanager.pas index d00cf4cea2..c35152ba5d 100644 --- a/ide/buildmodesmanager.pas +++ b/ide/buildmodesmanager.pas @@ -34,16 +34,17 @@ uses Classes, SysUtils, {$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes, // LCL - Forms, Controls, Dialogs, StdCtrls, Grids, Menus, ComCtrls, ButtonPanel, LCLProc, + Forms, Dialogs, StdCtrls, Grids, Menus, ComCtrls, ButtonPanel, // LazUtils LazFileUtils, LazLoggerBase, // IdeIntf IDEDialogs, CompOptsIntf, IDEOptionsIntf, LazIDEIntf, IDEImagesIntf, + // IdeConfig + EnvironmentOpts, TransferMacros, SearchPathProcs, // IDE MainBase, MainBar, BasePkgManager, PackageDefs, Project, CompilerOptions, - EnvironmentOpts, TransferMacros, BaseBuildManager, Compiler_ModeMatrix, - BuildModeDiffDlg, GenericCheckList, IDEProcs, LazarusIDEStrConsts, - SearchPathProcs; + BaseBuildManager, Compiler_ModeMatrix, BuildModeDiffDlg, GenericCheckList, + LazarusIDEStrConsts; type diff --git a/ide/buildprofilemanager.pas b/ide/buildprofilemanager.pas index 996f8cfe09..1a20ff40bd 100644 --- a/ide/buildprofilemanager.pas +++ b/ide/buildprofilemanager.pas @@ -40,10 +40,11 @@ uses // Codetools DefineTemplates, // IdeIntf - IDEImagesIntf, IDEHelpIntf, IDEDialogs, + IdeIntfStrConsts, IDEImagesIntf, IDEHelpIntf, IDEDialogs, + // IdeConfig + EnvironmentOpts, TransferMacros, IdeXmlConfigProcs, // IDE - LazarusIDEStrConsts, IdeIntfStrConsts, IDEProcs, TransferMacros, EnvironmentOpts, - IdeXmlConfigProcs; + LazarusIDEStrConsts, IDEProcs; type diff --git a/ide/checkcompileropts.pas b/ide/checkcompileropts.pas index cb81a31af2..f4d1ec29b5 100644 --- a/ide/checkcompileropts.pas +++ b/ide/checkcompileropts.pas @@ -42,9 +42,11 @@ uses // IDEIntf ProjectIntf, MacroIntf, IDEExternToolIntf, LazIDEIntf, IDEDialogs, PackageIntf, IDEMsgIntf, + // IdeConfig + TransferMacros, SearchPathProcs, // IDE Project, PackageSystem, IDEProcs, LazarusIDEStrConsts, PackageDefs, - CompilerOptions, TransferMacros, SearchPathProcs; + CompilerOptions; type TCompilerOptionsTest = ( diff --git a/ide/checkcompoptsfornewunitdlg.pas b/ide/checkcompoptsfornewunitdlg.pas index 394c6b494c..8674944b8c 100644 --- a/ide/checkcompoptsfornewunitdlg.pas +++ b/ide/checkcompoptsfornewunitdlg.pas @@ -31,11 +31,13 @@ unit CheckCompOptsForNewUnitDlg; interface uses - Classes, SysUtils, LCLProc, FileUtil, Forms, Controls, Graphics, Dialogs, - StdCtrls, ExtCtrls, ButtonPanel, - CodeToolManager, BasicCodeTools, DefineTemplates, - CompOptsIntf, ProjectIntf, IDEDialogs, - InputHistory, TransferMacros, Project, IdeIntfStrConsts, LazarusIDEStrConsts; + SysUtils, + Forms, Controls, Dialogs, StdCtrls, ButtonPanel, + BasicCodeTools, DefineTemplates, + CompOptsIntf, + IDEDialogs, InputHistory, IdeIntfStrConsts, + TransferMacros, + Project, LazarusIDEStrConsts; type diff --git a/ide/checklfmdlg.pas b/ide/checklfmdlg.pas index e34145aeb0..e27d2cf727 100644 --- a/ide/checklfmdlg.pas +++ b/ide/checklfmdlg.pas @@ -34,9 +34,9 @@ uses // FCL Classes, SysUtils, Math, TypInfo, contnrs, // LCL - LCLProc, LResources, Forms, Controls, Dialogs, Buttons, StdCtrls, ExtCtrls, + LResources, Forms, Controls, Dialogs, Buttons, StdCtrls, ExtCtrls, // LazUtils - LazStringUtils, AvgLvlTree, + LazStringUtils, LazLoggerBase, LazTracer, AvgLvlTree, // CodeTools BasicCodeTools, CodeCache, CodeToolManager, LFMTrees, // SynEdit diff --git a/ide/cleandirdlg.pas b/ide/cleandirdlg.pas index 28463a72c0..021f5e4d0f 100644 --- a/ide/cleandirdlg.pas +++ b/ide/cleandirdlg.pas @@ -32,15 +32,15 @@ interface uses Classes, SysUtils, RegExpr, // LCL - LCLProc, Forms, Controls, Graphics, Dialogs, StdCtrls, ButtonPanel, + Forms, Controls, Graphics, Dialogs, StdCtrls, ButtonPanel, // LazUtils - FileUtil, LazFileUtils, Laz2_XMLCfg, LazStringUtils, + FileUtil, LazFileUtils, Laz2_XMLCfg, LazStringUtils, LazLoggerBase, // IdeIntf IdeIntfStrConsts, IDEWindowIntf, IDEHelpIntf, IDEDialogs, InputHistory, // IdeConfig - RecentListProcs, LazConf, EnvironmentOpts, + RecentListProcs, LazConf, EnvironmentOpts, TransferMacros, // IDE - LazarusIDEStrConsts, TransferMacros, ShowDeletingFilesDlg; + LazarusIDEStrConsts, ShowDeletingFilesDlg; type diff --git a/ide/codebrowser.pas b/ide/codebrowser.pas index 01dbe19823..a226bbee05 100644 --- a/ide/codebrowser.pas +++ b/ide/codebrowser.pas @@ -47,9 +47,9 @@ interface uses // RTL + FCL - Classes, SysUtils, types, Laz_AVL_Tree, + Classes, SysUtils, Types, Laz_AVL_Tree, // LCL - LCLProc, Forms, Controls, Graphics, Dialogs, Clipbrd, StdCtrls, + Forms, Controls, Graphics, Dialogs, Clipbrd, StdCtrls, ExtCtrls, ComCtrls, Buttons, Menus, HelpIntfs, // CodeTools BasicCodeTools, DefineTemplates, CodeTree, CodeCache, CodeToolManager, diff --git a/ide/codeexplopts.pas b/ide/codeexplopts.pas index afcf1e8b35..f7fd2ff805 100644 --- a/ide/codeexplopts.pas +++ b/ide/codeexplopts.pas @@ -37,11 +37,11 @@ uses // RTL + FCL Classes, SysUtils, Laz_AVL_Tree, // LCL - LCLProc, Forms, Controls, Graphics, Dialogs, Buttons, + Forms, Controls, Graphics, Dialogs, Buttons, // CodeTools - BasicCodeTools, FileProcs, + BasicCodeTools, // LazUtils - AvgLvlTree, Laz2_XMLCfg, LazFileUtils, LazFileCache, + AvgLvlTree, Laz2_XMLCfg, LazFileUtils, LazFileCache, LazLoggerBase, // IDEIntf IDEOptionsIntf, IDEOptEditorIntf, // IDE diff --git a/ide/codehelp.pas b/ide/codehelp.pas index 82190ff10d..7d54b3dacb 100644 --- a/ide/codehelp.pas +++ b/ide/codehelp.pas @@ -55,9 +55,11 @@ uses // IDEIntf IDECommands, IDEMsgIntf, MacroIntf, PackageIntf, LazHelpIntf, ProjectIntf, IDEDialogs, IDEHelpIntf, LazIDEIntf, IDEExternToolIntf, + // IdeConfig + EnvironmentOpts, TransferMacros, // IDE - EditorOptions, LazarusIDEStrConsts, IDEProcs, PackageDefs, EnvironmentOpts, - TransferMacros, PackageSystem, DialogProcs, KeyMapping, SearchPathProcs; + EditorOptions, LazarusIDEStrConsts, IDEProcs, PackageDefs, PackageSystem, + DialogProcs, KeyMapping, SearchPathProcs; const IDEProjectName = 'Lazarus'; diff --git a/ide/codemacroprompt.pas b/ide/codemacroprompt.pas index 705d1828d8..640bd0f0d5 100644 --- a/ide/codemacroprompt.pas +++ b/ide/codemacroprompt.pas @@ -31,10 +31,12 @@ unit CodeMacroPrompt; interface uses - Classes, SysUtils, LCLProc, Forms, Controls, Graphics, Dialogs, + Classes, SysUtils, + Forms, Controls, Graphics, Dialogs, + LazUTF8, LazLoggerBase, BasicCodeTools, CodeToolManager, SynEditAutoComplete, SynPluginTemplateEdit, SynPluginSyncronizedEditBase, SynEdit, SynEditTypes, - LazIDEIntf, SrcEditorIntf, LazUTF8; + LazIDEIntf, SrcEditorIntf; type TCodeMacroPromptDlg = class(TForm) diff --git a/ide/codetoolsdefines.pas b/ide/codetoolsdefines.pas index 9c88233a53..f714437e3c 100644 --- a/ide/codetoolsdefines.pas +++ b/ide/codetoolsdefines.pas @@ -56,9 +56,11 @@ uses CodeToolManager, DefineTemplates, // IdeIntf IdeIntfStrConsts, IDEWindowIntf, IDEImagesIntf, IDEDialogs, + // IdeConfig + LazConf, TransferMacros, // IDE - LazarusIDEStrConsts, CodeToolsOptions, CodeToolsDefPreview, TransferMacros, - EditorOptions, InputFileDialog, LazConf, IDEProcs, EditDefineTree, CompilerOptions; + LazarusIDEStrConsts, CodeToolsOptions, CodeToolsDefPreview, + EditorOptions, InputFileDialog, IDEProcs, EditDefineTree, CompilerOptions; type diff --git a/ide/codetoolsoptions.pas b/ide/codetoolsoptions.pas index 48560ffd13..633859b17d 100644 --- a/ide/codetoolsoptions.pas +++ b/ide/codetoolsoptions.pas @@ -37,15 +37,15 @@ interface uses Classes, SysUtils, // LazUtils - LazFileUtils, Laz2_XMLCfg, LazUTF8, LazFileCache, LazStringUtils, - // LCL - LCLProc, LCLType, + LazFileUtils, Laz2_XMLCfg, LazUTF8, LazFileCache, LazStringUtils, LazLoggerBase, // CodeTools CodeToolManager, DefineTemplates, SourceChanger, // IdeIntf IDEOptionsIntf, IDEOptEditorIntf, MacroIntf, + // LazConfig + LazConf, // IDE - LazConf, LazarusIDEStrConsts; + LazarusIDEStrConsts; const DefaultIndentationFilename = 'laz_indentation.pas'; // in directory GetPrimaryConfigPath diff --git a/ide/compatibilityrestrictions.pas b/ide/compatibilityrestrictions.pas index 89a1dae0bb..682c8481b1 100644 --- a/ide/compatibilityrestrictions.pas +++ b/ide/compatibilityrestrictions.pas @@ -36,9 +36,9 @@ interface uses Classes, SysUtils, // LCL - Forms, LCLProc, LCLPlatformDef, + Forms, LCLPlatformDef, // LazUtils - Laz2_DOM, Laz2_XMLRead, Laz2_XMLWrite, StringHashList, + Laz2_DOM, Laz2_XMLRead, Laz2_XMLWrite, StringHashList, LazLoggerBase, // IdeIntf OIFavoriteProperties, PackageIntf, ComponentReg, // IDE diff --git a/ide/compiler.pp b/ide/compiler.pp index f711c19f72..e82d41c43b 100644 --- a/ide/compiler.pp +++ b/ide/compiler.pp @@ -43,11 +43,13 @@ uses // LazUtils FPCAdds, LazUTF8, LazFileUtils, LazUtilities, LazLoggerBase, // Codetools - DefineTemplates, LinkScanner, CodeToolManager, TransferMacros, + DefineTemplates, LinkScanner, CodeToolManager, // BuildIntf IDEExternToolIntf, // IdeIntf IDEMsgIntf, LazIDEIntf, + // IdeConfig + TransferMacros, // IDE IDECmdLine, LazarusIDEStrConsts, CompilerOptions, Project; diff --git a/ide/compoptsmodes.pas b/ide/compoptsmodes.pas index d431a35f6c..35eadd8906 100644 --- a/ide/compoptsmodes.pas +++ b/ide/compoptsmodes.pas @@ -38,8 +38,11 @@ unit CompOptsModes; interface uses - Classes, SysUtils, LCLProc, ExprEval, - IDEProcs, ProjectIntf; + Classes, SysUtils, + ExprEval, + LazLoggerBase, + ProjectIntf, + IDEProcs; type diff --git a/ide/dialogprocs.pas b/ide/dialogprocs.pas index 245fd7f3dd..75c8406956 100644 --- a/ide/dialogprocs.pas +++ b/ide/dialogprocs.pas @@ -37,16 +37,17 @@ interface uses Classes, SysUtils, + {$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes, // LCL - LCLProc, LResources, Forms, Controls, Dialogs, ComCtrls, + LResources, Dialogs, ComCtrls, // LazUtils - FileUtil, LazFileUtils, LazFileCache, Laz2_XMLCfg, + FileUtil, LazFileUtils, LazFileCache, Laz2_XMLCfg, LazLoggerBase, // CodeTools - FileProcs, CodeToolsConfig, CodeCache, CodeToolManager, + CodeToolsConfig, CodeCache, CodeToolManager, // IdeIntf LazIDEIntf, IDEDialogs, // IDE - IDEProcs, LazarusIDEStrConsts; + LazarusIDEStrConsts; type // load buffer flags diff --git a/ide/diskdiffsdialog.pas b/ide/diskdiffsdialog.pas index c3a7e231b6..9c998a3b5f 100644 --- a/ide/diskdiffsdialog.pas +++ b/ide/diskdiffsdialog.pas @@ -32,17 +32,19 @@ uses Classes, SysUtils, {$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes, // LCL - LCLProc, LCLType, Forms, StdCtrls, ExtCtrls, CheckLst, ButtonPanel, Buttons, + Forms, StdCtrls, ExtCtrls, CheckLst, ButtonPanel, Buttons, // CodeTools - FileProcs, CodeCache, + CodeCache, // LazUtils - LazFileUtils, LazFileCache, + LazFileUtils, LazFileCache, LazLoggerBase, // IdeIntf IDEImagesIntf, // SynEdit SynEdit, SynHighlighterDiff, + // IdeConfig + EnvironmentOpts, // IDE - Project, PackageDefs, DiffPatch, LazarusIDEStrConsts, EnvironmentOpts, EditorOptions; + Project, PackageDefs, DiffPatch, LazarusIDEStrConsts, EditorOptions; type PDiffItem = ^TDiffItem; diff --git a/ide/editorfilemanager.pas b/ide/editorfilemanager.pas index c0301ba6e4..687f94bb72 100644 --- a/ide/editorfilemanager.pas +++ b/ide/editorfilemanager.pas @@ -5,10 +5,13 @@ unit EditorFileManager; interface uses - Classes, sysutils, Forms, Controls, CheckLst, ButtonPanel, StdCtrls, Buttons, - ExtCtrls, Menus, LCLProc, LCLType, IDEImagesIntf, LazIDEIntf, IDEHelpIntf, - SrcEditorIntf, IDEWindowIntf, SourceEditor, LazarusIDEStrConsts, - ListFilterEdit, IDEOptionDefs; + Classes, sysutils, + Forms, Controls, CheckLst, ButtonPanel, StdCtrls, Buttons, ExtCtrls, Menus, LCLType, + LazLoggerBase, + ListFilterEdit, + IDEImagesIntf, LazIDEIntf, IDEHelpIntf, SrcEditorIntf, IDEWindowIntf, + IDEOptionDefs, + SourceEditor, LazarusIDEStrConsts; type diff --git a/ide/editoroptions.pp b/ide/editoroptions.pp index 6856356e54..00e479402a 100644 --- a/ide/editoroptions.pp +++ b/ide/editoroptions.pp @@ -42,9 +42,9 @@ uses // RTL, FCL Classes, SysUtils, typinfo, resource, // LCL - Graphics, LCLProc, LResources, Forms, Dialogs, ComCtrls, LCLType, Controls, + Graphics, LResources, Forms, Dialogs, ComCtrls, LCLType, Controls, // LazUtils - FileUtil, LazFileUtils, LazUTF8, LazClasses, Laz2_XMLCfg, LazStringUtils, + FileUtil, LazFileUtils, LazUTF8, LazClasses, Laz2_XMLCfg, LazStringUtils, LazLoggerBase, // Synedit SynEdit, SynEditAutoComplete, SynEditKeyCmds, SynEditTypes, SynEditMiscClasses, SynBeautifier, SynEditTextTrimmer, SynEditMouseCmds, diff --git a/ide/editortoolbarstatic.pas b/ide/editortoolbarstatic.pas index e8cefd9731..e1b7e2e413 100644 --- a/ide/editortoolbarstatic.pas +++ b/ide/editortoolbarstatic.pas @@ -26,11 +26,9 @@ interface uses SysUtils, Classes, fgl, // LCL - ComCtrls, Controls, LCLProc, Menus, - // LazUtils - LazConfigStorage, Laz2_XMLCfg, + ComCtrls, Controls, Menus, // IdeIntf - BaseIDEIntf, IDEImagesIntf, SrcEditorIntf, + IDEImagesIntf, SrcEditorIntf, // IdeConfig EditorToolBarOptions, // IDE diff --git a/ide/emptymethodsdlg.pas b/ide/emptymethodsdlg.pas index f6640145ca..d06fada3d1 100644 --- a/ide/emptymethodsdlg.pas +++ b/ide/emptymethodsdlg.pas @@ -34,7 +34,9 @@ interface uses Classes, SysUtils, TypInfo, // LCL - LCLProc, Forms, Controls, Dialogs, StdCtrls, ButtonPanel, + Forms, Controls, Dialogs, StdCtrls, ButtonPanel, + //LazUtils + LazLoggerBase, // SynEdit SynEdit, SynHighlighterPas, // CodeTools diff --git a/ide/etfpcmsgparser.pas b/ide/etfpcmsgparser.pas index db953c6b3d..c45b4a3686 100644 --- a/ide/etfpcmsgparser.pas +++ b/ide/etfpcmsgparser.pas @@ -45,9 +45,9 @@ uses // IDEIntf LazIDEIntf, IDEUtils, // IdeConfig - EnvironmentOpts, LazConf, + EnvironmentOpts, LazConf, TransferMacros, // IDE - IDECmdLine, LazarusIDEStrConsts, TransferMacros, etMakeMsgParser, EnvGuiOptions; + IDECmdLine, LazarusIDEStrConsts, etMakeMsgParser, EnvGuiOptions; const FPCMsgIDCompiling = 3104; diff --git a/ide/exttooldialog.pas b/ide/exttooldialog.pas index 44bb182f8d..d6226ae12e 100644 --- a/ide/exttooldialog.pas +++ b/ide/exttooldialog.pas @@ -38,14 +38,11 @@ uses {$IFDEF IDE_MEM_CHECK} MemCheck, {$ENDIF} - Classes, SysUtils, LCLType, LCLProc, Controls, Forms, - Buttons, StdCtrls, ComCtrls, Dialogs, ExtCtrls, ButtonPanel, Menus, - FileProcs, FileUtil, - IDEExternToolIntf, IDEImagesIntf, IDEDialogs, IDEHelpIntf, IDECommands, - ProjectIntf, - EnvironmentOpts, - ExtToolEditDlg, KeyMapping, TransferMacros, IDEProcs, LazFileUtils, - CompilerOptions, + Classes, SysUtils, + Controls, Forms, StdCtrls, ComCtrls, Dialogs, ButtonPanel, Menus, + FileUtil, + IDEImagesIntf, IDEDialogs, IDEHelpIntf, IDECommands, + ExtToolEditDlg, TransferMacros, IdeIntfStrConsts, LazarusIDEStrConsts, IDEOptionDefs, EditorOptions; const diff --git a/ide/exttooleditdlg.pas b/ide/exttooleditdlg.pas index fb7fbacf3d..e8e837d6bb 100644 --- a/ide/exttooleditdlg.pas +++ b/ide/exttooleditdlg.pas @@ -50,8 +50,10 @@ uses FileProcs, // IdeIntf IdeIntfStrConsts, IDEExternToolIntf, IDEHelpIntf, PropEdits, IDEDialogs, IDECommands, IDEUtils, + // IdeConfig + TransferMacros, EnvironmentOpts, // IDE - TransferMacros, LazarusIDEStrConsts, EnvironmentOpts, KeyMapping; + LazarusIDEStrConsts, KeyMapping; const ExternalToolOptionsVersion = 3; diff --git a/ide/exttools.pas b/ide/exttools.pas index 16d83b8125..f9786dcf52 100644 --- a/ide/exttools.pas +++ b/ide/exttools.pas @@ -42,8 +42,10 @@ uses AvgLvlTree, // BuildIntf IDEExternToolIntf, BaseIDEIntf, MacroIntf, LazMsgWorker, + // IdeConfig + TransferMacros, // IDE - IDECmdLine, TransferMacros, LazarusIDEStrConsts; + IDECmdLine, LazarusIDEStrConsts; type TLMVToolState = ( diff --git a/ide/findinfilesdlg.pas b/ide/findinfilesdlg.pas index 4f95515da0..7d59fd0206 100644 --- a/ide/findinfilesdlg.pas +++ b/ide/findinfilesdlg.pas @@ -19,11 +19,9 @@ interface uses Classes, SysUtils, // LCL - LCLProc, Controls, StdCtrls, Forms, Buttons, ExtCtrls, Dialogs, ButtonPanel, - // Codetools - FileProcs, + Controls, StdCtrls, Forms, Buttons, ExtCtrls, Dialogs, ButtonPanel, // LazUtils - LazFileUtils, + LazFileUtils, LazLoggerBase, // SynEdit SynEditTypes, SynEdit, // IdeIntf diff --git a/ide/findoverloadsdlg.pas b/ide/findoverloadsdlg.pas index da12dbd3f6..4f5882ab90 100644 --- a/ide/findoverloadsdlg.pas +++ b/ide/findoverloadsdlg.pas @@ -39,7 +39,9 @@ interface uses Classes, SysUtils, Laz_AVL_Tree, // LCL - LCLProc, LazFileUtils, Forms, Controls, StdCtrls, ButtonPanel, ComCtrls, + Forms, Controls, StdCtrls, ButtonPanel, ComCtrls, + // LazUtils + LazFileUtils, LazLoggerBase, // codetools FindDeclarationTool, PascalParserTool, CodeTree, CodeCache, CodeToolManager, FindOverloads, diff --git a/ide/findrenameidentifier.pas b/ide/findrenameidentifier.pas index a8e74ec402..ea5d96435d 100644 --- a/ide/findrenameidentifier.pas +++ b/ide/findrenameidentifier.pas @@ -33,18 +33,19 @@ uses // RTL + FCL Classes, SysUtils, Laz_AVL_Tree, // LCL - LCLProc, Forms, Controls, Dialogs, StdCtrls, ExtCtrls, ComCtrls, ButtonPanel, - LclIntf, + Forms, Controls, Dialogs, StdCtrls, ExtCtrls, ComCtrls, ButtonPanel, LclIntf, // CodeTools - FileProcs, CTUnitGraph, CodeTree, CodeCache, CodeToolManager, BasicCodeTools, + CTUnitGraph, CodeTree, CodeCache, CodeToolManager, BasicCodeTools, // LazUtils - LazFileUtils, LazFileCache, laz2_DOM, LazStringUtils, AvgLvlTree, + LazFileUtils, LazFileCache, laz2_DOM, LazStringUtils, AvgLvlTree, LazLoggerBase, // IdeIntf IdeIntfStrConsts, LazIDEIntf, IDEWindowIntf, SrcEditorIntf, PackageIntf, IDEDialogs, InputHistory, + // LazConfig + TransferMacros, // IDE LazarusIDEStrConsts, IDEProcs, MiscOptions, DialogProcs, - SearchResultView, CodeHelp, TransferMacros; + SearchResultView, CodeHelp; type diff --git a/ide/findreplacedialog.pp b/ide/findreplacedialog.pp index c87afd1040..d88581eaec 100644 --- a/ide/findreplacedialog.pp +++ b/ide/findreplacedialog.pp @@ -32,11 +32,12 @@ unit FindReplaceDialog; interface uses - Classes, SysUtils, RegExpr, LCLProc, LCLType, Controls, StdCtrls, Forms, - Buttons, ExtCtrls, Dialogs, Graphics, ButtonPanel, + Classes, SysUtils, RegExpr, + LCLType, Controls, StdCtrls, Forms, Buttons, ExtCtrls, Dialogs, Graphics, ButtonPanel, SynEditTypes, SynEdit, - IDEHelpIntf, IDEImagesIntf, IDEWindowIntf, IDEDialogs, - LazarusIdeStrConsts, InputHistory, EnvironmentOpts; + IDEHelpIntf, IDEImagesIntf, IDEWindowIntf, IDEDialogs, InputHistory, + EnvironmentOpts, + LazarusIdeStrConsts; type TFindDlgComponent = (fdcText, fdcReplace); diff --git a/ide/findunitdlg.pas b/ide/findunitdlg.pas index 8084038a42..390ab5c679 100644 --- a/ide/findunitdlg.pas +++ b/ide/findunitdlg.pas @@ -34,8 +34,11 @@ unit FindUnitDlg; interface uses - Classes, SysUtils, LCLProc, Forms, Controls, ExtCtrls, - StdCtrls, ComCtrls, LazFileUtils, Laz2_XMLCfg, LazFileCache, + Classes, SysUtils, + // LCL + Forms, Controls, ExtCtrls, StdCtrls, ComCtrls, + // LazUtils + LazFileUtils, Laz2_XMLCfg, LazFileCache, LazLoggerBase, // codetools CodeToolsStrConsts, CodeCache, CodeToolManager, // IDEIntf diff --git a/ide/formeditor.pp b/ide/formeditor.pp index ea3f6d0d53..4aa200d4b8 100644 --- a/ide/formeditor.pp +++ b/ide/formeditor.pp @@ -33,8 +33,10 @@ interface uses Classes, SysUtils, // LCL - LCLProc, Controls, Forms, + Controls, Forms, RegisterLCL, // register LCLBase + // LazUtils + LazLoggerBase, // LazControls LazControls, // IdeIntf diff --git a/ide/fpdoceditwindow.pas b/ide/fpdoceditwindow.pas index 3feb26c9b4..4ea85dec71 100644 --- a/ide/fpdoceditwindow.pas +++ b/ide/fpdoceditwindow.pas @@ -42,10 +42,10 @@ uses // codetools FileProcs, CodeCache, CodeToolManager, CTXMLFixFragment, // IDEIntf - IDEWindowIntf, ProjectIntf, LazIDEIntf, IDEHelpIntf, Menus, + IDEWindowIntf, LazIDEIntf, Menus, SrcEditorIntf, IDEDialogs, LazFileUtils, IDEImagesIntf, // IDE - IDEOptionDefs, EnvironmentOpts, PackageSystem, LazarusIDEStrConsts, + IDEOptionDefs, EnvironmentOpts, LazarusIDEStrConsts, FPDocSelectInherited, FPDocSelectLink, CodeHelp; type diff --git a/ide/fpdochints.pas b/ide/fpdochints.pas index c8bb001ef1..2d33544818 100644 --- a/ide/fpdochints.pas +++ b/ide/fpdochints.pas @@ -30,9 +30,12 @@ unit FPDocHints; interface uses - Classes, SysUtils, LCLProc, Forms, Controls, Graphics, StdCtrls, + Classes, SysUtils, + Forms, Controls, StdCtrls, + LazLoggerBase, CodeToolManager, CodeCache, IdentCompletionTool, CodeTree, - IDEHelpIntf, SrcEditorIntf, SrcEditHintFrm, CodeHelp; + IDEHelpIntf, SrcEditorIntf, + SrcEditHintFrm, CodeHelp; type { TFPDocHintProvider } diff --git a/ide/fpdocselectlink.pas b/ide/fpdocselectlink.pas index fb1541cc11..3a0ebd6bdf 100644 --- a/ide/fpdocselectlink.pas +++ b/ide/fpdocselectlink.pas @@ -32,9 +32,9 @@ interface uses Classes, SysUtils, Laz_AVL_Tree, // LCL - LCLProc, LCLType, Forms, Controls, Graphics, ExtCtrls, StdCtrls, ButtonPanel, + LCLType, Forms, Controls, Graphics, ExtCtrls, StdCtrls, ButtonPanel, // LazUtils - FileUtil, LazFileUtils, Laz2_DOM, + FileUtil, LazFileUtils, LazLoggerBase, Laz2_DOM, // IdeIntf PackageIntf, ProjectIntf, // IDE diff --git a/ide/frames/compiler_path_options.pas b/ide/frames/compiler_path_options.pas index 3904270d15..3d1fb9f1b6 100644 --- a/ide/frames/compiler_path_options.pas +++ b/ide/frames/compiler_path_options.pas @@ -7,9 +7,9 @@ interface uses Classes, SysUtils, // LCL - LCLProc, LCLType,Controls, Dialogs, Buttons, StdCtrls, + LCLType,Controls, Dialogs, Buttons, StdCtrls, // LazUtils - LazFileUtils, LazFileCache, + LazFileUtils, LazFileCache, LazLoggerBase, // IdeIntf IDEOptionsIntf, IDEOptEditorIntf, MacroIntf, CompOptsIntf, IDEImagesIntf, IDEDialogs, // IDE diff --git a/ide/frames/componentpalette_options.pas b/ide/frames/componentpalette_options.pas index 3648c767c2..3d203ff065 100644 --- a/ide/frames/componentpalette_options.pas +++ b/ide/frames/componentpalette_options.pas @@ -27,7 +27,7 @@ interface uses Classes, SysUtils, // LCL - LCLProc, LCLType, Forms, Controls, StdCtrls, ComCtrls, ExtCtrls, + LCLType, Forms, Controls, StdCtrls, ComCtrls, ExtCtrls, Dialogs, Buttons, Menus, Graphics, // LazControls DividerBevel, @@ -36,7 +36,7 @@ uses // BuildIntf IDEOptionsIntf, // IdeIntf - IdeIntfStrConsts, IDEOptEditorIntf, IDEImagesIntf, FormEditingIntf, ComponentReg, + IdeIntfStrConsts, IDEOptEditorIntf, IDEImagesIntf, ComponentReg, // IdeConfig EnvironmentOpts, IDEOptionDefs, // IDE diff --git a/ide/frames/desktop_options.pas b/ide/frames/desktop_options.pas index 5ee15e5329..8938a99ae0 100644 --- a/ide/frames/desktop_options.pas +++ b/ide/frames/desktop_options.pas @@ -27,9 +27,9 @@ interface uses Classes, SysUtils, // LCL - Forms, StdCtrls, Dialogs, LCLProc, ExtCtrls, Spin, + Forms, StdCtrls, Dialogs, ExtCtrls, Spin, // LazUtils - FileUtil, LazUTF8, + FileUtil, LazUTF8, LazLoggerBase, // LazControls DividerBevel, // IdeIntf diff --git a/ide/frames/editor_color_options.pas b/ide/frames/editor_color_options.pas index bf39be4a88..cd65d178e9 100644 --- a/ide/frames/editor_color_options.pas +++ b/ide/frames/editor_color_options.pas @@ -25,12 +25,11 @@ unit editor_color_options; interface uses - Classes, Controls, math, types, typinfo, sysutils, + Classes, Controls, Math, Types, typinfo, sysutils, // LazUtils - Laz2_XMLCfg, LazFileUtils, LazUTF8, + Laz2_XMLCfg, LazFileUtils, LazUTF8, LazLoggerBase, // LCL - LCLProc, LCLType, LCLIntf, StdCtrls, ExtCtrls, Graphics, ComCtrls, Dialogs, - Menus, Buttons, + LCLType, LCLIntf, StdCtrls, ExtCtrls, Graphics, ComCtrls, Dialogs, Menus, // LazControls DividerBevel, // SynEdit diff --git a/ide/frames/editor_display_options.pas b/ide/frames/editor_display_options.pas index 8ac4bae16a..1470ab3813 100644 --- a/ide/frames/editor_display_options.pas +++ b/ide/frames/editor_display_options.pas @@ -27,7 +27,7 @@ interface uses Classes, SysUtils, // LCL - Graphics, Dialogs, StdCtrls, Spin, LCLType, Controls, LCLProc, + Graphics, Dialogs, StdCtrls, Spin, LCLType, Controls, // SynEdit SynEdit, SynEditMouseCmds, SynGutterLineNumber, SynGutterLineOverview, SynGutter, SynEditTypes, // IdeIntf diff --git a/ide/frames/editor_general_misc_options.pas b/ide/frames/editor_general_misc_options.pas index a9228bac65..0dab6c92df 100644 --- a/ide/frames/editor_general_misc_options.pas +++ b/ide/frames/editor_general_misc_options.pas @@ -32,9 +32,9 @@ interface uses // LCL - LCLProc, StdCtrls, ExtCtrls, Spin, + StdCtrls, ExtCtrls, Spin, // SynEdit - SynEdit, SynEditTextTrimmer, SynEditTypes, + SynEditTextTrimmer, SynEditTypes, // IdeIntf IDEOptionsIntf, IDEOptEditorIntf, DividerBevel, // IDE diff --git a/ide/frames/editor_general_options.pas b/ide/frames/editor_general_options.pas index c6be011b74..f0eda734c3 100644 --- a/ide/frames/editor_general_options.pas +++ b/ide/frames/editor_general_options.pas @@ -27,7 +27,7 @@ interface uses Classes, SysUtils, math, // LCL - LCLProc, LCLType, StdCtrls, Controls, Graphics, ImgList, + LCLType, StdCtrls, Controls, Graphics, ImgList, // LazControls DividerBevel, // SynEdit diff --git a/ide/frames/editor_indent_options.pas b/ide/frames/editor_indent_options.pas index ce05bcee62..692da810a4 100644 --- a/ide/frames/editor_indent_options.pas +++ b/ide/frames/editor_indent_options.pas @@ -27,7 +27,7 @@ interface uses Classes, SysUtils, // LCL - LCLProc, LCLType, StdCtrls, Controls, ExtCtrls, Graphics, ComCtrls, Spin, + LCLType, StdCtrls, Controls, Graphics, ComCtrls, Spin, // LazControls DividerBevel, // SynEdit diff --git a/ide/frames/editor_mouseaction_options.pas b/ide/frames/editor_mouseaction_options.pas index a119183979..b6f032098b 100644 --- a/ide/frames/editor_mouseaction_options.pas +++ b/ide/frames/editor_mouseaction_options.pas @@ -27,11 +27,11 @@ interface uses sysutils, math, // LCL - LCLProc, StdCtrls, ExtCtrls, Classes, Forms, ComCtrls, + StdCtrls, ExtCtrls, Classes, Forms, ComCtrls, // LazControls DividerBevel, // SynEdit - SynEdit, SynEditTypes, + SynEditTypes, // IdeIntf IDEOptionsIntf, IDEOptEditorIntf, // IDE diff --git a/ide/frames/editortoolbar_options.pas b/ide/frames/editortoolbar_options.pas index 36cac6034d..51c3199222 100644 --- a/ide/frames/editortoolbar_options.pas +++ b/ide/frames/editortoolbar_options.pas @@ -30,7 +30,9 @@ interface uses Classes, SysUtils, // LCL - LCLProc, ExtCtrls, Buttons, Controls, StdCtrls, + ExtCtrls, Buttons, Controls, StdCtrls, + // LazUtils + LazLoggerBase, // LazControls DividerBevel, // IdeIntf diff --git a/ide/frames/env_file_filters.pas b/ide/frames/env_file_filters.pas index a65b972ac1..90dd9a05b5 100644 --- a/ide/frames/env_file_filters.pas +++ b/ide/frames/env_file_filters.pas @@ -9,7 +9,7 @@ uses // LazUtils LazFileUtils, LazConfigStorage, // LCL - LCLProc, LCLType, LResources, Grids, Dialogs, Controls, StdCtrls, Menus, + LCLType, LResources, Grids, Dialogs, Controls, StdCtrls, Menus, // IdeIntf IDEOptionsIntf, IDEOptEditorIntf, BaseIDEIntf, IDEDialogs, // IDE diff --git a/ide/frames/packagelisteditordlg.pas b/ide/frames/packagelisteditordlg.pas index 66c5080a43..7faf5b16ff 100644 --- a/ide/frames/packagelisteditordlg.pas +++ b/ide/frames/packagelisteditordlg.pas @@ -23,7 +23,7 @@ interface uses Classes, SysUtils, // LCL - LCLType, LCLProc, Forms, Controls, Buttons, StdCtrls, Dialogs, Menus, Graphics, + LCLType, Forms, Controls, Buttons, StdCtrls, Dialogs, Menus, Graphics, ButtonPanel, Clipbrd, Grids, // LazUtils FileUtil, LazFileUtils, LazStringUtils, LazFileCache, LazUTF8, diff --git a/ide/frames/project_application_options.pas b/ide/frames/project_application_options.pas index d5cc386773..589b76f32e 100644 --- a/ide/frames/project_application_options.pas +++ b/ide/frames/project_application_options.pas @@ -9,8 +9,7 @@ uses // LazUtils FileUtil, // LCL - LCLProc, LCLType, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls, Buttons, - ComCtrls, ExtDlgs, + LCLType, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls, Buttons, ComCtrls, ExtDlgs, // LazControls DividerBevel, // IdeIntf diff --git a/ide/frames/project_misc_options.pas b/ide/frames/project_misc_options.pas index eb7b159614..db2e77be93 100644 --- a/ide/frames/project_misc_options.pas +++ b/ide/frames/project_misc_options.pas @@ -7,7 +7,7 @@ interface uses SysUtils, // LCL - LCLProc, Forms, Dialogs, ExtCtrls, StdCtrls, + Forms, Dialogs, ExtCtrls, StdCtrls, // LazUtils FileUtil, LazFileUtils, // IdeIntf diff --git a/ide/helpfpcmessages.pas b/ide/helpfpcmessages.pas index d04d5764cf..0388fa1412 100644 --- a/ide/helpfpcmessages.pas +++ b/ide/helpfpcmessages.pas @@ -39,10 +39,10 @@ interface uses Classes, SysUtils, fgl, // LCL - LCLProc, LCLIntf, Dialogs, Forms, Controls, StdCtrls, ExtCtrls, Graphics, + LCLIntf, Dialogs, Forms, Controls, StdCtrls, ExtCtrls, Graphics, ButtonPanel, LazHelpHTML, // LazUtils - LazConfigStorage, LazFileUtils, LazFileCache, LazUTF8, + LazConfigStorage, LazFileUtils, LazFileCache, LazUTF8, LazLoggerBase, // CodeTools FileProcs, CodeToolsFPCMsgs, CodeToolManager, CodeCache, DefineTemplates, // IdeIntf diff --git a/ide/helpoptions.pas b/ide/helpoptions.pas index d7a9b9e78a..5bcfe8651b 100644 --- a/ide/helpoptions.pas +++ b/ide/helpoptions.pas @@ -36,14 +36,12 @@ interface uses Classes, SysUtils, - // LCL - LCLProc, // LazUtils - LazFileUtils, Laz2_XMLCfg, LazFileCache, + LazFileUtils, Laz2_XMLCfg, LazFileCache, LazLoggerBase, // IdeIntf IdeIntfStrConsts, LazHelpIntf, IDEOptionsIntf, IDEOptEditorIntf, MacroIntf, - // IDE - LazarusIDEStrConsts, IDEOptionDefs, LazConf; + // IdeConfig + IDEOptionDefs, LazConf; type { THelpOptions } diff --git a/ide/idecontexthelpedit.pas b/ide/idecontexthelpedit.pas index 0411b1867c..ecd33f84be 100644 --- a/ide/idecontexthelpedit.pas +++ b/ide/idecontexthelpedit.pas @@ -31,14 +31,17 @@ unit IDEContextHelpEdit; interface uses - Classes, SysUtils, LCLProc, Forms, Controls, Graphics, Dialogs, - Buttons, ButtonPanel, StdCtrls, ComCtrls, + Classes, SysUtils, + // LCL + Forms, Controls, Graphics, Dialogs, Buttons, ButtonPanel, StdCtrls, ComCtrls, ExtCtrls, + // LazUtils + LazLoggerBase, // codetools CodeToolManager, CodeCache, // IDEIntf PropEdits, LazIDEIntf, IDEWindowIntf, IDEDialogs, // IDE - IDEWindowHelp, LazarusIDEStrConsts, ExtCtrls; + IDEWindowHelp, LazarusIDEStrConsts; type diff --git a/ide/idecoolbardata.pas b/ide/idecoolbardata.pas index 03692eddd2..814a8b9b90 100644 --- a/ide/idecoolbardata.pas +++ b/ide/idecoolbardata.pas @@ -35,7 +35,7 @@ interface uses Classes, SysUtils, fgl, // LCL - LCLProc, ComCtrls, Controls, Graphics, Dialogs, ToolWin, + ComCtrls, Controls, Graphics, Dialogs, ToolWin, // IdeIntf IDEImagesIntf, // IdeConfig diff --git a/ide/idefpcinfo.pas b/ide/idefpcinfo.pas index c605fb88c4..7c05a3a3ef 100644 --- a/ide/idefpcinfo.pas +++ b/ide/idefpcinfo.pas @@ -37,9 +37,12 @@ uses DefineTemplates, CodeToolManager, FileProcs, // LazUtils FPCAdds, LazFileUtils, LazUTF8, + // IdeIntf + IDEWindowIntf, LazIDEIntf, + // IdeConfig + EnvironmentOpts, TransferMacros, // Other - IDEWindowIntf, LazIDEIntf, BaseBuildManager, - Project, EnvironmentOpts, LazarusIDEStrConsts, AboutFrm, TransferMacros; + BaseBuildManager, Project, LazarusIDEStrConsts, AboutFrm; type diff --git a/ide/ideinfodlg.pas b/ide/ideinfodlg.pas index a9d52c5be0..7269139e8d 100644 --- a/ide/ideinfodlg.pas +++ b/ide/ideinfodlg.pas @@ -30,10 +30,11 @@ unit IDEInfoDlg; interface uses - Classes, SysUtils, LazFileUtils, LazUTF8, FPCAdds, + Classes, SysUtils, + LazFileUtils, LazUTF8, FPCAdds, LazLoggerBase, CodeToolManager, DefineTemplates, LinkScanner, Forms, Controls, Graphics, Dialogs, StdCtrls, ComCtrls, - LCLProc, ButtonPanel, LazHelpHTML, LazHelpIntf, + ButtonPanel, LazHelpHTML, LazHelpIntf, IDEHelpIntf, IDEWindowIntf, LazIDEIntf, IDEExternToolIntf, EnvironmentOpts, AboutFrm, LazConf, LazarusIDEStrConsts, Project, SourceEditor, InitialSetupProc, PackageSystem, PackageDefs; diff --git a/ide/ideinstances.pas b/ide/ideinstances.pas index 09b8fb4990..88365923d4 100644 --- a/ide/ideinstances.pas +++ b/ide/ideinstances.pas @@ -43,8 +43,9 @@ uses {$ELSE} LazAdvancedIPC, {$ENDIF} - Interfaces, Controls, Forms, Dialogs, ExtCtrls, LCLProc, LCLIntf, LCLType, - LazFileUtils, FileUtil, Laz2_XMLRead, Laz2_XMLWrite, Laz2_DOM, LazUTF8, UTF8Process, + Controls, Dialogs, ExtCtrls, LCLType, + LazFileUtils, FileUtil, Laz2_XMLRead, Laz2_XMLWrite, Laz2_DOM, LazUTF8, + UTF8Process, LazLoggerBase, LazarusIDEStrConsts, IDECmdLine, LazConf; type diff --git a/ide/ideprocs.pp b/ide/ideprocs.pp index e171bb9764..676da83511 100644 --- a/ide/ideprocs.pp +++ b/ide/ideprocs.pp @@ -42,8 +42,10 @@ uses FileProcs, // BuildIntf PackageIntf, + // IdeConfig + TransferMacros, LazConf, // IDE - TransferMacros, LazConf, LazarusIDEStrConsts; + LazarusIDEStrConsts; const SBuildMethod: array[TBuildMethod] of string = ( diff --git a/ide/ideprotocol.pas b/ide/ideprotocol.pas index 6bf75bdcec..4afd53aaa8 100644 --- a/ide/ideprotocol.pas +++ b/ide/ideprotocol.pas @@ -33,13 +33,11 @@ interface uses Classes, SysUtils, - // LCL - LCLProc, // LazUtils - LazConfigStorage, LazFileUtils, + LazConfigStorage, LazFileUtils, LazLoggerBase, // IdeIntf BaseIDEIntf, - // IDE + // IdeConfig LazConf; const diff --git a/ide/idetransfermacros.pas b/ide/idetransfermacros.pas index cb9361ec2e..1caf63dfbb 100644 --- a/ide/idetransfermacros.pas +++ b/ide/idetransfermacros.pas @@ -9,9 +9,9 @@ uses // BuildIntf MacroDefIntf, // IdeConfig - EnvironmentOpts, LazConf, + EnvironmentOpts, LazConf, TransferMacros, // IDE - LazarusIDEStrConsts, TransferMacros, IDETranslations; + LazarusIDEStrConsts, IDETranslations; type diff --git a/ide/idewindowhelp.pas b/ide/idewindowhelp.pas index 1026f765f3..b34b5aac2a 100644 --- a/ide/idewindowhelp.pas +++ b/ide/idewindowhelp.pas @@ -32,9 +32,9 @@ interface uses Classes, SysUtils, // LCL - LCLProc, Controls, Dialogs, HelpIntfs, + Controls, Dialogs, HelpIntfs, // LazUtils - LazFileUtils, LazConfigStorage, + LazFileUtils, LazConfigStorage, LazLoggerBase, // IdeIntf IDEDialogs, // IDE diff --git a/ide/initialsetupdlgs.pas b/ide/initialsetupdlgs.pas index 46564480a5..4140bfed3e 100644 --- a/ide/initialsetupdlgs.pas +++ b/ide/initialsetupdlgs.pas @@ -54,9 +54,10 @@ uses DbgIntfDebuggerBase, // LazDebuggerGdbmi GDBMIDebugger, + // IdeConfig + LazConf, EnvironmentOpts, TransferMacros, // IDE - TransferMacros, LazarusIDEStrConsts, LazConf, EnvironmentOpts, AboutFrm, - IDETranslations, BaseBuildManager, InitialSetupProc, + LazarusIDEStrConsts, AboutFrm, IDETranslations, BaseBuildManager, InitialSetupProc, GenerateFppkgConfigurationDlg, IDEProcs, InitialSetupDlgDebuggerFrame, IdeDebuggerOpts; diff --git a/ide/inputfiledialog.pas b/ide/inputfiledialog.pas index 5e64c32555..ee15c743c9 100644 --- a/ide/inputfiledialog.pas +++ b/ide/inputfiledialog.pas @@ -28,8 +28,10 @@ uses LazFileUtils, LazFileCache, // IdeIntf IdeIntfStrConsts, IDEDialogs, InputHistory, + // IdeConfig + TransferMacros, // IDE - LazarusIDEStrConsts, TransferMacros; + LazarusIDEStrConsts; type TInputFileFlag = (iftDirectory, iftFilename, iftCmdLine, diff --git a/ide/inspectchksumchangeddlg.pas b/ide/inspectchksumchangeddlg.pas index 847f604eb3..6eadec4e81 100644 --- a/ide/inspectchksumchangeddlg.pas +++ b/ide/inspectchksumchangeddlg.pas @@ -40,9 +40,10 @@ unit InspectChksumChangedDlg; interface uses - // RTL + FCL + LCL - Classes, SysUtils, contnrs, - LCLProc, Forms, Controls, StdCtrls, ExtCtrls, ComCtrls, ButtonPanel, + // RTL + FCL + Classes, SysUtils, Contnrs, + // LCL + Forms, Controls, StdCtrls, ExtCtrls, ComCtrls, ButtonPanel, // CodeTools CodeToolManager, FileProcs, DirectoryCacher, DefineTemplates, // LazUtils diff --git a/ide/mainbar.pas b/ide/mainbar.pas index 11bd15a9d3..4fbdf661ac 100644 --- a/ide/mainbar.pas +++ b/ide/mainbar.pas @@ -40,7 +40,7 @@ uses {$ENDIF} Classes, SysUtils, Math, // LCL - Forms, Controls, Menus, ComCtrls, ExtCtrls, LMessages, LCLIntf, LCLType, LCLProc, + Forms, Controls, Menus, ComCtrls, ExtCtrls, LMessages, // LazUtils LazFileCache, // IDEIntf diff --git a/ide/mainintf.pas b/ide/mainintf.pas index 42199e10b2..50fa8e2be5 100644 --- a/ide/mainintf.pas +++ b/ide/mainintf.pas @@ -59,9 +59,10 @@ uses {$IFDEF IDE_MEM_CHECK} MemCheck, {$ENDIF} - Classes, typinfo, + Classes, TypInfo, + {$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes, // LCL - LCLType, Buttons, Controls, Graphics, Dialogs, Forms, LCLProc, + Forms, // Codetools CodeCache, // LazUtils @@ -69,8 +70,7 @@ uses // BuildIntf ProjectIntf, CompOptsIntf, // IDEIntf - PropEdits, ObjectInspector, MenuIntf, SrcEditorIntf, LazIDEIntf, IDEWindowIntf, - InputHistory, + ObjectInspector, MenuIntf, SrcEditorIntf, LazIDEIntf, IDEWindowIntf, InputHistory, // IdeConfig LazConf, // IDE diff --git a/ide/makeresstrdlg.pas b/ide/makeresstrdlg.pas index 72a81cca28..4de742c6d4 100644 --- a/ide/makeresstrdlg.pas +++ b/ide/makeresstrdlg.pas @@ -41,7 +41,7 @@ interface uses Classes, SysUtils, // LCL - LCLProc, Forms, Controls, StdCtrls, Dialogs, ExtCtrls, ButtonPanel, + Forms, Controls, StdCtrls, Dialogs, ExtCtrls, ButtonPanel, // SynEdit SynHighlighterPas, SynEdit, // CodeTools diff --git a/ide/packages/idedebugger/callstackdlg.pp b/ide/packages/idedebugger/callstackdlg.pp index 16349fdbf4..57f36f5b9f 100644 --- a/ide/packages/idedebugger/callstackdlg.pp +++ b/ide/packages/idedebugger/callstackdlg.pp @@ -38,7 +38,7 @@ interface uses SysUtils, Classes, Math, // LCL - Controls, Forms, LCLProc, ComCtrls, Menus, ClipBrd, ExtCtrls, StdCtrls, ActnList, + Controls, Forms, ComCtrls, Menus, ClipBrd, ExtCtrls, StdCtrls, ActnList, // LazUtils LazLoggerBase, // IdeIntf diff --git a/ide/packages/idedebugger/debuggerdlg.pp b/ide/packages/idedebugger/debuggerdlg.pp index e7b0ef2ef3..762b3c2e8c 100644 --- a/ide/packages/idedebugger/debuggerdlg.pp +++ b/ide/packages/idedebugger/debuggerdlg.pp @@ -39,9 +39,9 @@ interface uses Classes, // LCL - Forms, Controls, LCLProc, + Forms, Controls, // LazUtils - LazFileUtils, LazLoggerBase, + LazFileUtils, LazLoggerBase, LazTracer, // IdeIntf IDEImagesIntf, IDECommands, // DebuggerIntf diff --git a/ide/packages/idedebugger/inspectdlg.pas b/ide/packages/idedebugger/inspectdlg.pas index d5a53a9c2e..8f39bcf39f 100644 --- a/ide/packages/idedebugger/inspectdlg.pas +++ b/ide/packages/idedebugger/inspectdlg.pas @@ -30,10 +30,10 @@ interface uses Classes, SysUtils, Math, // LCL - LCLProc, LCLType, Grids, StdCtrls, Menus, Forms, Controls, Graphics, ComCtrls, - ExtCtrls, Buttons, Clipbrd, SpinEx, LMessages, + LCLType, Grids, StdCtrls, Menus, Forms, Controls, Graphics, ComCtrls, + ExtCtrls, Buttons, Clipbrd, LMessages, // IdeIntf - IDEWindowIntf, IDEImagesIntf, ObjectInspector, PropEdits, InputHistory, + IDEWindowIntf, ObjectInspector, PropEdits, InputHistory, // IdeConfig EnvironmentOpts, RecentListProcs, // DebuggerIntf @@ -42,8 +42,8 @@ uses LazDebuggerIntf, LazDebuggerIntfBaseTypes, // IdeDebugger BaseDebugManager, Debugger, IdeDebuggerWatchResPrinter, IdeDebuggerWatchResult, - IdeDebuggerWatchResUtils, IdeDebuggerBase, ArrayNavigationFrame, IdeDebuggerOpts, - IdeDebuggerBackendValueConv, WatchInspectToolbar, DebuggerDlg, + IdeDebuggerWatchResUtils, IdeDebuggerBase, ArrayNavigationFrame, + WatchInspectToolbar, DebuggerDlg, IdeDebuggerStringConstants, IdeDebuggerUtils, EnvDebuggerOptions; type diff --git a/ide/packages/idedebugger/threaddlg.pp b/ide/packages/idedebugger/threaddlg.pp index 1468170699..a11198e2bd 100644 --- a/ide/packages/idedebugger/threaddlg.pp +++ b/ide/packages/idedebugger/threaddlg.pp @@ -5,7 +5,7 @@ unit ThreadDlg; interface uses - Classes, SysUtils, ComCtrls, LCLProc, LazLoggerBase, Debugger, DebuggerDlg, + Classes, SysUtils, ComCtrls, LazLoggerBase, Debugger, DebuggerDlg, Forms, IDEWindowIntf, BaseDebugManager, IDEImagesIntf, DbgIntfDebuggerBase, LazDebuggerIntfBaseTypes, IdeDebuggerStringConstants; diff --git a/ide/patheditordlg.pas b/ide/patheditordlg.pas index 58e1e7420d..5191547a68 100644 --- a/ide/patheditordlg.pas +++ b/ide/patheditordlg.pas @@ -23,7 +23,7 @@ interface uses Classes, SysUtils, types, // LCL - LCLType, LCLProc, Forms, Controls, Buttons, StdCtrls, Dialogs, Menus, Graphics, + LCLType, Forms, Controls, Buttons, StdCtrls, Dialogs, Menus, Graphics, ButtonPanel, Clipbrd, // LazUtils FileUtil, LazFileUtils, LazStringUtils, LazFileCache, LazUTF8, @@ -31,8 +31,10 @@ uses ShortPathEdit, // IdeIntf IdeIntfStrConsts, MacroIntf, IDEImagesIntf, IDEUtils, + // IdeConfig + TransferMacros, // IDE - TransferMacros, GenericListSelect, LazarusIDEStrConsts; + GenericListSelect, LazarusIDEStrConsts; type diff --git a/ide/progresswnd.pas b/ide/progresswnd.pas index cd6522ad54..1d90c81c6a 100644 --- a/ide/progresswnd.pas +++ b/ide/progresswnd.pas @@ -32,8 +32,10 @@ unit ProgressWnd; interface uses - Classes, SysUtils, LCLProc, FileUtil, Forms, Controls, Graphics, Dialogs, - ComCtrls, StdCtrls, ExtCtrls, LazIDEIntf, LazarusIDEStrConsts; + Classes, SysUtils, + Forms, Controls, Graphics, Dialogs, ComCtrls, StdCtrls, ExtCtrls, + LazLoggerBase, + LazIDEIntf, LazarusIDEStrConsts; type TIDEProgressWindow = class; diff --git a/ide/project.pp b/ide/project.pp index 14764580a8..8dcd048485 100644 --- a/ide/project.pp +++ b/ide/project.pp @@ -63,12 +63,13 @@ uses // DebuggerIntf DbgIntfDebuggerBase, {$IFnDEF LCLNOGUI} IdeDebuggerOpts, IdeDebuggerBackendValueConv, Debugger,{$EndIf} + // IdeConfig + EnvironmentOpts, LazConf, TransferMacros, SearchPathProcs, IdeXmlConfigProcs, // IDE - EnvironmentOpts, CompOptsModes, ProjectResources, LazConf, ProjectIcon, + CompOptsModes, ProjectResources, ProjectIcon, IDECmdLine, IDEProcs, CompilerOptions, RunParamsOpts, ModeMatrixOpts, - TransferMacros, ProjectDefs, EditDefineTree, LazarusIDEStrConsts, - SearchPathProcs, IdeXmlConfigProcs, ProjPackCommon, PackageDefs, - PackageSystem; + ProjectDefs, EditDefineTree, LazarusIDEStrConsts, + ProjPackCommon, PackageDefs, PackageSystem; type TUnitInfo = class; diff --git a/ide/projecticon.pas b/ide/projecticon.pas index e6ab19ede2..05fadc6d1a 100644 --- a/ide/projecticon.pas +++ b/ide/projecticon.pas @@ -37,11 +37,9 @@ uses // RTL + LCL Classes, SysUtils, resource, groupiconresource, // LCL - LCLProc, Graphics, + Graphics, // LazUtils - FileUtil, LazFileUtils, LazFileCache, Laz2_XMLCfg, - // Codetools - FileProcs, + LazFileUtils, LazFileCache, Laz2_XMLCfg, LazLoggerBase, // IdeIntf ProjectResourcesIntf; diff --git a/ide/projectinspector.pas b/ide/projectinspector.pas index b37f39c79c..9ca69f79cb 100644 --- a/ide/projectinspector.pas +++ b/ide/projectinspector.pas @@ -71,10 +71,10 @@ uses IDEHelpIntf, IDECommands, IDEDialogs, IDEImagesIntf, LazIDEIntf, ToolBarIntf, IdeIntfStrConsts, MenuIntf, InputHistory, // IdeConfig - EnvironmentOpts, IDEOptionDefs, + EnvironmentOpts, IDEOptionDefs, TransferMacros, // IDE LazarusIDEStrConsts, MainBase, MainBar, IDEProcs, DialogProcs, Project, - TransferMacros, BuildManager, AddToProjectDlg, EnvGuiOptions, + BuildManager, AddToProjectDlg, EnvGuiOptions, BasePkgManager, ProjPackChecks, ProjPackEditing, ProjPackFilePropGui, PackageDefs, AddPkgDependencyDlg, AddFPMakeDependencyDlg; diff --git a/ide/projectresources.pas b/ide/projectresources.pas index fe81402faf..fd1a09aca7 100644 --- a/ide/projectresources.pas +++ b/ide/projectresources.pas @@ -37,12 +37,11 @@ unit ProjectResources; interface uses - // RTL + LCL Classes, SysUtils, resource, reswriter, fgl, Laz_AVL_Tree, // LCL - Controls, LCLProc, LResources, + Controls, LResources, // LazUtils - LazFileUtils, Laz2_XMLCfg, + LazFileUtils, Laz2_XMLCfg, LazLoggerBase, // Codetools KeywordFuncLists, BasicCodeTools, CodeToolManager, CodeCache, // IdeIntf diff --git a/ide/projectuserresources.pas b/ide/projectuserresources.pas index 951e261c3c..1a2d9b918f 100644 --- a/ide/projectuserresources.pas +++ b/ide/projectuserresources.pas @@ -38,10 +38,8 @@ uses // RTL + LCL Classes, SysUtils, resource, bitmapresource, groupresource, groupiconresource, groupcursorresource, - // LCL - LCLProc, // LazUtils - FileProcs, LazFileUtils, LazUTF8, Laz2_XMLCfg, + LazFileUtils, LazUTF8, Laz2_XMLCfg, LazLoggerBase, // IdeIntf ProjectResourcesIntf, IDEMsgIntf, MacroIntf, IDEExternToolIntf, // IDE diff --git a/ide/sortselectiondlg.pas b/ide/sortselectiondlg.pas index dcdb6da32f..6081968d9b 100644 --- a/ide/sortselectiondlg.pas +++ b/ide/sortselectiondlg.pas @@ -41,7 +41,9 @@ interface uses SysUtils, Laz_AVL_Tree, // LCL - LCLProc, Forms, Controls, StdCtrls, ExtCtrls, ButtonPanel, + Forms, Controls, StdCtrls, ExtCtrls, ButtonPanel, + // LazUtils + LazLoggerBase, // Codetools BasicCodeTools, // SynEdit diff --git a/ide/sourcefilemanager.pas b/ide/sourcefilemanager.pas index fdfa9bb76a..8788b3bc8d 100644 --- a/ide/sourcefilemanager.pas +++ b/ide/sourcefilemanager.pas @@ -52,13 +52,13 @@ uses IdeIntfStrConsts, ObjectInspector, SrcEditorIntf, EditorSyntaxHighlighterDef, UnitResources, ComponentReg, InputHistory, // IdeConfig - EnvironmentOpts, SearchPathProcs, + EnvironmentOpts, SearchPathProcs, TransferMacros, // IDE IDEProcs, DialogProcs, IDEProtocol, LazarusIDEStrConsts, NewDialog, NewProjectDlg, MainBase, MainBar, MainIntf, Project, ProjectDefs, ProjectInspector, CompilerOptions, SourceSynEditor, SourceEditor, EditorOptions, CustomFormEditor, ControlSelection, - FormEditor, EmptyMethodsDlg, BaseDebugManager, TransferMacros, BuildManager, + FormEditor, EmptyMethodsDlg, BaseDebugManager, BuildManager, EditorMacroListViewer, FindRenameIdentifier, BuildModesManager, ViewUnit_Dlg, CheckLFMDlg, etMessagesWnd, DebugManager, EnvGuiOptions, ConvCodeTool, BasePkgManager, PackageDefs, PackageSystem, Designer, DesignerProcs; diff --git a/ide/sourcesyneditor.pas b/ide/sourcesyneditor.pas index 20f40c1674..6395abad1c 100644 --- a/ide/sourcesyneditor.pas +++ b/ide/sourcesyneditor.pas @@ -49,7 +49,8 @@ uses {$ENDIF} Classes, SysUtils, // LCL - Controls, LCLProc, LCLType, Graphics, Menus, ImgList, + Controls, LCLType, Graphics, Menus, ImgList, + LazLoggerBase, // synedit SynEdit, SynEditMiscClasses, SynGutter, SynGutterBase, SynEditMarks, SynEditTypes, SynGutterLineNumber, SynGutterCodeFolding, SynGutterMarks, diff --git a/ide/srcedithintfrm.pas b/ide/srcedithintfrm.pas index 5fdde9beb8..88989d75a3 100644 --- a/ide/srcedithintfrm.pas +++ b/ide/srcedithintfrm.pas @@ -31,8 +31,8 @@ unit SrcEditHintFrm; interface uses - Classes, Math, SysUtils, LCLProc, LCLType, LCLIntf, Forms, Controls, Graphics, - ExtCtrls, + Classes, Math, SysUtils, + LCLType, LCLIntf, Forms, Controls, Graphics, ExtCtrls, SynEdit, SynEditKeyCmds, SrcEditorIntf; diff --git a/ide/syncolorattribeditor.pas b/ide/syncolorattribeditor.pas index 3042c2ce58..c3b96272bd 100644 --- a/ide/syncolorattribeditor.pas +++ b/ide/syncolorattribeditor.pas @@ -7,12 +7,14 @@ interface uses Classes, Controls, sysutils, types, typinfo, math, FPCanvas, // LCL - LCLProc, LCLType, LCLIntf, Forms, StdCtrls, ExtCtrls, Graphics, GraphUtil, + LCLIntf, Forms, StdCtrls, ExtCtrls, Graphics, GraphUtil, ColorBox, Dialogs, Menus, Spin, // SynEdit SynEditTypes, SynTextDrawer, + // IdeConfig + EnvironmentOpts, // IDE - EditorOptions, SourceMarks, LazarusIDEStrConsts, EnvironmentOpts; + EditorOptions, SourceMarks, LazarusIDEStrConsts; type diff --git a/ide/unitinfodlg.pp b/ide/unitinfodlg.pp index a1745a2073..b475a62779 100644 --- a/ide/unitinfodlg.pp +++ b/ide/unitinfodlg.pp @@ -28,11 +28,11 @@ interface uses // LCL + FCL - SysUtils, LCLProc, Controls, StdCtrls, Forms, Buttons, ComCtrls, + SysUtils, Controls, StdCtrls, Forms, Buttons, ComCtrls, // CodeTools - CodeToolsDefPreview, CodeToolManager, FileProcs, + CodeToolsDefPreview, CodeToolManager, // LazUtils - LazFileUtils, + LazFileUtils, LazLoggerBase, // IDE LazarusIDEStrConsts; diff --git a/ide/w32manifest.pas b/ide/w32manifest.pas index 4f23f29cfb..9fe58a3dca 100644 --- a/ide/w32manifest.pas +++ b/ide/w32manifest.pas @@ -37,9 +37,11 @@ unit W32Manifest; interface uses - Classes, SysUtils, FileUtil, Laz2_XMLCfg, LCLProc, Controls, Forms, - CodeToolManager, LazConf, LResources, - ProjectResourcesIntf, resource; + SysUtils, resource, + Laz2_XMLCfg, + Controls, LResources, + LazConf, + ProjectResourcesIntf; const DefaultXPManifestTextName = 'CompanyName.ProductName.AppName'; diff --git a/ide/w32versioninfo.pas b/ide/w32versioninfo.pas index f142286d8b..60daeb277c 100644 --- a/ide/w32versioninfo.pas +++ b/ide/w32versioninfo.pas @@ -39,10 +39,10 @@ unit W32VersionInfo; interface uses - Classes, SysUtils, LCLProc, Controls, Forms, FileUtil, TypInfo, laz2_DOM, - Laz2_XMLCfg, CodeToolManager, LazConf, IDEProcs, ProjectIntf, CompOptsIntf, - ProjectResourcesIntf, resource, versionresource, versiontypes, versionconsts, - TransferMacros; + Classes, SysUtils, TypInfo, versionresource, versiontypes, versionconsts, + Laz2_DOM, Laz2_XMLCfg, LazLoggerBase, + LazConf, TransferMacros, + CompOptsIntf, ProjectResourcesIntf; type diff --git a/lcl/calendar.pp b/lcl/calendar.pp index 2e8a8aadea..b0f7db87bb 100644 --- a/lcl/calendar.pp +++ b/lcl/calendar.pp @@ -29,9 +29,9 @@ unit Calendar; interface uses - {$IFDEF VerboseCalenderSetDate}LCLProc,{$ENDIF} - Types, SysUtils, Classes, LCLType, LCLStrConsts, lMessages, Controls, LResources, - Math; + Types, SysUtils, Classes, Math, + {$IFDEF VerboseCalenderSetDate}LazLoggerBase,{$ENDIF} + LCLType, LCLStrConsts, lMessages, Controls, LResources; type TDisplaySetting = ( diff --git a/lcl/colorbox.pas b/lcl/colorbox.pas index ff82269fe1..97d5307e33 100644 --- a/lcl/colorbox.pas +++ b/lcl/colorbox.pas @@ -21,7 +21,7 @@ interface uses LResources, SysUtils, Types, Classes, - LCLProc, LCLType, LCLStrConsts, Graphics, Controls, Forms, Dialogs, StdCtrls, + LCLType, LCLStrConsts, Graphics, Controls, Forms, Dialogs, StdCtrls, LazStringUtils; const diff --git a/lcl/comctrls.pp b/lcl/comctrls.pp index 3559fca7cb..770752fd41 100644 --- a/lcl/comctrls.pp +++ b/lcl/comctrls.pp @@ -29,13 +29,13 @@ unit ComCtrls; interface uses - SysUtils, Types, Classes, Math, Laz_AVL_Tree, IntegerList, + SysUtils, Types, Classes, Math, Laz_AVL_Tree, // LCL LCLStrConsts, LResources, LCLIntf, LCLType, LCLProc, LMessages, WSLCLClasses, WSReferences, Graphics, ImgList, ActnList, Themes, Menus, Controls, Forms, StdCtrls, ExtCtrls, ToolWin, Buttons, // LazUtils - GraphType, LazUTF8, LazLoggerBase, LazUtilities; + GraphType, LazUTF8, LazLoggerBase, LazUtilities, IntegerList; type THitTest = (htAbove, htBelow, htNowhere, htOnItem, htOnButton, htOnIcon, diff --git a/lcl/customtimer.pas b/lcl/customtimer.pas index 37b80314dc..52b7662b8b 100644 --- a/lcl/customtimer.pas +++ b/lcl/customtimer.pas @@ -20,7 +20,8 @@ unit CustomTimer; interface uses - Classes, SysUtils, LCLProc, LCLStrConsts, LCLType, InterfaceBase, CustApp; + Classes, SysUtils, + LCLStrConsts, InterfaceBase, CustApp; type diff --git a/lcl/dialogres.pas b/lcl/dialogres.pas index f6c92a6eef..9907faa684 100644 --- a/lcl/dialogres.pas +++ b/lcl/dialogres.pas @@ -5,7 +5,8 @@ unit DialogRes; interface uses - LCLType, Graphics, Themes, Controls, ImgList, InterfaceBase, LCLIntf, LCLProc, SysUtils, Classes; + SysUtils, Classes, + LCLType, Graphics, Themes, Controls, ImgList, InterfaceBase, LCLIntf, LCLProc; type TDialogImage = idDialogWarning..idDialogShield; diff --git a/lcl/editbtn.pas b/lcl/editbtn.pas index 138af1969b..c83c239706 100644 --- a/lcl/editbtn.pas +++ b/lcl/editbtn.pas @@ -30,10 +30,11 @@ unit EditBtn; interface uses - Classes, SysUtils, LCLProc, LResources, LCLStrConsts, Types, LCLType, - LMessages, Graphics, Controls, Forms, LazFileUtils, LazUTF8, Dialogs, - StdCtrls, Buttons, Calendar, ExtDlgs, GroupedEdit, CalendarPopup, MaskEdit, - Menus, StrUtils, DateUtils, TimePopup, CalcForm, ImgList, Math; + Classes, SysUtils, Types, Math, StrUtils, DateUtils, + LazFileUtils, LazUTF8, + LResources, LCLStrConsts, LCLType, Graphics, Controls, Forms, + Dialogs, StdCtrls, Buttons, Calendar, ExtDlgs, GroupedEdit, CalendarPopup, + MaskEdit, Menus, TimePopup, CalcForm, ImgList; const NullDate: TDateTime = 29584650.5 {appr 10 x MaxDateTime}; diff --git a/lcl/groupededit.pp b/lcl/groupededit.pp index 08fb7b71f8..99f4332cc6 100644 --- a/lcl/groupededit.pp +++ b/lcl/groupededit.pp @@ -42,9 +42,9 @@ unit GroupedEdit; interface uses - Classes, SysUtils, LCLProc, LResources, LCLStrConsts, Types, LCLType, LMessages, - Graphics, Controls, Forms, LazFileUtils, Dialogs, StdCtrls, Buttons, Menus, - MaskEdit; + Classes, SysUtils, Types, + LResources, LCLStrConsts, LCLType, LMessages, Graphics, Controls, Forms, + Dialogs, StdCtrls, Buttons, Menus, MaskEdit; type diff --git a/lcl/helpintfs.pas b/lcl/helpintfs.pas index 4f0166db1c..a448fad1e6 100644 --- a/lcl/helpintfs.pas +++ b/lcl/helpintfs.pas @@ -32,7 +32,7 @@ unit HelpIntfs; interface uses - Classes, SysUtils, LCLProc; + Classes, SysUtils; type // All help-specific errors should be thrown as this type. diff --git a/lcl/imagelistcache.pas b/lcl/imagelistcache.pas index 93ce6b51be..73ca50b1a3 100644 --- a/lcl/imagelistcache.pas +++ b/lcl/imagelistcache.pas @@ -23,7 +23,8 @@ unit ImageListCache; interface uses - Classes, SysUtils, Graphics, ImgList, LCLProc, Forms; + Classes, SysUtils, + Graphics, ImgList, Forms; type // interface that cache user should have to listen for cache changes diff --git a/lcl/lazcanvas.pas b/lcl/lazcanvas.pas index 3a0e81b857..ca0f50de4d 100644 --- a/lcl/lazcanvas.pas +++ b/lcl/lazcanvas.pas @@ -22,7 +22,6 @@ TFPImageCanvas versions, making the interface smoother for its users Dont use anything from the LCL here as this unit should be kept strictly independent - only LCLProc for DebugLn is allowed, but only during debuging } unit LazCanvas; @@ -43,7 +42,7 @@ uses // LCL IntfGraphics, LazRegions {$if defined(lazcanvas_debug) or defined(lazcanvas_profiling)} - , LazSysUtils, LCLProc + , LazSysUtils, LazLoggerBase {$endif} ; diff --git a/lcl/lazhelphtml.pas b/lcl/lazhelphtml.pas index 295d4e9f5f..c00fb3e84d 100644 --- a/lcl/lazhelphtml.pas +++ b/lcl/lazhelphtml.pas @@ -21,9 +21,9 @@ uses {$IFDEF MSWindows}Windows, ShellApi,{$ENDIF} // needed for ShellExecute, not good for WinCE, issue #36558 Classes, SysUtils, // LazUtils - LazFileUtils, UTF8Process, LazStringUtils, LazConfigStorage, + LazFileUtils, UTF8Process, LazStringUtils, LazConfigStorage, LazLoggerBase, // LCL - LCLProc, LCLIntf, LCLStrConsts, HelpIntfs, LazHelpIntf; + LCLIntf, LCLStrConsts, HelpIntfs, LazHelpIntf; type { THTMLHelpDatabase diff --git a/lcl/lazhelpintf.pas b/lcl/lazhelpintf.pas index 248bd9623b..1e0a34bdf4 100644 --- a/lcl/lazhelpintf.pas +++ b/lcl/lazhelpintf.pas @@ -27,9 +27,9 @@ interface uses Classes, SysUtils, // LazUtils - FileUtil, LazFileUtils, LazUtilities, LazUTF8, LazConfigStorage, Masks, + FileUtil, LazFileUtils, LazUtilities, LazLoggerBase, LazUTF8, LazConfigStorage, Masks, // LCL - LCLProc, LCLStrConsts, Dialogs, HelpIntfs; + LCLStrConsts, Dialogs, HelpIntfs; type { THelpQueryItem } diff --git a/lcl/lclclasses.pp b/lcl/lclclasses.pp index ea52075193..1c6da67487 100644 --- a/lcl/lclclasses.pp +++ b/lcl/lclclasses.pp @@ -24,7 +24,9 @@ unit LCLClasses; interface uses - Classes, WSLCLClasses, WSReferences, LCLType, LCLProc; + Classes, + LazLoggerBase, + WSLCLClasses, WSReferences, LCLType; type diff --git a/lcl/lclmessageglue.pas b/lcl/lclmessageglue.pas index efabad983f..dc07b71b44 100644 --- a/lcl/lclmessageglue.pas +++ b/lcl/lclmessageglue.pas @@ -27,7 +27,9 @@ unit LCLMessageGlue; interface uses - Classes, Forms, LCLClasses, LCLProc, Controls, Messages, LMessages, LCLType; + Classes, + LazLoggerBase, + Forms, LCLClasses, Controls, LMessages, LCLType; function DeliverMessage(const Target: TObject; var AMessage): PtrInt; function SendSimpleMessage(const Target: TControl; Msg: Cardinal): PtrInt; diff --git a/lcl/maskedit.pp b/lcl/maskedit.pp index 61309faf30..b480a7ff94 100644 --- a/lcl/maskedit.pp +++ b/lcl/maskedit.pp @@ -55,8 +55,10 @@ unit MaskEdit; interface uses - Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, - ExtCtrls, StdCtrls, LMessages, Clipbrd, LCLType, LCLProc, LCLStrConsts, LazUtf8; + Classes, SysUtils, + LResources, LMessages, LCLType, LCLStrConsts, + Forms, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls, Clipbrd, + LazUtf8; const { Mask Type diff --git a/lcl/shellctrls.pas b/lcl/shellctrls.pas index cdbf4204e3..66d75fc01b 100644 --- a/lcl/shellctrls.pas +++ b/lcl/shellctrls.pas @@ -22,11 +22,11 @@ unit ShellCtrls; interface uses - Classes, SysUtils, Math, Laz_AVL_Tree, + Classes, SysUtils, Types, Math, Laz_AVL_Tree, // LCL - Forms, Graphics, ComCtrls, LCLProc, LCLType, LCLStrConsts, Types, + Forms, Graphics, ComCtrls, LCLStrConsts, // LazUtils - FileUtil, LazFileUtils, LazUTF8, Masks; + LazFileUtils, Masks; {$if defined(Windows) or defined(darwin) or defined(HASAMIGA))} {$define CaseInsensitiveFilenames} diff --git a/lcl/spin.pp b/lcl/spin.pp index 06ad7cb445..596a025840 100644 --- a/lcl/spin.pp +++ b/lcl/spin.pp @@ -24,7 +24,8 @@ unit Spin; interface uses - Types, Classes, Controls, SysUtils, LCLType, LCLProc, StdCtrls, Math; + Types, Classes, SysUtils, Math, + Controls, LCLType, StdCtrls; type { TCustomFloatSpinEdit } diff --git a/lcl/xmlpropstorage.pas b/lcl/xmlpropstorage.pas index b768980179..0c47d568fb 100644 --- a/lcl/xmlpropstorage.pas +++ b/lcl/xmlpropstorage.pas @@ -18,9 +18,9 @@ uses // RTL, FCL Classes, SysUtils, XMLConf, DOM, XMLRead, XMLWrite, // LCL - LCLProc, Forms, + Forms, // LazUtils - LazConfigStorage, LazUTF8; + LazConfigStorage, LazUTF8, LazLoggerBase; type { TPropStorageXMLConfig } diff --git a/packager/basepkgmanager.pas b/packager/basepkgmanager.pas index b56f0f8c52..79da57051c 100644 --- a/packager/basepkgmanager.pas +++ b/packager/basepkgmanager.pas @@ -43,9 +43,13 @@ uses {$IFDEF IDE_MEM_CHECK} MemCheck, {$ENDIF} - TypInfo, Classes, SysUtils, Forms, LazFileUtils, LCLProc, ComCtrls, - LazIDEIntf, PackageIntf, MenuIntf, - IdeIntfStrConsts, LazarusIDEStrConsts, EnvironmentOpts, + TypInfo, Classes, SysUtils, + LazFileUtils, LazLoggerBase, + Forms, ComCtrls, + PackageIntf, + LazIDEIntf, MenuIntf, IdeIntfStrConsts, + EnvironmentOpts, + LazarusIDEStrConsts, CompilerOptions, PackageDefs, PackageSystem, Project; type diff --git a/packager/installpkgsetdlg.pas b/packager/installpkgsetdlg.pas index 959c43b5d6..5054c55b3d 100644 --- a/packager/installpkgsetdlg.pas +++ b/packager/installpkgsetdlg.pas @@ -39,14 +39,14 @@ interface uses Classes, SysUtils, contnrs, Laz_AVL_Tree, // LCL - LCLType, LCLProc, Forms, Controls, Graphics, Dialogs, StdCtrls, Buttons, + LCLType, Forms, Controls, Graphics, Dialogs, StdCtrls, Buttons, ExtCtrls, ComCtrls, ImgList, // LazControls TreeFilterEdit, // Codetools BasicCodeTools, // LazUtils - LazFileUtils, Laz2_XMLCfg, LazUTF8, + LazFileUtils, Laz2_XMLCfg, LazUTF8, LazLoggerBase, // BuildIntf PackageIntf, PackageLinkIntf, PackageDependencyIntf, // IdeIntf diff --git a/packager/interpkgconflictfiles.pas b/packager/interpkgconflictfiles.pas index ecfe06fb6c..e377ea81cc 100644 --- a/packager/interpkgconflictfiles.pas +++ b/packager/interpkgconflictfiles.pas @@ -63,9 +63,11 @@ uses FPCAdds, LazFileUtils, LazFileCache, LazTracer, // IDEIntf ProjectIntf, CompOptsIntf, IDEWindowIntf, LazIDEIntf, IDEMsgIntf, IDEExternToolIntf, + // IdeConfig + EnvironmentOpts, TransferMacros, // IDE - CompilerOptions, EnvironmentOpts, IDEProcs, DialogProcs, LazarusIDEStrConsts, - TransferMacros, SearchPathProcs, PackageDefs, PackageSystem; + CompilerOptions, IDEProcs, DialogProcs, LazarusIDEStrConsts, + SearchPathProcs, PackageDefs, PackageSystem; type TPGInterPkgOwnerInfo = class diff --git a/packager/packagedefs.pas b/packager/packagedefs.pas index 13316782b7..4bda415496 100644 --- a/packager/packagedefs.pas +++ b/packager/packagedefs.pas @@ -53,10 +53,11 @@ uses PackageDependencyIntf, PackageIntf, FppkgIntf, // IDEIntf LazIDEIntf, IDEOptEditorIntf, IDEDialogs, ComponentReg, IDEImagesIntf, + // IdeConfig + TransferMacros, // IDE EditDefineTree, CompilerOptions, CompOptsModes, IDEOptionDefs, ProjPackCommon, - LazarusIDEStrConsts, IDEProcs, TransferMacros, SearchPathProcs, - IdeXmlConfigProcs, FppkgHelper; + LazarusIDEStrConsts, IDEProcs, SearchPathProcs, IdeXmlConfigProcs, FppkgHelper; type TLazPackage = class; diff --git a/packager/packagesystem.pas b/packager/packagesystem.pas index 0a5ca49e8d..ede6d08fd1 100644 --- a/packager/packagesystem.pas +++ b/packager/packagesystem.pas @@ -61,11 +61,12 @@ uses IDEDialogs, IDEMsgIntf, LazIDEIntf, // Package registration LazarusPackageIntf, + // IdeConfig + EnvironmentOpts, LazConf, TransferMacros, // IDE - LazarusIDEStrConsts, IDECmdLine, EnvironmentOpts, IDEProcs, LazConf, - TransferMacros, DialogProcs, IDETranslations, CompilerOptions, - SearchPathProcs, PackageLinks, PackageDefs, ComponentReg, FppkgHelper, - PkgSysBasePkgs; + LazarusIDEStrConsts, IDECmdLine, IDEProcs, DialogProcs, IDETranslations, + CompilerOptions, SearchPathProcs, PackageLinks, PackageDefs, ComponentReg, + FppkgHelper, PkgSysBasePkgs; const MakefileCompileVersion = 2; diff --git a/packager/pkgmanager.pas b/packager/pkgmanager.pas index cbddc4170e..e1bc00bac9 100644 --- a/packager/pkgmanager.pas +++ b/packager/pkgmanager.pas @@ -65,14 +65,14 @@ uses UnitResources, InputHistory, // IdeConfig EnvironmentOpts, IDEOptionDefs, ModeMatrixOpts, RecentListProcs, - SearchPathProcs, + SearchPathProcs, TransferMacros, // FCL registration LazarusPackageIntf, // IDE IDECmdLine, LazarusIDEStrConsts, IDEProcs, DialogProcs, MiscOptions, Project, ProjPackEditing, AddToPackageDlg, PackageDefs, PackageLinks, PackageSystem, OpenInstalledPkgDlg, PkgGraphExplorer, BrokenDependenciesDlg, CompilerOptions, - IDETranslations, TransferMacros, BuildLazDialog, NewDialog, FindInFilesDlg, + IDETranslations, BuildLazDialog, NewDialog, FindInFilesDlg, ProjectInspector, PackageEditor, SourceEditor, ProjPackChecks, AddFileToAPackageDlg, PublishModuleDlg, PkgLinksDlg, InterPkgConflictFiles, InstallPkgSetDlg, ConfirmPkgListDlg, NewPkgComponentDlg, BaseBuildManager, BasePkgManager, diff --git a/packager/projpackchecks.pas b/packager/projpackchecks.pas index 71c532ad18..2352e6e421 100644 --- a/packager/projpackchecks.pas +++ b/packager/projpackchecks.pas @@ -8,9 +8,9 @@ uses Classes, SysUtils, {$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes, // LCL - LCLProc, Forms, Dialogs, + Forms, Dialogs, // LazUtils - FileUtil, LazFileUtils, + FileUtil, LazLoggerBase, LazFileUtils, // Codetools CodeToolManager, CodeCache, // BuildIntf