From 68e341be20bd7f2431105ec6c2639e1526afd17c Mon Sep 17 00:00:00 2001
From: Juha <juha@lazarus-ide.org>
Date: Sat, 6 Apr 2024 13:05:13 +0300
Subject: [PATCH] Remove IdeIntf dependency from CompilerOptions.

---
 components/buildintf/compoptsintf.pas |  2 +-
 ide/compileroptions.pp                | 12 +++++++-----
 ide/projecticon.pas                   |  2 +-
 ide/projectuserresources.pas          |  6 ++++--
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/components/buildintf/compoptsintf.pas b/components/buildintf/compoptsintf.pas
index 9638a7131e..73e688c40e 100644
--- a/components/buildintf/compoptsintf.pas
+++ b/components/buildintf/compoptsintf.pas
@@ -540,7 +540,7 @@ procedure TLazCompilationToolOptions.SetParsers(const AValue: TStrings);
 begin
   if FParsers.Equals(AValue) then Exit;
   {$IFDEF VerboseIDEModified}
-  debugln(['TCompilationToolOptions.SetParsers ',AValue.Text]);
+  debugln(['TLazCompilationToolOptions.SetParsers ',AValue.Text]);
   {$ENDIF}
   FParsers.Assign(AValue);
   Owner.IncreaseChangeStamp;
diff --git a/ide/compileroptions.pp b/ide/compileroptions.pp
index dcc4811dbf..cdf34fb3af 100644
--- a/ide/compileroptions.pp
+++ b/ide/compileroptions.pp
@@ -51,8 +51,6 @@ uses
   KeywordFuncLists, BasicCodeTools, LinkScanner, DirectoryCacher,
   // BuildIntf
   ProjectIntf, MacroIntf, IDEExternToolIntf, CompOptsIntf, IDEOptionsIntf,
-  // IDEIntf
-  SrcEditorIntf,
   // IdeConfig
   LazConf, EnvironmentOpts, SearchPathProcs, IdeXmlConfigProcs, TransferMacros,
   IDEProcs, ModeMatrixOpts, CompOptsModes,
@@ -167,6 +165,7 @@ type
     FParsedCommandStamp: integer;
     FParsedCommand: string;
   protected
+    procedure DoClearErrorLines; virtual;
     procedure SetCommand(AValue: string); override;
     procedure SubstituteMacros(var s: string); virtual;
   public
@@ -3157,6 +3156,11 @@ end;
 
 { TCompilationToolOptions }
 
+procedure TCompilationToolOptions.DoClearErrorLines;
+begin
+  ; // Do nothing.
+end;
+
 procedure TCompilationToolOptions.SetCommand(AValue: string);
 begin
   inherited SetCommand(AValue);
@@ -3282,9 +3286,7 @@ var
   ExtTool: TAbstractExternalTool;
 begin
   if Command='' then exit(mrOk);
-  if SourceEditorManagerIntf<>nil then
-    SourceEditorManagerIntf.ClearErrorLines;
-
+  DoClearErrorLines;
   ExtTool:=CreateExtTool(WorkingDir,ToolTitle,CompileHint);
   if ExtTool=nil then exit(mrOk);
   ExtTool.Reference(Self,ClassName);
diff --git a/ide/projecticon.pas b/ide/projecticon.pas
index 7cdcba14fe..a7c73d33d0 100644
--- a/ide/projecticon.pas
+++ b/ide/projecticon.pas
@@ -40,7 +40,7 @@ uses
   Graphics,
   // LazUtils
   LazFileUtils, LazFileCache, Laz2_XMLCfg, LazLoggerBase,
-  // IdeIntf
+  // BuildIntf
   ProjectResourcesIntf;
    
 type
diff --git a/ide/projectuserresources.pas b/ide/projectuserresources.pas
index 1a2d9b918f..3a0dcb7e5d 100644
--- a/ide/projectuserresources.pas
+++ b/ide/projectuserresources.pas
@@ -35,13 +35,15 @@ unit ProjectUserResources;
 interface
 
 uses
-  // RTL + LCL
+  // RTL + FCL
   Classes, SysUtils,
   resource, bitmapresource, groupresource, groupiconresource, groupcursorresource,
   // LazUtils
   LazFileUtils, LazUTF8, Laz2_XMLCfg, LazLoggerBase,
+  // BuildIntf
+  ProjectResourcesIntf, MacroIntf, IDEExternToolIntf,
   // IdeIntf
-  ProjectResourcesIntf, IDEMsgIntf, MacroIntf, IDEExternToolIntf,
+  IDEMsgIntf,
   // IDE
   LazarusIDEStrConsts;