From caa300bdcfbe9a2ba1aabfca13ad4b25025c8869 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Tue, 30 Aug 2011 16:37:31 +0000
Subject: [PATCH] codetools: renamed TStandardCodeTool.AddIncludeDirective

git-svn-id: trunk@32121 -
---
 components/codetools/codetoolmanager.pas | 15 +++++++++++----
 components/codetools/stdcodetools.pas    |  9 +++++++++
 ide/projectresources.pas                 |  4 ++--
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/components/codetools/codetoolmanager.pas b/components/codetools/codetoolmanager.pas
index ec85d06b16..11e4f4638f 100644
--- a/components/codetools/codetoolmanager.pas
+++ b/components/codetools/codetoolmanager.pas
@@ -350,6 +350,8 @@ type
           out NewCode: TCodeBuffer; out NewX, NewY, NewTopLine: integer;
           const Filename: string = ''; SearchInCleanSrc: boolean = true): boolean;
     function AddIncludeDirective(Code: TCodeBuffer; const Filename: string;
+          const NewSrc: string = ''): boolean; deprecated;
+    function AddIncludeDirectiveForInit(Code: TCodeBuffer; const Filename: string;
           const NewSrc: string = ''): boolean;
     function RemoveDirective(Code: TCodeBuffer; NewX, NewY: integer;
           RemoveEmptyIFs: boolean): boolean;
@@ -3051,16 +3053,21 @@ begin
 end;
 
 function TCodeToolManager.AddIncludeDirective(Code: TCodeBuffer;
-  const Filename: string; const NewSrc: string
-  ): boolean;
+  const Filename: string; const NewSrc: string): boolean;
+begin
+  Result:=AddIncludeDirectiveForInit(Code,Filename,NewSrc);
+end;
+
+function TCodeToolManager.AddIncludeDirectiveForInit(Code: TCodeBuffer;
+  const Filename: string; const NewSrc: string): boolean;
 begin
   Result:=false;
   {$IFDEF CTDEBUG}
-  DebugLn('TCodeToolManager.AddIncludeDirective A ',Code.Filename,' Filename=',Filename);
+  DebugLn('TCodeToolManager.AddIncludeDirectiveForInit A ',Code.Filename,' Filename=',Filename);
   {$ENDIF}
   if not InitCurCodeTool(Code) then exit;
   try
-    Result:=FCurCodeTool.AddIncludeDirective(Filename,SourceChangeCache,NewSrc);
+    Result:=FCurCodeTool.AddIncludeDirectiveForInit(Filename,SourceChangeCache,NewSrc);
   except
     on e: Exception do Result:=HandleException(e);
   end;
diff --git a/components/codetools/stdcodetools.pas b/components/codetools/stdcodetools.pas
index 5535c0a3f1..71f41dfdcc 100644
--- a/components/codetools/stdcodetools.pas
+++ b/components/codetools/stdcodetools.pas
@@ -253,6 +253,9 @@ type
           out NewPos: TCodeXYPosition; out NewTopLine: integer;
           const Filename: string = ''): boolean;
     function AddIncludeDirective(const Filename: string;
+          SourceChangeCache: TSourceChangeCache; const NewSrc: string = ''
+          ): boolean; deprecated;
+    function AddIncludeDirectiveForInit(const Filename: string;
           SourceChangeCache: TSourceChangeCache; const NewSrc: string = ''
           ): boolean;
     function FixIncludeFilenames(Code: TCodeBuffer;
@@ -6181,6 +6184,12 @@ end;
 
 function TStandardCodeTool.AddIncludeDirective(const Filename: string;
   SourceChangeCache: TSourceChangeCache; const NewSrc: string): boolean;
+begin
+  Result:=AddIncludeDirectiveForInit(Filename,SourceChangeCache,NewSrc);
+end;
+
+function TStandardCodeTool.AddIncludeDirectiveForInit(const Filename: string;
+  SourceChangeCache: TSourceChangeCache; const NewSrc: string): boolean;
 var
   ANode: TCodeTreeNode;
   Indent: LongInt;
diff --git a/ide/projectresources.pas b/ide/projectresources.pas
index c15141a32a..9e47328e27 100644
--- a/ide/projectresources.pas
+++ b/ide/projectresources.pas
@@ -633,7 +633,7 @@ begin
     if FLrsIncludeAllowed and HasLazarusResources then
     begin
       //debugln(['TProjectResources.UpdateMainSourceFile include directive not found: FCanHaveLrsInclude=',FLrsIncludeAllowed,' HasLazarusResources=',HasLazarusResources]);
-      if not CodeToolBoss.AddIncludeDirective(CodeBuf,
+      if not CodeToolBoss.AddIncludeDirectiveForInit(CodeBuf,
         Filename,'') then
       begin
         Result := False;
@@ -710,7 +710,7 @@ begin
         Messages.Add('Could not remove "{$I '+ oldLrsFileName +'"} from main source!');
         Exit;
       end;
-      if not CodeToolBoss.AddIncludeDirective(CodeBuf, newLrsFileName, '') then
+      if not CodeToolBoss.AddIncludeDirectiveForInit(CodeBuf, newLrsFileName, '') then
       begin
         Result := False;
         debugln(['TProjectResources.RenameDirectives adding include directive to main source failed']);