Move SkipCheckByKey functions from IdeUtils (IdeIntf) to LazUtilities (LazUtils). No LCL dependency. Add comments in uses section.

components/ideintf/ideutils.pas

@@ -27,8 +27,6 @@ type
     cstFilename
     );
 
-TGetSkipCheckByKey = function(AKey: String): Boolean;
-
 function IndexInStringList(List: TStrings; Cmp: TCmpStrType; s: string): integer;
 procedure SetComboBoxText(AComboBox: TComboBox; const AText: String;
                           Cmp: TCmpStrType; MaxCount: integer = 1000);
@@ -46,15 +44,9 @@ function GetValidDirectory(const aFileDirStr: string;
 function GetValidDirectoryAndFilename(const aFileDirStr: string;
                                       out aoFileName : string): string;
 
-function GetSkipCheckByKey(AKey: String): Boolean;
-procedure SetSkipCheckByKeyProc(AProc: TGetSkipCheckByKey);
-
 
 implementation
 
-var
-  FGetSkipCheckByKeyProc: TGetSkipCheckByKey;
-
 function IndexInStringList(List: TStrings; Cmp: TCmpStrType; s: string): integer;
 var
   i: Integer;
@@ -179,17 +171,5 @@ begin
     aoFileName := lSWPD;
 end;
 
-function GetSkipCheckByKey(AKey: String): Boolean;
-begin
-  Result := FGetSkipCheckByKeyProc <> nil;
-  if Result then
-    Result := FGetSkipCheckByKeyProc(AKey);
-end;
-
-procedure SetSkipCheckByKeyProc(AProc: TGetSkipCheckByKey);
-begin
-  FGetSkipCheckByKeyProc := AProc;
-end;
-
 end.
 

components/lazutils/lazutilities.pas

@@ -15,6 +15,12 @@ interface
 uses
   Classes, SysUtils, TypInfo;
 
+type
+  TGetSkipCheckByKey = function(AKey: String): Boolean;
+
+function GetSkipCheckByKey(AKey: String): Boolean;
+procedure SetSkipCheckByKeyProc(AProc: TGetSkipCheckByKey);
+
 procedure FreeThenNil(var obj);
 function ComparePointers(p1, p2: Pointer): integer; inline;
 function CompareBoolean(b1, b2: boolean): integer;
@@ -39,6 +45,21 @@ var
 
 implementation
 
+var
+  FGetSkipCheckByKeyProc: TGetSkipCheckByKey;
+
+function GetSkipCheckByKey(AKey: String): Boolean;
+begin
+  Result := FGetSkipCheckByKeyProc <> nil;
+  if Result then
+    Result := FGetSkipCheckByKeyProc(AKey);
+end;
+
+procedure SetSkipCheckByKeyProc(AProc: TGetSkipCheckByKey);
+begin
+  FGetSkipCheckByKeyProc := AProc;
+end;
+
 procedure FreeThenNil(var obj);
 begin
   if Pointer(obj) <> nil then

components/macroscript/registerems.pas

@@ -8,8 +8,10 @@ uses
   Classes, SysUtils,
   // LCL
   Dialogs,
+  // LazUtils
+  LazUtilities,
   // IdeIntf
-  SrcEditorIntf, IDEOptionsIntf, IDEOptEditorIntf, IDEUtils,
+  SrcEditorIntf, IDEOptionsIntf, IDEOptEditorIntf,
   // MacroScript
   EMScriptMacro, EMSSelfTest, EMSIdeOptions, EMSStrings;
 

ide/encloseifdef.pas

@@ -52,9 +52,17 @@ interface
 *)
 
 uses
-  Classes, SysUtils, Controls, Forms, StdCtrls, Buttons, ButtonPanel,
+  Classes, SysUtils,
-  LCLProc, LCLType, LazConf, LazFileUtils, Laz2_XMLCfg, LazFileCache,
+  // LCL
-  IDEHelpIntf, IDEImagesIntf, IdeIntfStrConsts, LazarusIDEStrConsts, EnvironmentOpts;
+  Controls, Forms, StdCtrls, Buttons, ButtonPanel, LCLType,
+  // LazUtils
+  LazFileUtils, Laz2_XMLCfg, LazFileCache, LazLoggerBase,
+  // IdeIntf
+  IDEHelpIntf, IDEImagesIntf, IdeIntfStrConsts,
+  // IdeConfig
+  LazConf, EnvironmentOpts,
+  // IDE
+  LazarusIDEStrConsts;
 
 type
 

ide/etfpcmsgparser.pas

@@ -33,18 +33,21 @@ interface
 
 uses
   // RTL
-  Classes, SysUtils, strutils, math,
+  Classes, SysUtils, StrUtils, Math,
   // CodeTools
   KeywordFuncLists, CodeToolsFPCMsgs, CodeCache, FileProcs, CodeToolManager,
   DirectoryCacher, BasicCodeTools, DefineTemplates, SourceLog, LinkScanner,
   // LazUtils
-  LConvEncoding, LazUTF8, FileUtil, LazFileUtils, LazFileCache, LazUtilities,
+  LConvEncoding, LazUTF8, FileUtil, LazFileUtils, LazFileCache,
-  AvgLvlTree,
+  LazUtilities, AvgLvlTree,
+  // BuildIntf
+  IDEExternToolIntf, PackageIntf, ProjectIntf, MacroIntf,
   // IDEIntf
-  IDEExternToolIntf, PackageIntf, LazIDEIntf, ProjectIntf, MacroIntf, IDEUtils,
+  LazIDEIntf, IDEUtils,
+  // IdeConfig
+  EnvironmentOpts, LazConf,
   // IDE
-  IDECmdLine, LazarusIDEStrConsts, EnvironmentOpts, LazConf, TransferMacros,
+  IDECmdLine, LazarusIDEStrConsts, TransferMacros, etMakeMsgParser;
-  etMakeMsgParser;
 
 const
   FPCMsgIDCompiling = 3104;

ide/frames/compiler_messages_options.pas

@@ -14,9 +14,10 @@ uses
   ListFilterEdit,
   // CodeTools
   CodeToolsFPCMsgs,
+  // BuildIntf
+  IDEOptionsIntf, IDEExternToolIntf, CompOptsIntf,
   // IdeIntf
-  IDEOptionsIntf, IDEOptEditorIntf, IDEExternToolIntf, CompOptsIntf, IDEImagesIntf,
+  IDEOptEditorIntf, IDEDialogs,
-  IDEDialogs,
   // IDE
   CompilerOptions, LazarusIDEStrConsts, etFPCMsgParser;
 

ide/idecmdline.pas

@@ -40,8 +40,8 @@ interface
 uses 
   Classes, SysUtils,
   // LazUtils
-  FileUtil, LazFileUtils, LazStringUtils, LazUTF8, LazLogger, IDEUtils,
+  FileUtil, LazFileUtils, LazStringUtils, LazUtilities, LazUTF8, LazLogger,
-  // IDE
+  // IdeConfig
   LazConf;
 
 // Checks at startup that can be skipped

ide/idetransfermacros.pas

@@ -5,8 +5,13 @@ unit IdeTransferMacros;
 interface
 
 uses
-  Classes, SysUtils, IDETranslations, EnvironmentOpts, TransferMacros,
+  Classes, SysUtils,
-  LazarusIDEStrConsts, LazConf, MacroDefIntf;
+  // BuildIntf
+  MacroDefIntf,
+  // IdeConfig
+  EnvironmentOpts, LazConf,
+  // IDE
+  LazarusIDEStrConsts, TransferMacros, IDETranslations;
 
 type