From 149b86fbbbd41e646fab1e7f65b0cdb5664ad6fb Mon Sep 17 00:00:00 2001 From: Juha Date: Sat, 6 Apr 2024 21:43:16 +0300 Subject: [PATCH] Tweak uses sections. --- ide/codetoolsdefines.pas | 4 ++-- ide/compiler.pp | 4 ++-- ide/debugmanager.pas | 4 ++-- ide/editdefinetree.pas | 4 +++- ide/etmessageframe.pas | 4 ++-- ide/frames/compiler_buildmacro_options.pas | 7 +++++-- ide/frames/compiler_codegen_options.pas | 4 +++- ide/frames/compiler_compilation_options.pas | 5 ++--- ide/frames/compiler_config_target.pas | 9 ++++++--- ide/frames/compiler_debugging_options.pas | 8 ++++++-- ide/frames/compiler_messages_options.pas | 4 ++-- ide/frames/compiler_other_options.pas | 4 +++- ide/frames/compiler_parsing_options.pas | 8 ++++++-- ide/frames/compiler_verbosity_options.pas | 8 ++++++-- ide/frames/project_application_options.pas | 5 +++-- ide/imexportcompileropts.pas | 4 ++-- ide/mainbase.pas | 4 ++-- ide/runparamsopts.pas | 9 +++++---- packager/basepkgmanager.pas | 4 ++-- packager/interpkgconflictfiles.pas | 4 +++- packager/projpackcommon.pas | 2 +- 21 files changed, 68 insertions(+), 41 deletions(-) diff --git a/ide/codetoolsdefines.pas b/ide/codetoolsdefines.pas index ad48cce60a..d207cfa0e4 100644 --- a/ide/codetoolsdefines.pas +++ b/ide/codetoolsdefines.pas @@ -57,10 +57,10 @@ uses // IdeIntf IdeIntfStrConsts, IDEWindowIntf, IDEImagesIntf, IDEDialogs, // IdeConfig - LazConf, TransferMacros, IDEProcs, + LazConf, TransferMacros, IDEProcs, CompilerOptions, // IDE LazarusIDEStrConsts, CodeToolsOptions, CodeToolsDefPreview, - EditorOptions, InputFileDialog, EditDefineTree, CompilerOptions; + EditorOptions, InputFileDialog, EditDefineTree; type diff --git a/ide/compiler.pp b/ide/compiler.pp index 1e9f40c1b5..39ecb0f7b7 100644 --- a/ide/compiler.pp +++ b/ide/compiler.pp @@ -48,9 +48,9 @@ uses // IdeIntf IDEMsgIntf, LazIDEIntf, CompOptsIntf, // IdeConfig - TransferMacros, IDECmdLine, + TransferMacros, IDECmdLine, CompilerOptions, // IDE - LazarusIDEStrConsts, CompilerOptions, Project; + LazarusIDEStrConsts, Project; type TOnCmdLineCreate = procedure(var CmdLine: string; var Abort:boolean) of object; diff --git a/ide/debugmanager.pas b/ide/debugmanager.pas index 3ec9e19334..748f2fe032 100644 --- a/ide/debugmanager.pas +++ b/ide/debugmanager.pas @@ -72,9 +72,9 @@ uses IdeDebuggerBackendValueConv, Debugger, BaseDebugManager, IdeDebuggerValueFormatter, IdeDebuggerDisplayFormats, // IdeConfig - LazConf, + LazConf, CompilerOptions, // IDE - CompilerOptions, SourceEditor, ProjectDefs, Project, ProjectDebugLink, + SourceEditor, ProjectDefs, Project, ProjectDebugLink, LazarusIDEStrConsts, MainBar, MainIntf, MainBase, BaseBuildManager, SourceMarks, DebugEventsForm, EnvGuiOptions, RunParamsOpts; diff --git a/ide/editdefinetree.pas b/ide/editdefinetree.pas index 2d31c633c3..4157a55b56 100644 --- a/ide/editdefinetree.pas +++ b/ide/editdefinetree.pas @@ -42,8 +42,10 @@ uses FileProcs, CodeToolManager, DefineTemplates, LinkScanner, // BuildIntf CompOptsIntf, + // IdeConfig + CompilerOptions, // IDE - CompilerOptions, LazarusIDEStrConsts; + LazarusIDEStrConsts; // global diff --git a/ide/etmessageframe.pas b/ide/etmessageframe.pas index 3ad3a87425..8fcb96fac3 100644 --- a/ide/etmessageframe.pas +++ b/ide/etmessageframe.pas @@ -45,10 +45,10 @@ uses // IDEIntf IDEImagesIntf, MenuIntf, IDECommands, IDEDialogs, LazIDEIntf, IdeIntfStrConsts, // IdeConfig - EnvironmentOpts, IDEOptionDefs, + EnvironmentOpts, IDEOptionDefs, CompilerOptions, // IDE LazarusIDEStrConsts, HelpFPCMessages, etSrcEditMarks, - MsgWnd_Options, etQuickFixes, ExtTools, CompilerOptions, EnvGuiOptions; + MsgWnd_Options, etQuickFixes, ExtTools, EnvGuiOptions; const CustomViewCaption = '------------------------------'; diff --git a/ide/frames/compiler_buildmacro_options.pas b/ide/frames/compiler_buildmacro_options.pas index c512525e28..b2a07b833c 100644 --- a/ide/frames/compiler_buildmacro_options.pas +++ b/ide/frames/compiler_buildmacro_options.pas @@ -32,9 +32,12 @@ uses Controls, Forms, StdCtrls, Buttons, ExtCtrls, Dialogs, ComCtrls, // CodeTools KeywordFuncLists, CodeToolsCfgScript, + // BuildIntf + IDEOptionsIntf, CompOptsIntf, MacroIntf, // IdeIntf - IDEOptionsIntf, IDEOptEditorIntf, CompOptsIntf, MacroIntf, IDEImagesIntf, - IDEDialogs, ParsedCompilerOpts, CompilerOptions, + IDEOptEditorIntf, IDEImagesIntf, IDEDialogs, + // IdeConfig + ParsedCompilerOpts, CompilerOptions, // IDE LazarusIDEStrConsts, PackageDefs; diff --git a/ide/frames/compiler_codegen_options.pas b/ide/frames/compiler_codegen_options.pas index d7c4711882..c764fb02ce 100644 --- a/ide/frames/compiler_codegen_options.pas +++ b/ide/frames/compiler_codegen_options.pas @@ -10,8 +10,10 @@ uses StdCtrls, // IdeIntf IDEOptionsIntf, IDEOptEditorIntf, + // IdeConfig + CompilerOptions, // IDE - CompilerOptions, LazarusIDEStrConsts; + LazarusIDEStrConsts; type diff --git a/ide/frames/compiler_compilation_options.pas b/ide/frames/compiler_compilation_options.pas index 73298e30b5..a5a22370c2 100644 --- a/ide/frames/compiler_compilation_options.pas +++ b/ide/frames/compiler_compilation_options.pas @@ -17,10 +17,9 @@ uses IDEOptionsIntf, IDEOptEditorIntf, CompOptsIntf, IDEExternToolIntf, IDEDialogs, IDEUtils, InputHistory, // IdeConfig - LazConf, EnvironmentOpts, RecentListProcs, + LazConf, EnvironmentOpts, RecentListProcs, CompilerOptions, // IDE - Project, CompilerOptions, PackageDefs, LazarusIDEStrConsts, - DialogProcs, InitialSetupProc; + LazarusIDEStrConsts, Project, PackageDefs, DialogProcs, InitialSetupProc; type diff --git a/ide/frames/compiler_config_target.pas b/ide/frames/compiler_config_target.pas index e4c7ac8ffc..27c6639272 100644 --- a/ide/frames/compiler_config_target.pas +++ b/ide/frames/compiler_config_target.pas @@ -35,11 +35,14 @@ uses LazFileUtils, LazStringUtils, LazUTF8, LazLoggerBase, // CodeTools DefineTemplates, CodeToolManager, + // BuildIntf + IDEOptionsIntf, MacroIntf, // IdeIntf - IDEOptionsIntf, IDEOptEditorIntf, MacroIntf, IDEDialogs, IDEUtils, + IDEOptEditorIntf, IDEDialogs, IDEUtils, + // IdeConfig + RecentListProcs, TransferMacros, CompilerOptions, // IDE - CompilerOptions, LazarusIDEStrConsts, TransferMacros, PackageDefs, Project, - RecentListProcs, InputHistory, compiler_parsing_options; + LazarusIDEStrConsts, PackageDefs, Project, InputHistory, compiler_parsing_options; type diff --git a/ide/frames/compiler_debugging_options.pas b/ide/frames/compiler_debugging_options.pas index 0964ab60df..4ac27d68e4 100644 --- a/ide/frames/compiler_debugging_options.pas +++ b/ide/frames/compiler_debugging_options.pas @@ -9,10 +9,14 @@ uses StdCtrls, // LazUtils LazLoggerBase, + // BuildIntf + IDEOptionsIntf, CompOptsIntf, // IdeIntf - IDEOptionsIntf, IDEOptEditorIntf, CompOptsIntf, + IDEOptEditorIntf, + // IdeConfig + CompilerOptions, // IDE - CompilerOptions, LazarusIDEStrConsts; + LazarusIDEStrConsts; type diff --git a/ide/frames/compiler_messages_options.pas b/ide/frames/compiler_messages_options.pas index 59c4377254..991df32fc2 100644 --- a/ide/frames/compiler_messages_options.pas +++ b/ide/frames/compiler_messages_options.pas @@ -19,9 +19,9 @@ uses // IdeIntf IDEOptEditorIntf, IDEDialogs, // IdeConfig - etFPCMsgFilePool, + etFPCMsgFilePool, CompilerOptions, // IDE - CompilerOptions, LazarusIDEStrConsts; + LazarusIDEStrConsts; type diff --git a/ide/frames/compiler_other_options.pas b/ide/frames/compiler_other_options.pas index 654d1e07f8..287ad292c8 100644 --- a/ide/frames/compiler_other_options.pas +++ b/ide/frames/compiler_other_options.pas @@ -35,8 +35,10 @@ uses LazUTF8, LazLoggerBase, // Codetools CodeToolsCfgScript, KeywordFuncLists, + // BuildIntf + IDEOptionsIntf, CompOptsIntf, // IdeIntf - IDEOptionsIntf, IDEOptEditorIntf, CompOptsIntf, IDECommands, + IDEOptEditorIntf, IDECommands, // SynEdit SynEdit, SynEditKeyCmds, SynCompletion, // IdeConfig diff --git a/ide/frames/compiler_parsing_options.pas b/ide/frames/compiler_parsing_options.pas index 0c33582d9a..9df776e742 100644 --- a/ide/frames/compiler_parsing_options.pas +++ b/ide/frames/compiler_parsing_options.pas @@ -10,10 +10,14 @@ uses ExtCtrls, StdCtrls, // CodeTools LinkScanner, + // BuildIntf + IDEOptionsIntf, // IdeIntf - IDEOptionsIntf, IDEOptEditorIntf, + IDEOptEditorIntf, + // IdeConfig + CompilerOptions, // IDE - CompilerOptions, PackageDefs, LazarusIDEStrConsts; + PackageDefs, LazarusIDEStrConsts; type diff --git a/ide/frames/compiler_verbosity_options.pas b/ide/frames/compiler_verbosity_options.pas index 151ed77d4d..2fdd7ad475 100644 --- a/ide/frames/compiler_verbosity_options.pas +++ b/ide/frames/compiler_verbosity_options.pas @@ -8,10 +8,14 @@ uses SysUtils, // LCL ExtCtrls, StdCtrls, + // BuildIntf + IDEOptionsIntf, // IdeIntf - IDEOptionsIntf, IDEOptEditorIntf, + IDEOptEditorIntf, + // IdeConfig + CompilerOptions, // IDE - CompilerOptions, LazarusIDEStrConsts; + LazarusIDEStrConsts; type diff --git a/ide/frames/project_application_options.pas b/ide/frames/project_application_options.pas index 589b76f32e..87ada002e2 100644 --- a/ide/frames/project_application_options.pas +++ b/ide/frames/project_application_options.pas @@ -14,9 +14,10 @@ uses DividerBevel, // IdeIntf IDEOptionsIntf, IDEOptEditorIntf, LazIDEIntf, IDEImagesIntf, IDEDialogs, + // IdeConfig + CompilerOptions, // IDE - LazarusIDEStrConsts, Project, ProjectIcon, CompilerOptions, - ApplicationBundle, W32Manifest; + LazarusIDEStrConsts, Project, ProjectIcon, ApplicationBundle, W32Manifest; type diff --git a/ide/imexportcompileropts.pas b/ide/imexportcompileropts.pas index 0954b25a5a..7b7e10b0b9 100644 --- a/ide/imexportcompileropts.pas +++ b/ide/imexportcompileropts.pas @@ -40,9 +40,9 @@ uses // IdeIntf IDEOptEditorIntf, IDEImagesIntf, InputHistory, // IdeConfig - RecentListProcs, + RecentListProcs, CompilerOptions, // IDE - LazarusIDEStrConsts, Project, CompilerOptions; + LazarusIDEStrConsts, Project; type { TImExportCompOptsDlg } diff --git a/ide/mainbase.pas b/ide/mainbase.pas index 5aeae7b1c3..090b5d40d0 100644 --- a/ide/mainbase.pas +++ b/ide/mainbase.pas @@ -73,9 +73,9 @@ uses // IDEDebugger IdeDebuggerStringConstants, // IdeConfig - LazConf, EnvironmentOpts, + LazConf, EnvironmentOpts, CompilerOptions, // IDE - LazarusIDEStrConsts, EditorOptions, CompilerOptions, EnvGuiOptions, + LazarusIDEStrConsts, EditorOptions, EnvGuiOptions, Project, SourceEditor, SourceSynEditor, FindInFilesDlg, Splash, MainBar, MainIntf, Designer, Debugger, RunParamsOpts, FindInFilesWnd; diff --git a/ide/runparamsopts.pas b/ide/runparamsopts.pas index 190906cfae..c940a60711 100644 --- a/ide/runparamsopts.pas +++ b/ide/runparamsopts.pas @@ -51,15 +51,16 @@ uses // LCL Controls, Forms, Buttons, StdCtrls, ComCtrls, Dialogs, ButtonPanel, ExtCtrls, Spin, EditBtn, - // IdeIntf - IdeIntfStrConsts, BaseIDEIntf, IDEHelpIntf, ProjectIntf, IDEDialogs, InputHistory, - IDEImagesIntf, IDEWindowIntf, MacroIntf, // LazUtils LazFileUtils, LazFileCache, LazUTF8, Laz2_XMLCfg, DbgIntfDebuggerBase, + // BuildIntf + BaseIDEIntf, ProjectIntf, MacroIntf, + // IdeIntf + IdeIntfStrConsts, IDEHelpIntf, IDEDialogs, IDEImagesIntf, IDEWindowIntf, // IdeConfig EnvironmentOpts, RecentListProcs, // IDE - MiscOptions, SysVarUserOverrideDlg, LazarusIDEStrConsts + InputHistory, MiscOptions, SysVarUserOverrideDlg, LazarusIDEStrConsts {$IFnDef LCLNoGui}, BaseDebugManager {$ENDIF} ; { The xml format version: diff --git a/packager/basepkgmanager.pas b/packager/basepkgmanager.pas index 8630ab7c38..456fe20bcb 100644 --- a/packager/basepkgmanager.pas +++ b/packager/basepkgmanager.pas @@ -48,9 +48,9 @@ uses Forms, ComCtrls, PackageIntf, BaseIDEIntf, MenuIntf, IdeIntfStrConsts, - EnvironmentOpts, + EnvironmentOpts, CompilerOptions, LazarusIDEStrConsts, - CompilerOptions, PackageDefs, PackageSystem, Project; + PackageDefs, PackageSystem, Project; type { TBasePkgManager } diff --git a/packager/interpkgconflictfiles.pas b/packager/interpkgconflictfiles.pas index cfae346f99..af98d484a3 100644 --- a/packager/interpkgconflictfiles.pas +++ b/packager/interpkgconflictfiles.pas @@ -61,8 +61,10 @@ uses BasicCodeTools, DefineTemplates, CodeToolManager, FileProcs, // LazUtils FPCAdds, LazFileUtils, LazFileCache, LazTracer, + // BuildIntf + ProjectIntf, CompOptsIntf, IDEExternToolIntf, // IDEIntf - ProjectIntf, CompOptsIntf, IDEWindowIntf, LazIDEIntf, IDEMsgIntf, IDEExternToolIntf, + IDEWindowIntf, LazIDEIntf, IDEMsgIntf, // IdeConfig EnvironmentOpts, TransferMacros, IDEProcs, SearchPathProcs, ParsedCompilerOpts, CompilerOptions, diff --git a/packager/projpackcommon.pas b/packager/projpackcommon.pas index 61e5bdc72b..60af4e098f 100644 --- a/packager/projpackcommon.pas +++ b/packager/projpackcommon.pas @@ -11,7 +11,7 @@ uses LazTracer, FileReferenceList, // Codetools DefineTemplates, CodeToolManager, - // IDE + // IdeConfig CompilerOptions; type