diff --git a/components/lazutils/lazstringutils.pas b/components/lazutils/lazstringutils.pas index c594e85267..827eb0e35f 100644 --- a/components/lazutils/lazstringutils.pas +++ b/components/lazutils/lazstringutils.pas @@ -519,7 +519,7 @@ function CommentText(const s: string; CommentType: TCommentType): string; inc(NewPos,length(EndOfLine)); end; if NewPos<>NewLen+1 then - raise Exception.Create('IDEProcs.CommentText ERROR: ' + raise Exception.Create('CommentText ERROR: ' +IntToStr(NewPos-1)+'<>'+IntToStr(NewLen)); end; diff --git a/components/lazutils/objectlists.pas b/components/lazutils/objectlists.pas index 40b961518b..e64e9448c8 100644 --- a/components/lazutils/objectlists.pas +++ b/components/lazutils/objectlists.pas @@ -1,6 +1,6 @@ { /*************************************************************************** - packagedefs.pas + objectlists.pas --------------- diff --git a/converter/chgencodingdlg.pas b/converter/chgencodingdlg.pas index 15e8ecd805..a6c150db53 100644 --- a/converter/chgencodingdlg.pas +++ b/converter/chgencodingdlg.pas @@ -40,8 +40,10 @@ uses LConvEncoding, LazFileUtils, LazFileCache, LazStringUtils, LazUTF8, AvgLvlTree, // IDEIntf IdeIntfStrConsts, IDEWindowIntf, SrcEditorIntf, IDEHelpIntf, IDEImagesIntf, + // IdeConfig + IDEProcs, // IDE - IDEProcs, PackageDefs, PackageSystem, Project, LazarusIDEStrConsts, + PackageDefs, PackageSystem, Project, LazarusIDEStrConsts, EnvironmentOpts, SearchPathProcs; type diff --git a/converter/convertdelphi.pas b/converter/convertdelphi.pas index 7869b16774..6ef17e2f72 100644 --- a/converter/convertdelphi.pas +++ b/converter/convertdelphi.pas @@ -44,8 +44,10 @@ uses // IDEIntf ComponentReg, IDEDialogs, LazIDEIntf, PackageIntf, ProjectIntf, IDEExternToolIntf, IDEOptEditorIntf, + // IdeConfig + IDEProcs, // IDE - IDEProcs, DialogProcs, CompilerOptions, ProjPackCommon, Project, + DialogProcs, CompilerOptions, ProjPackCommon, Project, PackageDefs, PackageSystem, PackageEditor, BasePkgManager, LazarusIDEStrConsts, SearchPathProcs, SourceFileManager, // Converter diff --git a/converter/convertsettings.pas b/converter/convertsettings.pas index 999158b1f7..7123e8b4a2 100644 --- a/converter/convertsettings.pas +++ b/converter/convertsettings.pas @@ -40,7 +40,7 @@ uses // IdeIntf IdeIntfStrConsts, BaseIDEIntf, IDEMsgIntf, IDEExternToolIntf, IDEImagesIntf, // IDE - IDEProcs, DialogProcs, LazarusIDEStrConsts, + DialogProcs, LazarusIDEStrConsts, // Converter ConverterTypes, ReplaceNamesUnit, ReplaceFuncsUnit; diff --git a/debugger/frames/debugger_general_options.pas b/debugger/frames/debugger_general_options.pas index 79c30ddcf2..1c6649a6c0 100644 --- a/debugger/frames/debugger_general_options.pas +++ b/debugger/frames/debugger_general_options.pas @@ -33,11 +33,11 @@ uses // IdeIntf IDEOptionsIntf, IDEOptEditorIntf, // IdeConfig - SearchPathProcs, EnvironmentOpts, + SearchPathProcs, EnvironmentOpts, IDEProcs, // IdeDebugger BaseDebugManager, IdeDebuggerOpts, EnvDebuggerOptions, // IDE - LazarusIDEStrConsts, PathEditorDlg, IDEProcs; + LazarusIDEStrConsts, PathEditorDlg; type diff --git a/designer/askcompnamedlg.pas b/designer/askcompnamedlg.pas index ae6f34b2e9..e829735fe0 100644 --- a/designer/askcompnamedlg.pas +++ b/designer/askcompnamedlg.pas @@ -29,12 +29,12 @@ uses Classes, SysUtils, TypInfo, // LCL LCLType, Forms, Controls, Dialogs, StdCtrls, ButtonPanel, ExtCtrls, - // LazUtils - LazStringUtils, // IdeIntf IdeIntfStrConsts, PropEdits, + // IdeConfig + IDEProcs, // IDE - IDEProcs, LazarusIDEStrConsts; + LazarusIDEStrConsts; type diff --git a/ide/buildmanager.pas b/ide/buildmanager.pas index 4a395c884d..6064855b30 100644 --- a/ide/buildmanager.pas +++ b/ide/buildmanager.pas @@ -35,9 +35,9 @@ interface uses // RTL + FCL - Classes, SysUtils, Types, AVL_Tree, + Classes, SysUtils, Types, AVL_Tree, System.UITypes, // LCL - InterfaceBase, LCLPlatformDef, Dialogs, Forms, Controls, + InterfaceBase, LCLPlatformDef, // CodeTools ExprEval, BasicCodeTools, CodeToolManager, DefineTemplates, CodeCache, FileProcs, CodeToolsCfgScript, LinkScanner, @@ -51,8 +51,9 @@ uses IDEDialogs, LazIDEIntf, IDEMsgIntf, SrcEditorIntf, InputHistory, // IdeConfig LazConf, EnvironmentOpts, ModeMatrixOpts, TransferMacros, IdeConfStrConsts, + IDEProcs, // IDE - IDECmdLine, LazarusIDEStrConsts, DialogProcs, IDEProcs, + LazarusIDEStrConsts, DialogProcs, EditDefineTree, ProjectResources, MiscOptions, CompilerOptions, ExtTools, etMakeMsgParser, etFPCMsgParser, etPas2jsMsgParser, Compiler, FPCSrcScan, PackageDefs, PackageSystem, Project, ProjectIcon, BaseBuildManager, diff --git a/ide/buildmodediffdlg.pas b/ide/buildmodediffdlg.pas index f7b29ced6a..feab9d8762 100644 --- a/ide/buildmodediffdlg.pas +++ b/ide/buildmodediffdlg.pas @@ -35,8 +35,10 @@ uses StdCtrls, ComCtrls, Forms, ButtonPanel, // LazUtils LazUTF8, LazLoggerBase, AvgLvlTree, + // IdeConfig + EnvironmentOpts, ModeMatrixOpts, CompOptsModes, // IDE - LazarusIDEStrConsts, EnvironmentOpts, Project, ModeMatrixOpts, CompOptsModes; + LazarusIDEStrConsts, Project; type diff --git a/ide/buildprofilemanager.pas b/ide/buildprofilemanager.pas index 1a20ff40bd..c99a4199a6 100644 --- a/ide/buildprofilemanager.pas +++ b/ide/buildprofilemanager.pas @@ -31,11 +31,11 @@ unit BuildProfileManager; interface uses - Classes, SysUtils, + Classes, SysUtils, Contnrs, System.UITypes, // LazUtils Laz2_XMLCfg, LazLoggerBase, LazFileUtils, LazUTF8, // LCL - Forms, Controls, Dialogs, ExtCtrls, StdCtrls, ComCtrls, Contnrs, ButtonPanel, + Forms, Dialogs, ExtCtrls, StdCtrls, ComCtrls, ButtonPanel, InterfaceBase, LCLPlatformDef, // Codetools DefineTemplates, @@ -44,7 +44,7 @@ uses // IdeConfig EnvironmentOpts, TransferMacros, IdeXmlConfigProcs, // IDE - LazarusIDEStrConsts, IDEProcs; + LazarusIDEStrConsts; type diff --git a/ide/buildprojectdlg.pas b/ide/buildprojectdlg.pas index f1354c33eb..d32d2ecfff 100644 --- a/ide/buildprojectdlg.pas +++ b/ide/buildprojectdlg.pas @@ -37,9 +37,10 @@ uses FileProcs, CodeToolManager, DirectoryCacher, // IDEIntf IdeIntfStrConsts, IDEDialogs, IDEImagesIntf, PackageIntf, InputHistory, + // IdeConfig + EnvironmentOpts, RecentListProcs, // IDE - PackageDefs, PackageSystem, LazarusIDEStrConsts, Project, - EnvironmentOpts, IDEProcs, RecentListProcs; + PackageDefs, PackageSystem, LazarusIDEStrConsts, Project; type TBuildProjectDialogItem = class diff --git a/ide/checkcompileropts.pas b/ide/checkcompileropts.pas index 841728d78d..3063a400ec 100644 --- a/ide/checkcompileropts.pas +++ b/ide/checkcompileropts.pas @@ -43,10 +43,9 @@ uses ProjectIntf, MacroIntf, IDEExternToolIntf, LazIDEIntf, IDEDialogs, PackageIntf, IDEMsgIntf, // IdeConfig - TransferMacros, SearchPathProcs, + TransferMacros, SearchPathProcs, IDEProcs, // IDE - Project, PackageSystem, IDEProcs, LazarusIDEStrConsts, PackageDefs, - CompilerOptions; + Project, PackageSystem, LazarusIDEStrConsts, PackageDefs, CompilerOptions; type TCompilerOptionsTest = ( diff --git a/ide/codeexplopts.pas b/ide/codeexplopts.pas index 2bea3f6c64..076b36d9ed 100644 --- a/ide/codeexplopts.pas +++ b/ide/codeexplopts.pas @@ -42,10 +42,14 @@ uses BasicCodeTools, // LazUtils AvgLvlTree, Laz2_XMLCfg, LazFileUtils, LazFileCache, LazLoggerBase, + // BuildIntf + IDEOptionsIntf, // IDEIntf - IDEOptionsIntf, IDEOptEditorIntf, + IDEOptEditorIntf, + // IdeConfig + LazConf, IdeXmlConfigProcs, // IDE - LazConf, IDEProcs, LazarusIDEStrConsts, IdeXmlConfigProcs; + LazarusIDEStrConsts; type { TCodeExplorerOptions } diff --git a/ide/codehelp.pas b/ide/codehelp.pas index 2829cd6be1..b34a2ce585 100644 --- a/ide/codehelp.pas +++ b/ide/codehelp.pas @@ -56,9 +56,9 @@ uses IDECommands, IDEMsgIntf, MacroIntf, PackageIntf, LazHelpIntf, ProjectIntf, IDEDialogs, IDEHelpIntf, LazIDEIntf, IDEExternToolIntf, // IdeConfig - EnvironmentOpts, TransferMacros, + EnvironmentOpts, TransferMacros, IDEProcs, // IDE - EditorOptions, LazarusIDEStrConsts, IDEProcs, PackageDefs, PackageSystem, + EditorOptions, LazarusIDEStrConsts, PackageDefs, PackageSystem, DialogProcs, KeyMapping, SearchPathProcs; const diff --git a/ide/codetoolsdefines.pas b/ide/codetoolsdefines.pas index f714437e3c..0ad94e2d80 100644 --- a/ide/codetoolsdefines.pas +++ b/ide/codetoolsdefines.pas @@ -57,10 +57,10 @@ uses // IdeIntf IdeIntfStrConsts, IDEWindowIntf, IDEImagesIntf, IDEDialogs, // IdeConfig - LazConf, TransferMacros, + LazConf, TransferMacros, IDEProcs, // IDE LazarusIDEStrConsts, CodeToolsOptions, CodeToolsDefPreview, - EditorOptions, InputFileDialog, IDEProcs, EditDefineTree, CompilerOptions; + EditorOptions, InputFileDialog, EditDefineTree, CompilerOptions; type diff --git a/ide/compiler.pp b/ide/compiler.pp index 089278b2ea..62cbe80170 100644 --- a/ide/compiler.pp +++ b/ide/compiler.pp @@ -48,9 +48,9 @@ uses // IdeIntf IDEMsgIntf, LazIDEIntf, // IdeConfig - TransferMacros, + TransferMacros, IDECmdLine, // IDE - IDECmdLine, LazarusIDEStrConsts, CompilerOptions, Project; + LazarusIDEStrConsts, CompilerOptions, Project; type TOnCmdLineCreate = procedure(var CmdLine: string; var Abort:boolean) of object; diff --git a/ide/compileroptions.pp b/ide/compileroptions.pp index ca8b210274..6975ea04c5 100644 --- a/ide/compileroptions.pp +++ b/ide/compileroptions.pp @@ -55,8 +55,9 @@ uses SrcEditorIntf, // IdeConfig LazConf, EnvironmentOpts, SearchPathProcs, IdeXmlConfigProcs, TransferMacros, + IDEProcs, ModeMatrixOpts, CompOptsModes, // IDE - LazarusIDEStrConsts, IDEProcs, etFPCMsgParser, ModeMatrixOpts, CompOptsModes; + LazarusIDEStrConsts, etFPCMsgParser; const DefaultCompilerPath = '$(CompPath)'; diff --git a/ide/editdefinetree.pas b/ide/editdefinetree.pas index 751bfdc261..2d31c633c3 100644 --- a/ide/editdefinetree.pas +++ b/ide/editdefinetree.pas @@ -40,10 +40,10 @@ uses FileUtil, LazTracer, // CodeTools FileProcs, CodeToolManager, DefineTemplates, LinkScanner, - // IdeIntf + // BuildIntf CompOptsIntf, // IDE - IDEProcs, CompilerOptions, LazarusIDEStrConsts; + CompilerOptions, LazarusIDEStrConsts; // global @@ -213,7 +213,7 @@ var begin Count:=0; for i:=1 to length(s)-1 do begin - if ((i=1) or (s[i-1]<>FileProcs.SpecialChar)) + if ((i=1) or (s[i-1]<>SpecialChar)) and (s[i]='$') and (s[i+1] in ['(','{']) then inc(Count); end; @@ -227,7 +227,7 @@ begin while (i<=length(s)) do begin if (iFileProcs.SpecialChar)) + and ((i=1) or (s[i-1]<>SpecialChar)) then begin Result[j]:=s[i]; Result[j+1]:='('; diff --git a/ide/etfpcmsgparser.pas b/ide/etfpcmsgparser.pas index c45b4a3686..f18875837b 100644 --- a/ide/etfpcmsgparser.pas +++ b/ide/etfpcmsgparser.pas @@ -45,9 +45,9 @@ uses // IDEIntf LazIDEIntf, IDEUtils, // IdeConfig - EnvironmentOpts, LazConf, TransferMacros, + EnvironmentOpts, LazConf, TransferMacros, IDECmdLine, // IDE - IDECmdLine, LazarusIDEStrConsts, etMakeMsgParser, EnvGuiOptions; + LazarusIDEStrConsts, etMakeMsgParser, EnvGuiOptions; const FPCMsgIDCompiling = 3104; diff --git a/ide/exttools.pas b/ide/exttools.pas index 66092065bb..775007ef38 100644 --- a/ide/exttools.pas +++ b/ide/exttools.pas @@ -44,7 +44,7 @@ uses // IdeConfig TransferMacros, // IDE - IDECmdLine, LazarusIDEStrConsts; + LazarusIDEStrConsts; type TLMVToolState = ( diff --git a/ide/findinfilesdlg.pas b/ide/findinfilesdlg.pas index 1da332a1d8..abf4224bf6 100644 --- a/ide/findinfilesdlg.pas +++ b/ide/findinfilesdlg.pas @@ -27,9 +27,11 @@ uses // IdeIntf MacroIntf, IDEWindowIntf, SrcEditorIntf, IDEHelpIntf, IDEDialogs, IdeIntfStrConsts, ProjectGroupIntf, InputHistory, + // IdeConfig + EnvironmentOpts, SearchPathProcs, // IDE LazarusIDEStrConsts, InputhistoryWithSearchOpt, EditorOptions, Project, - IDEProcs, SearchFrm, SearchResultView, EnvironmentOpts, SearchPathProcs; + SearchFrm, SearchResultView; type { TLazFindInFilesDialog } diff --git a/ide/findoverloadsdlg.pas b/ide/findoverloadsdlg.pas index 8c6dc028f3..b36737cfc8 100644 --- a/ide/findoverloadsdlg.pas +++ b/ide/findoverloadsdlg.pas @@ -37,16 +37,20 @@ unit FindOverloadsDlg; interface uses - Classes, SysUtils, AVL_Tree, + Classes, SysUtils, AVL_Tree, System.UITypes, // LCL - Forms, Controls, StdCtrls, ButtonPanel, ComCtrls, + Forms, StdCtrls, ButtonPanel, ComCtrls, // LazUtils LazFileUtils, LazLoggerBase, // codetools FindDeclarationTool, PascalParserTool, CodeTree, CodeCache, CodeToolManager, FindOverloads, - // IDE - LazIDEIntf, ProjectIntf, SrcEditorIntf, IDEProcs; + // BuildIntf + ProjectIntf, + // IdeIntf + SrcEditorIntf, LazIDEIntf, + // IdeConfig + IDEProcs; type diff --git a/ide/findrenameidentifier.pas b/ide/findrenameidentifier.pas index c25d8be7dd..605426c70c 100644 --- a/ide/findrenameidentifier.pas +++ b/ide/findrenameidentifier.pas @@ -42,10 +42,9 @@ uses IdeIntfStrConsts, LazIDEIntf, IDEWindowIntf, SrcEditorIntf, PackageIntf, IDEDialogs, InputHistory, // LazConfig - TransferMacros, + TransferMacros, IDEProcs, // IDE - LazarusIDEStrConsts, IDEProcs, MiscOptions, DialogProcs, - SearchResultView, CodeHelp; + LazarusIDEStrConsts, MiscOptions, DialogProcs, SearchResultView, CodeHelp; type diff --git a/ide/findunitdlg.pas b/ide/findunitdlg.pas index 390ab5c679..00170d0196 100644 --- a/ide/findunitdlg.pas +++ b/ide/findunitdlg.pas @@ -44,7 +44,7 @@ uses // IDEIntf IdeIntfStrConsts, LazIDEIntf, IDEMsgIntf, PackageLinkIntf, PackageIntf, IDEExternToolIntf, // IDE - DialogProcs, PackageDefs, Project, IDEProcs, LazarusIDEStrConsts, + DialogProcs, PackageDefs, Project, LazarusIDEStrConsts, etFPCMsgParser, SearchPathProcs, PackageLinks, PackageSystem, BasePkgManager; type diff --git a/ide/fpmake.pp b/ide/fpmake.pp index 20ff6fc74b..b896ec6c05 100644 --- a/ide/fpmake.pp +++ b/ide/fpmake.pp @@ -235,7 +235,6 @@ begin P.Sources.AddSrc('compiler.pp'); P.Sources.AddSrc('componentlist.pas'); P.Sources.AddSrc('componentpalette.pas'); - P.Sources.AddSrc('compoptsmodes.pas'); P.Sources.AddSrc('customformeditor.pp'); P.Sources.AddSrc('debugmanager.pas'); P.Sources.AddSrc('dialogprocs.pas'); @@ -317,13 +316,11 @@ begin P.Sources.AddSrc('gotofrm.pas'); P.Sources.AddSrc('helpfpcmessages.pas'); P.Sources.AddSrc('helpoptions.pas'); - P.Sources.AddSrc('idecmdline.pas'); P.Sources.AddSrc('idecontexthelpedit.pas'); P.Sources.AddSrc('idedefs.pas'); P.Sources.AddSrc('idefpcinfo.pas'); P.Sources.AddSrc('ideoptiondefs.pas'); P.Sources.AddSrc('ideoptionsdlg.pas'); - P.Sources.AddSrc('ideprocs.pp'); P.Sources.AddSrc('ideprotocol.pas'); P.Sources.AddSrc('idetranslations.pas'); P.Sources.AddSrc('idewindowhelp.pas'); diff --git a/ide/frames/compiler_path_options.pas b/ide/frames/compiler_path_options.pas index 3d1fb9f1b6..9edd8e086d 100644 --- a/ide/frames/compiler_path_options.pas +++ b/ide/frames/compiler_path_options.pas @@ -12,9 +12,11 @@ uses LazFileUtils, LazFileCache, LazLoggerBase, // IdeIntf IDEOptionsIntf, IDEOptEditorIntf, MacroIntf, CompOptsIntf, IDEImagesIntf, IDEDialogs, + // IdeConfig + SearchPathProcs, // IDE - Project, CompilerOptions, LazarusIDEStrConsts, PathEditorDlg, IDEProcs, - CheckCompilerOpts, ShowCompilerOpts, ImExportCompilerOpts, SearchPathProcs; + Project, CompilerOptions, LazarusIDEStrConsts, PathEditorDlg, + CheckCompilerOpts, ShowCompilerOpts, ImExportCompilerOpts; type diff --git a/ide/frames/editor_color_options.pas b/ide/frames/editor_color_options.pas index cd65d178e9..2e13b63043 100644 --- a/ide/frames/editor_color_options.pas +++ b/ide/frames/editor_color_options.pas @@ -38,9 +38,10 @@ uses SynColorAttribEditor, // IdeIntf IDEOptionsIntf, IDEOptEditorIntf, IDEImagesIntf, IDEUtils, + // IdeConfig + IDEProcs, LazConf, // IDE - EditorOptions, editor_general_options, LazarusIDEStrConsts, IDEProcs, LazConf, - SourceMarks; + EditorOptions, editor_general_options, LazarusIDEStrConsts, SourceMarks; type diff --git a/ide/frames/editor_general_misc_options.pas b/ide/frames/editor_general_misc_options.pas index 0dab6c92df..f1c02aa5bc 100644 --- a/ide/frames/editor_general_misc_options.pas +++ b/ide/frames/editor_general_misc_options.pas @@ -182,7 +182,12 @@ begin EditorTrimSpaceTypeComboBox.ItemIndex := ord(TrimSpaceType); end; end; - +{ +function CheckGroupItemChecked(CheckGroup: TCheckGroup; const Caption: string): Boolean; +begin + Result := CheckGroup.Checked[CheckGroup.Items.IndexOf(Caption)]; +end; +} procedure TEditorGeneralMiscOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions); procedure UpdateOptionFromBool(AValue: Boolean; AnOption: TSynEditorOption); overload; diff --git a/ide/generatefppkgconfigurationdlg.pas b/ide/generatefppkgconfigurationdlg.pas index 2eeafba36c..e5427b2fb9 100644 --- a/ide/generatefppkgconfigurationdlg.pas +++ b/ide/generatefppkgconfigurationdlg.pas @@ -47,12 +47,11 @@ uses ExtCtrls, // Codetools CodeToolManager, DefineTemplates, + // IdeConfig + IDEProcs, LazConf, EnvironmentOpts, // IDE - IDEProcs, - LazConf, LazarusIDEStrConsts, InitialSetupProc, - EnvironmentOpts, // Packager FppkgHelper, // Ideintf diff --git a/ide/ideinfoneedbuild.pas b/ide/ideinfoneedbuild.pas index 7b1dad25ae..98f1dcd88f 100644 --- a/ide/ideinfoneedbuild.pas +++ b/ide/ideinfoneedbuild.pas @@ -35,11 +35,14 @@ uses Forms, Controls, StdCtrls, ButtonPanel, LCLType, // LazUtils LazUtilities, LazUTF8, + // BuildIntf + ProjectIntf, PackageIntf, // IdeIntf - IDEWindowIntf, LazIDEIntf, ProjectIntf, PackageIntf, InputHistory, + IDEWindowIntf, LazIDEIntf, InputHistory, + // IdeConfig + EnvironmentOpts, IDEProcs, // IDE - LazarusIDEStrConsts, PackageDefs, PackageSystem, Project, - EnvironmentOpts, IDEProcs, BuildManager; + LazarusIDEStrConsts, PackageDefs, PackageSystem, Project, BuildManager; type TINeedBuild = ( diff --git a/ide/ideinstances.pas b/ide/ideinstances.pas index 6cc249a61f..3800867d4b 100644 --- a/ide/ideinstances.pas +++ b/ide/ideinstances.pas @@ -41,8 +41,10 @@ uses Controls, Dialogs, ExtCtrls, LCLIntf, LCLType, LazFileUtils, FileUtil, Laz2_XMLRead, Laz2_XMLWrite, Laz2_DOM, LazUTF8, UTF8Process, LazLoggerBase, - EnvironmentOpts, IDEOptionsIntf, IDEOptEditorIntf, - LazarusIDEStrConsts, IDECmdLine, LazConf; + IDEOptionsIntf, + IDEOptEditorIntf, + EnvironmentOpts, IDECmdLine, LazConf, + LazarusIDEStrConsts; type TStartNewInstanceResult = (ofrStartNewInstance, ofrDoNotStart, ofrModalError, diff --git a/ide/imexportcompileropts.pas b/ide/imexportcompileropts.pas index ea474dd885..0954b25a5a 100644 --- a/ide/imexportcompileropts.pas +++ b/ide/imexportcompileropts.pas @@ -40,7 +40,9 @@ uses // IdeIntf IDEOptEditorIntf, IDEImagesIntf, InputHistory, // IdeConfig - IDEProcs, LazarusIDEStrConsts, Project, CompilerOptions, RecentListProcs; + RecentListProcs, + // IDE + LazarusIDEStrConsts, Project, CompilerOptions; type { TImExportCompOptsDlg } diff --git a/ide/initialsetupdlgs.pas b/ide/initialsetupdlgs.pas index 1a0ff6e2a5..6685ab0f9b 100644 --- a/ide/initialsetupdlgs.pas +++ b/ide/initialsetupdlgs.pas @@ -55,11 +55,10 @@ uses // LazDebuggerGdbmi GDBMIDebugger, // IdeConfig - LazConf, EnvironmentOpts, TransferMacros, + LazConf, EnvironmentOpts, TransferMacros, IDEProcs, // IDE LazarusIDEStrConsts, AboutFrm, IDETranslations, BaseBuildManager, InitialSetupProc, - GenerateFppkgConfigurationDlg, IDEProcs, InitialSetupDlgDebuggerFrame, - IdeDebuggerOpts; + GenerateFppkgConfigurationDlg, InitialSetupDlgDebuggerFrame, IdeDebuggerOpts; type TInitialSetupDialog = class; diff --git a/ide/lazarus.lpi b/ide/lazarus.lpi index e7211c130f..f2c81341fb 100644 --- a/ide/lazarus.lpi +++ b/ide/lazarus.lpi @@ -376,7 +376,9 @@ + + @@ -500,7 +502,9 @@ + + @@ -548,6 +552,7 @@ + @@ -565,14 +570,11 @@ + + - - - - - @@ -604,6 +606,7 @@ + @@ -687,6 +690,7 @@ + @@ -747,15 +751,12 @@ - - - - - + + @@ -809,14 +810,11 @@ + + - - - - - @@ -887,6 +885,7 @@ + @@ -915,7 +914,9 @@ + + @@ -1017,7 +1018,9 @@ + + @@ -1028,7 +1031,10 @@ + + + @@ -1070,11 +1076,15 @@ + + + + @@ -1091,6 +1101,7 @@ + @@ -1141,10 +1152,6 @@ - - - - @@ -1166,7 +1173,9 @@ + + @@ -1243,7 +1252,10 @@ + + + @@ -1279,6 +1291,7 @@ + @@ -1340,7 +1353,9 @@ + + @@ -1384,7 +1399,10 @@ + + + diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas index 03c319b8af..e08c3db9db 100644 --- a/ide/lazarusidestrconsts.pas +++ b/ide/lazarusidestrconsts.pas @@ -928,8 +928,6 @@ resourcestring lisNoResourceStringSectionFound = 'No ResourceString Section found'; lisUnableToFindAResourceStringSectionInThisOrAnyOfThe = 'Unable to find a ' +'ResourceString section in this or any of the used units.'; - lisComponentNameIsNotAValidIdentifier = 'Component name "%s" is not a valid identifier'; - lisComponentNameIsAPascalKeyword = 'Component name "%s" is a Pascal keyword.'; lisOwnerIsAlreadyUsedByTReaderTWriterPleaseChooseAnot = '''Owner'' is ' +'already used by TReader/TWriter. Please choose another name.'; lisDuplicateNameAComponentNamedAlreadyExistsInTheInhe = 'Duplicate name: A ' diff --git a/ide/lazarusmanager.pas b/ide/lazarusmanager.pas index 4b448f2ad7..100e9f3320 100644 --- a/ide/lazarusmanager.pas +++ b/ide/lazarusmanager.pas @@ -98,10 +98,12 @@ uses UTF8Process, FileUtil, LazFileUtils, LazUtilities, LazUTF8, // CodeTools FileProcs, - // IdeIntf + // BuildIntf BaseIDEIntf, + // IdeConfig + LazConf, IDECmdLine, // IDE - IDECmdLine, LazConf, Splash, IDEInstances; + Splash, IDEInstances; type diff --git a/ide/lazbuild.lpr b/ide/lazbuild.lpr index 3ad230e82b..4d47b9335a 100644 --- a/ide/lazbuild.lpr +++ b/ide/lazbuild.lpr @@ -40,10 +40,12 @@ uses // BuildIntf BaseIDEIntf, MacroIntf, PackageIntf, LazMsgWorker, ProjectIntf, IDEExternToolIntf, CompOptsIntf, IDEOptionsIntf, PackageDependencyIntf, + // IdeConfig + LazConf, IDECmdLine, // IDE InitialSetupProc, ExtToolsConsole, CompilerOptions, ApplicationBundle, TransferMacros, EnvironmentOpts, IDETranslations, - LazarusIDEStrConsts, IDECmdLine, MiscOptions, Project, LazConf, PackageDefs, + LazarusIDEStrConsts, MiscOptions, Project, PackageDefs, PackageLinks, PackageSystem, InterPkgConflictFiles, BuildLazDialog, BuildProfileManager, BuildManager, BaseBuildManager, ModeMatrixOpts; diff --git a/ide/main.pp b/ide/main.pp index 5e94a2604a..c65ac404f3 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -114,7 +114,7 @@ uses // converter ChgEncodingDlg, ConvertDelphi, MissingPropertiesDlg, LazXMLForms, // IdeConfig - IdeConfig, LazConf, EnvironmentOpts, TransferMacros, + IdeConfig, LazConf, EnvironmentOpts, TransferMacros, IDECmdLine, IDEGuiCmdLine, IDEProcs, // environment option frames editor_general_options, componentpalette_options, formed_options, OI_options, MsgWnd_Options, Files_Options, Desktop_Options, window_options, IdeStartup_Options, @@ -150,7 +150,7 @@ uses Splash, IDEDefs, LazarusIDEStrConsts, SearchResultView, CodeTemplatesDlg, CodeBrowser, FindUnitDlg, InspectChksumChangedDlg, IdeOptionsDlg, EditDefineTree, KeyMapping, - IDETranslations, IDEProcs, ExtToolDialog, ExtToolEditDlg, JumpHistoryView, + IDETranslations, ExtToolDialog, ExtToolEditDlg, JumpHistoryView, DesktopManager, DiskDiffsDialog, BuildLazDialog, BuildProfileManager, BuildManager, CheckCompOptsForNewUnitDlg, MiscOptions, InputhistoryWithSearchOpt, UnitDependencies, IDEFPCInfo, IDEInfoDlg, @@ -161,7 +161,7 @@ uses FindRenameIdentifier, AbstractsMethodsDlg, EmptyMethodsDlg, UnusedUnitsDlg, UseUnitDlg, FindOverloadsDlg, EditorFileManager, CleanDirDlg, CodeContextForm, AboutFrm, CompatibilityRestrictions, RestrictionBrowser, ProjectWizardDlg, - IDECmdLine, IDEGuiCmdLine, CodeExplOpts, EditorMacroListViewer, + CodeExplOpts, EditorMacroListViewer, SourceFileManager, EditorToolbarStatic, IDEInstances, NotifyProcessEnd, WordCompletion, EnvGuiOptions, EnvDebuggerOptions, // main ide diff --git a/ide/makeresstrdlg.pas b/ide/makeresstrdlg.pas index 4de742c6d4..b4a6ba658d 100644 --- a/ide/makeresstrdlg.pas +++ b/ide/makeresstrdlg.pas @@ -48,8 +48,10 @@ uses CodeToolManager, CodeToolsStructs, CodeCache, // IdeIntf IdeIntfStrConsts, IDEWindowIntf, IDEHelpIntf, IDEDialogs, InputHistory, + // IdeConfig + RecentListProcs, // IDE - LazarusIDEStrConsts, EditorOptions, MiscOptions, IDEProcs, RecentListProcs; + LazarusIDEStrConsts, EditorOptions, MiscOptions; type diff --git a/ide/miscoptions.pas b/ide/miscoptions.pas index 1eca4570cf..677e593b7d 100644 --- a/ide/miscoptions.pas +++ b/ide/miscoptions.pas @@ -30,8 +30,19 @@ unit MiscOptions; interface uses - Classes, SysUtils, LCLProc, BuildProfileManager, CodeToolsStructs, TextTools, - LazFileUtils, Laz2_XMLCfg, LazFileCache, LazConf, IDEProcs, IdeXmlConfigProcs; + Classes, SysUtils, + // LCL + LCLProc, + // LazUtils + LazFileUtils, Laz2_XMLCfg, LazFileCache, LazLoggerBase, + // CodeTools + CodeToolsStructs, + // IdeIntf + TextTools, + // IdeConfig + LazConf, IDEProcs, IdeXmlConfigProcs, + // IDE + BuildProfileManager; type { TFindRenameIdentifierOptions } diff --git a/ide/multipastedlg.pas b/ide/multipastedlg.pas index 2c2d6dddd4..c72b3d8219 100644 --- a/ide/multipastedlg.pas +++ b/ide/multipastedlg.pas @@ -46,8 +46,10 @@ uses SynEdit, // IdeIntf IDEHelpIntf, InputHistory, + // IdeConfig + EnvironmentOpts, RecentListProcs, // IDE - IDEProcs, LazarusIDEStrConsts, EnvironmentOpts, RecentListProcs; + LazarusIDEStrConsts; const hlFormatPasteTxtBefore = 'FormatPasteTxtBefore'; diff --git a/ide/compoptsmodes.pas b/ide/packages/ideconfig/compoptsmodes.pas similarity index 98% rename from ide/compoptsmodes.pas rename to ide/packages/ideconfig/compoptsmodes.pas index 35eadd8906..cf3852ae25 100644 --- a/ide/compoptsmodes.pas +++ b/ide/packages/ideconfig/compoptsmodes.pas @@ -33,16 +33,12 @@ unit CompOptsModes; {$mode objfpc}{$H+} -{$i ide.inc} - interface uses Classes, SysUtils, - ExprEval, - LazLoggerBase, - ProjectIntf, - IDEProcs; + // LazUtils + LazLoggerBase; type diff --git a/ide/packages/ideconfig/fpmake.pp b/ide/packages/ideconfig/fpmake.pp index d05329d41f..aa77a1ee65 100644 --- a/ide/packages/ideconfig/fpmake.pp +++ b/ide/packages/ideconfig/fpmake.pp @@ -3,7 +3,7 @@ fpmake.pp for IdeConfig 1.0 - This file was generated on 11.06.2023 + This file was generated on 23.07.2023 } {$ifndef ALLPACKAGES} @@ -34,10 +34,10 @@ begin P.Flags.Add('LazarusDsgnPkg'); + D := P.Dependencies.Add('codetools'); D := P.Dependencies.Add('debuggerintf'); D := P.Dependencies.Add('buildintf'); D := P.Dependencies.Add('lazutils'); - D := P.Dependencies.Add('codetools'); D := P.Dependencies.Add('fcl'); P.Options.Add('-MObjFPC'); P.Options.Add('-Scghi'); @@ -50,37 +50,45 @@ begin P.IncludePath.Add('include/$(OS)'); P.UnitPath.Add('.'); T:=P.Targets.AddUnit('ideconfig.pas'); - t.Dependencies.AddUnit('searchpathprocs'); - t.Dependencies.AddUnit('recentlistprocs'); + t.Dependencies.AddUnit('compoptsmodes'); + t.Dependencies.AddUnit('coolbaroptions'); + t.Dependencies.AddUnit('diffpatch'); + t.Dependencies.AddUnit('editortoolbaroptions'); + t.Dependencies.AddUnit('environmentopts'); + t.Dependencies.AddUnit('idecmdline'); + t.Dependencies.AddUnit('ideconfstrconsts'); + t.Dependencies.AddUnit('ideguicmdline'); + t.Dependencies.AddUnit('ideoptiondefs'); + t.Dependencies.AddUnit('ideprocs'); t.Dependencies.AddUnit('idexmlconfigprocs'); t.Dependencies.AddUnit('lazconf'); - t.Dependencies.AddUnit('ideoptiondefs'); t.Dependencies.AddUnit('modematrixopts'); - t.Dependencies.AddUnit('editortoolbaroptions'); + t.Dependencies.AddUnit('recentlistprocs'); + t.Dependencies.AddUnit('searchpathprocs'); t.Dependencies.AddUnit('toolbaroptionsbase'); - t.Dependencies.AddUnit('coolbaroptions'); - t.Dependencies.AddUnit('environmentopts'); - t.Dependencies.AddUnit('diffpatch'); t.Dependencies.AddUnit('transfermacros'); - t.Dependencies.AddUnit('ideconfstrconsts'); - T:=P.Targets.AddUnit('searchpathprocs.pas'); - T:=P.Targets.AddUnit('recentlistprocs.pas'); + T:=P.Targets.AddUnit('compoptsmodes.pas'); + T:=P.Targets.AddUnit('coolbaroptions.pas'); + T:=P.Targets.AddUnit('diffpatch.pas'); + T:=P.Targets.AddUnit('editortoolbaroptions.pas'); + T:=P.Targets.AddUnit('environmentopts.pp'); + T:=P.Targets.AddUnit('idecmdline.pas'); + T:=P.Targets.AddUnit('ideconfstrconsts.pas'); + T:=P.Targets.AddUnit('ideguicmdline.pas'); + T:=P.Targets.AddUnit('ideoptiondefs.pas'); + T:=P.Targets.AddUnit('ideprocs.pp'); T:=P.Targets.AddUnit('idexmlconfigprocs.pas'); T:=P.Targets.AddUnit('lazconf.pp'); - T:=P.Targets.AddUnit('ideoptiondefs.pas'); T:=P.Targets.AddUnit('modematrixopts.pas'); - T:=P.Targets.AddUnit('editortoolbaroptions.pas'); + T:=P.Targets.AddUnit('recentlistprocs.pas'); + T:=P.Targets.AddUnit('searchpathprocs.pas'); T:=P.Targets.AddUnit('toolbaroptionsbase.pas'); - T:=P.Targets.AddUnit('coolbaroptions.pas'); - T:=P.Targets.AddUnit('environmentopts.pp'); - T:=P.Targets.AddUnit('diffpatch.pas'); T:=P.Targets.AddUnit('transfermacros.pp'); - T:=P.Targets.AddUnit('ideconfstrconsts.pas'); // copy the compiled file, so the IDE knows how the package was compiled - P.Sources.AddSrc('IdeConfig.compiled'); - P.InstallFiles.Add('IdeConfig.compiled',AllOSes,'$(unitinstalldir)'); + P.Sources.AddSrc('ideconfig.compiled'); + P.InstallFiles.Add('ideconfig.compiled',AllOSes,'$(unitinstalldir)'); end; end; diff --git a/ide/idecmdline.pas b/ide/packages/ideconfig/idecmdline.pas similarity index 100% rename from ide/idecmdline.pas rename to ide/packages/ideconfig/idecmdline.pas diff --git a/ide/packages/ideconfig/ideconfig.lpk b/ide/packages/ideconfig/ideconfig.lpk index 8277798256..ee8078f180 100644 --- a/ide/packages/ideconfig/ideconfig.lpk +++ b/ide/packages/ideconfig/ideconfig.lpk @@ -24,12 +24,44 @@ Files in this package are for the main configuration of the IDE."/> - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -39,45 +71,29 @@ Files in this package are for the main configuration of the IDE."/> - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - + + diff --git a/ide/packages/ideconfig/ideconfig.pas b/ide/packages/ideconfig/ideconfig.pas index f31cc84714..c631997004 100644 --- a/ide/packages/ideconfig/ideconfig.pas +++ b/ide/packages/ideconfig/ideconfig.pas @@ -8,10 +8,10 @@ unit IdeConfig; interface uses - SearchPathProcs, RecentListProcs, IdeXmlConfigProcs, LazConf, IDEOptionDefs, - ModeMatrixOpts, EditorToolBarOptions, ToolBarOptionsBase, CoolBarOptions, - EnvironmentOpts, DiffPatch, TransferMacros, IdeConfStrConsts, - LazarusPackageIntf; + CompOptsModes, CoolBarOptions, DiffPatch, EditorToolBarOptions, + EnvironmentOpts, IDECmdLine, IdeConfStrConsts, IDEGuiCmdLine, IDEOptionDefs, + IDEProcs, IdeXmlConfigProcs, LazConf, ModeMatrixOpts, RecentListProcs, + SearchPathProcs, ToolBarOptionsBase, TransferMacros, LazarusPackageIntf; implementation diff --git a/ide/packages/ideconfig/ideconfstrconsts.pas b/ide/packages/ideconfig/ideconfstrconsts.pas index 3f94794824..d3470de6de 100644 --- a/ide/packages/ideconfig/ideconfstrconsts.pas +++ b/ide/packages/ideconfig/ideconfstrconsts.pas @@ -22,6 +22,8 @@ resourcestring lisTMFunctionAppendPathDelimiter = 'Function: append path delimiter'; lisTMFunctionChompPathDelimiter = 'Function: remove trailing path delimiter'; lisTMunknownMacro = '(unknown macro: %s)'; + lisComponentNameIsNotAValidIdentifier = 'Component name "%s" is not a valid identifier'; + lisComponentNameIsAPascalKeyword = 'Component name "%s" is a Pascal keyword.'; implementation diff --git a/ide/ideguicmdline.pas b/ide/packages/ideconfig/ideguicmdline.pas similarity index 99% rename from ide/ideguicmdline.pas rename to ide/packages/ideconfig/ideguicmdline.pas index d635f97d41..4f9f30fdf4 100644 --- a/ide/ideguicmdline.pas +++ b/ide/packages/ideconfig/ideguicmdline.pas @@ -1,6 +1,6 @@ { /*************************************************************************** - idecmdline.pas + ideguicmdline.pas -------------------- A unit to manage command lines issue used inside the ide @@ -45,7 +45,7 @@ uses LazUtilities, LazFileUtils, LazStringUtils, // Codetools FileProcs, - // IDE + // IdeConfig LazConf, IDECmdLine; procedure ParseGuiCmdLineParams(var SkipAutoLoadingLastProject, diff --git a/ide/ideprocs.pp b/ide/packages/ideconfig/ideprocs.pp similarity index 98% rename from ide/ideprocs.pp rename to ide/packages/ideconfig/ideprocs.pp index 057886d9d4..c3a111fa33 100644 --- a/ide/ideprocs.pp +++ b/ide/packages/ideconfig/ideprocs.pp @@ -35,17 +35,13 @@ uses // LazUtils FileUtil, LazFileUtils, LazUtilities, LazFileCache, LazUTF8, Laz2_XMLCfg, LazLoggerBase, LazTracer, - // LCL - StdCtrls, ExtCtrls, // CodeTools BasicCodeTools, CodeToolManager, CodeToolsConfig, CodeCache, KeywordFuncLists, FileProcs, // BuildIntf PackageIntf, // IdeConfig - TransferMacros, LazConf, - // IDE - LazarusIDEStrConsts; + TransferMacros, LazConf, IdeConfStrConsts; const SBuildMethod: array[TBuildMethod] of string = ( @@ -98,7 +94,6 @@ procedure ReverseList(List: TFPList); procedure FreeListObjects(List: TList; FreeList: boolean); procedure FreeListObjects(List: TFPList; FreeList: boolean); function CompareMemStreamText(s1, s2: TMemoryStream): Boolean; -function CheckGroupItemChecked(CheckGroup: TCheckGroup; const Caption: string): Boolean; procedure CheckCompNameValidity(const AName: string); @@ -687,11 +682,6 @@ begin end; end; -function CheckGroupItemChecked(CheckGroup: TCheckGroup; const Caption: string): Boolean; -begin - Result := CheckGroup.Checked[CheckGroup.Items.IndexOf(Caption)]; -end; - procedure CheckCompNameValidity(const AName: string); // Raises an exception if not valid. begin diff --git a/ide/project.pp b/ide/project.pp index 60521de51a..fbcbc2cc71 100644 --- a/ide/project.pp +++ b/ide/project.pp @@ -65,9 +65,9 @@ uses {$IFnDEF LCLNOGUI} IdeDebuggerOpts, IdeDebuggerBackendValueConv, Debugger,{$EndIf} // IdeConfig EnvironmentOpts, LazConf, TransferMacros, SearchPathProcs, IdeXmlConfigProcs, + IDECmdLine, IDEProcs, CompOptsModes, ModeMatrixOpts, // IDE - CompOptsModes, ProjectResources, ProjectIcon, - IDECmdLine, IDEProcs, CompilerOptions, RunParamsOpts, ModeMatrixOpts, + ProjectResources, ProjectIcon, CompilerOptions, RunParamsOpts, ProjectDefs, EditDefineTree, LazarusIDEStrConsts, ProjPackCommon, PackageDefs, PackageSystem; diff --git a/ide/projectinspector.pas b/ide/projectinspector.pas index 9ca69f79cb..9973daf132 100644 --- a/ide/projectinspector.pas +++ b/ide/projectinspector.pas @@ -71,9 +71,9 @@ uses IDEHelpIntf, IDECommands, IDEDialogs, IDEImagesIntf, LazIDEIntf, ToolBarIntf, IdeIntfStrConsts, MenuIntf, InputHistory, // IdeConfig - EnvironmentOpts, IDEOptionDefs, TransferMacros, + EnvironmentOpts, IDEOptionDefs, TransferMacros, IDEProcs, // IDE - LazarusIDEStrConsts, MainBase, MainBar, IDEProcs, DialogProcs, Project, + LazarusIDEStrConsts, MainBase, MainBar, DialogProcs, Project, BuildManager, AddToProjectDlg, EnvGuiOptions, BasePkgManager, ProjPackChecks, ProjPackEditing, ProjPackFilePropGui, PackageDefs, AddPkgDependencyDlg, AddFPMakeDependencyDlg; diff --git a/ide/searchfrm.pas b/ide/searchfrm.pas index 2cf510ff16..ba39252737 100644 --- a/ide/searchfrm.pas +++ b/ide/searchfrm.pas @@ -42,8 +42,10 @@ uses // IDEIntf IdeIntfStrConsts, IDEWindowIntf, LazIDEIntf, SrcEditorIntf, IDEDialogs, ProjectGroupIntf, InputHistory, - // ide - LazarusIDEStrConsts, IDEProcs, SearchResultView, Project, SearchPathProcs; + // IdeConfig + SearchPathProcs, + // IDE + LazarusIDEStrConsts, SearchResultView, Project; type diff --git a/ide/sourceeditor.pp b/ide/sourceeditor.pp index 27882b7252..c2e11744f2 100644 --- a/ide/sourceeditor.pp +++ b/ide/sourceeditor.pp @@ -69,15 +69,14 @@ uses IDEWindowIntf, ProjectIntf, MacroDefIntf, ToolBarIntf, IDEDialogs, IDECommands, EditorSyntaxHighlighterDef, IdeIntfStrConsts, // DebuggerIntf - DbgIntfDebuggerBase, LazDebuggerIntf, LazDebuggerIntfBaseTypes, + DbgIntfDebuggerBase, LazDebuggerIntfBaseTypes, // IdeDebugger BaseDebugManager, Debugger, IdeDebuggerStringConstants, // IdeConfig - EnvironmentOpts, IDEOptionDefs, TransferMacros, + EnvironmentOpts, IDEOptionDefs, TransferMacros, IDECmdLine, IDEProcs, // IDE units - IDECmdLine, LazarusIDEStrConsts, EditorOptions, EnvGuiOptions, - WordCompletion, FindReplaceDialog, IDEProcs, - IDEHelpManager, MacroPromptDlg, CodeContextForm, + LazarusIDEStrConsts, EditorOptions, EnvGuiOptions, + WordCompletion, FindReplaceDialog, IDEHelpManager, MacroPromptDlg, CodeContextForm, SrcEditHintFrm, etMessagesWnd, etSrcEditMarks, CodeMacroPrompt, CodeTemplatesDlg, CodeToolsOptions, editor_general_options, SortSelectionDlg, EncloseSelectionDlg, EncloseIfDef, InvertAssignTool, SourceEditProcs, diff --git a/ide/sourcefilemanager.pas b/ide/sourcefilemanager.pas index a43cfd9d0f..70c9645792 100644 --- a/ide/sourcefilemanager.pas +++ b/ide/sourcefilemanager.pas @@ -52,9 +52,9 @@ uses IdeIntfStrConsts, ObjectInspector, SrcEditorIntf, EditorSyntaxHighlighterDef, UnitResources, ComponentReg, InputHistory, // IdeConfig - EnvironmentOpts, SearchPathProcs, TransferMacros, RecentListProcs, + EnvironmentOpts, SearchPathProcs, TransferMacros, RecentListProcs, IDEProcs, // IDE - IDEProcs, DialogProcs, IDEProtocol, LazarusIDEStrConsts, NewDialog, + DialogProcs, IDEProtocol, LazarusIDEStrConsts, NewDialog, NewProjectDlg, MainBase, MainBar, MainIntf, Project, ProjectDefs, ProjectInspector, CompilerOptions, SourceSynEditor, SourceEditor, EditorOptions, CustomFormEditor, ControlSelection, diff --git a/ide/viewunit_dlg.pp b/ide/viewunit_dlg.pp index b167b82bd0..9bfd53b436 100644 --- a/ide/viewunit_dlg.pp +++ b/ide/viewunit_dlg.pp @@ -52,8 +52,10 @@ uses ListFilterEdit, // IdeIntf IdeIntfStrConsts, IDEWindowIntf, IDEHelpIntf, IDEImagesIntf, TextTools, + // IdeConfig + SearchPathProcs, // IDE - LazarusIdeStrConsts, IDEProcs, CustomFormEditor, SearchPathProcs, PackageDefs; + LazarusIdeStrConsts, CustomFormEditor, PackageDefs; type TIDEProjectItem = ( diff --git a/packager/fppkghelper.pas b/packager/fppkghelper.pas index 3dea2c476a..b438f614e4 100644 --- a/packager/fppkghelper.pas +++ b/packager/fppkghelper.pas @@ -5,14 +5,11 @@ unit FppkgHelper; interface uses - Classes, - SysUtils, - pkgFppkg, - fpmkunit, - fprepos, - LazarusIDEStrConsts, + Classes, SysUtils, pkgFppkg, fpmkunit, fprepos, // LazUtils - LazLogger, LazFileCache, FileUtil, LazFileUtils; + LazLogger, LazFileCache, FileUtil, LazFileUtils, + // IDE + LazarusIDEStrConsts; type diff --git a/packager/frames/package_integration_options.pas b/packager/frames/package_integration_options.pas index ca1b55f109..63696d901d 100644 --- a/packager/frames/package_integration_options.pas +++ b/packager/frames/package_integration_options.pas @@ -12,9 +12,10 @@ uses LazFileUtils, // IdeIntf IDEOptionsIntf, IDEOptEditorIntf, MacroIntf, PackageIntf, + // IdeConfig + IDEProcs, // IDE - PackageDefs, LazarusIDEStrConsts, PathEditorDlg, IDEProcs, CodeHelp, - SearchPathProcs; + PackageDefs, LazarusIDEStrConsts, PathEditorDlg, CodeHelp, SearchPathProcs; type diff --git a/packager/frames/package_usage_options.pas b/packager/frames/package_usage_options.pas index 85647459b9..d2faa10b11 100644 --- a/packager/frames/package_usage_options.pas +++ b/packager/frames/package_usage_options.pas @@ -12,8 +12,10 @@ uses Forms, Controls, StdCtrls, Dialogs, // IdeIntf IDEOptionsIntf, IDEOptEditorIntf, MacroIntf, + // IdeConfic + IDEProcs, // IDE - PathEditorDlg, LazarusIDEStrConsts, IDEProcs, SearchPathProcs, PackageDefs; + PathEditorDlg, LazarusIDEStrConsts, SearchPathProcs, PackageDefs; type diff --git a/packager/interpkgconflictfiles.pas b/packager/interpkgconflictfiles.pas index 7ab7718e3f..644b3f8169 100644 --- a/packager/interpkgconflictfiles.pas +++ b/packager/interpkgconflictfiles.pas @@ -64,10 +64,9 @@ uses // IDEIntf ProjectIntf, CompOptsIntf, IDEWindowIntf, LazIDEIntf, IDEMsgIntf, IDEExternToolIntf, // IdeConfig - EnvironmentOpts, TransferMacros, + EnvironmentOpts, TransferMacros, IDEProcs, SearchPathProcs, // IDE - CompilerOptions, IDEProcs, DialogProcs, LazarusIDEStrConsts, - SearchPathProcs, PackageDefs, PackageSystem; + CompilerOptions, DialogProcs, LazarusIDEStrConsts, PackageDefs, PackageSystem; type TPGInterPkgOwnerInfo = class diff --git a/packager/packagedefs.pas b/packager/packagedefs.pas index 495be559eb..6c74ae2fab 100644 --- a/packager/packagedefs.pas +++ b/packager/packagedefs.pas @@ -54,10 +54,9 @@ uses // IDEIntf LazIDEIntf, IDEOptEditorIntf, IDEDialogs, ComponentReg, IDEImagesIntf, // IdeConfig - TransferMacros, + TransferMacros, IDEProcs, IDEOptionDefs, CompOptsModes, SearchPathProcs, IdeXmlConfigProcs, // IDE - EditDefineTree, CompilerOptions, CompOptsModes, IDEOptionDefs, ProjPackCommon, - LazarusIDEStrConsts, IDEProcs, SearchPathProcs, IdeXmlConfigProcs, FppkgHelper; + EditDefineTree, CompilerOptions, ProjPackCommon, LazarusIDEStrConsts, FppkgHelper; type TLazPackage = class; diff --git a/packager/packagelinks.pas b/packager/packagelinks.pas index b0933ef0b5..30cc91eabd 100644 --- a/packager/packagelinks.pas +++ b/packager/packagelinks.pas @@ -49,8 +49,10 @@ uses FileProcs, CodeToolManager, // BuildIntf PackageDependencyIntf, PackageLinkIntf, PackageIntf, MacroIntf, + // IdeConfig + EnvironmentOpts, LazConf, IDEProcs, // IDE - IDEProcs, EnvironmentOpts, LazConf, IDECmdLine, PackageDefs; + PackageDefs; const PkgLinksFileVersion = 3; diff --git a/packager/packagesystem.pas b/packager/packagesystem.pas index 577ad7253d..b4863a0ca1 100644 --- a/packager/packagesystem.pas +++ b/packager/packagesystem.pas @@ -62,9 +62,9 @@ uses // Package registration LazarusPackageIntf, // IdeConfig - EnvironmentOpts, LazConf, TransferMacros, + EnvironmentOpts, LazConf, TransferMacros, IDEProcs, // IDE - LazarusIDEStrConsts, IDECmdLine, IDEProcs, DialogProcs, IDETranslations, + LazarusIDEStrConsts, DialogProcs, IDETranslations, CompilerOptions, SearchPathProcs, PackageLinks, PackageDefs, ComponentReg, FppkgHelper, PkgSysBasePkgs; diff --git a/packager/pkgmanager.pas b/packager/pkgmanager.pas index 4656756491..3dd2fa3b3c 100644 --- a/packager/pkgmanager.pas +++ b/packager/pkgmanager.pas @@ -65,11 +65,11 @@ uses UnitResources, InputHistory, // IdeConfig EnvironmentOpts, IDEOptionDefs, ModeMatrixOpts, RecentListProcs, - SearchPathProcs, TransferMacros, + SearchPathProcs, TransferMacros, IDECmdLine, IDEProcs, // FCL registration LazarusPackageIntf, // IDE - IDECmdLine, LazarusIDEStrConsts, IDEProcs, DialogProcs, MiscOptions, + LazarusIDEStrConsts, DialogProcs, MiscOptions, Project, ProjPackEditing, AddToPackageDlg, PackageDefs, PackageLinks, PackageSystem, OpenInstalledPkgDlg, PkgGraphExplorer, BrokenDependenciesDlg, CompilerOptions, IDETranslations, BuildLazDialog, NewDialog, FindInFilesDlg,