From 322062cc2457f01704675d034a59006beff24bfe Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Mon, 28 Jul 2014 18:50:07 +0000
Subject: [PATCH] IDE: clean up

git-svn-id: trunk@45989 -
---
 ide/buildmanager.pas      | 2 +-
 ide/environmentopts.pp    | 2 +-
 ide/lazbuild.lpi          | 6 ------
 packager/packagedefs.pas  | 2 +-
 packager/projpackbase.pas | 2 +-
 5 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/ide/buildmanager.pas b/ide/buildmanager.pas
index 4b6e70a380..71e0466017 100644
--- a/ide/buildmanager.pas
+++ b/ide/buildmanager.pas
@@ -92,7 +92,7 @@ type
                              var {%H-}Abort: boolean): string;
     function MacroFuncLCLWidgetType(const {%H-}Param: string; const Data: PtrInt;
                                     var {%H-}Abort: boolean): string;
-    function MacroFuncLazVer(const {%H-}Param: string; const Data: PtrInt;
+    function MacroFuncLazVer(const {%H-}Param: string; const {%H-}Data: PtrInt;
                                     var {%H-}Abort: boolean): string;
     function MacroFuncMake(const {%H-}Param: string; const {%H-}Data: PtrInt;
                            var {%H-}Abort: boolean): string;// make utility
diff --git a/ide/environmentopts.pp b/ide/environmentopts.pp
index d12b70d2ca..7715c79d3e 100644
--- a/ide/environmentopts.pp
+++ b/ide/environmentopts.pp
@@ -41,7 +41,7 @@ uses
   Dialogs, LazConfigStorage, Laz2_XMLCfg, LazUTF8,
   // IDEIntf
   ProjectIntf, ObjectInspector, IDEWindowIntf, IDEOptionsIntf,
-  ComponentReg, IDEExternToolIntf, IDEDialogs, MacroDefIntf,
+  ComponentReg, IDEExternToolIntf, MacroDefIntf,
   DbgIntfDebuggerBase,
   // IDE
   IDEProcs, DialogProcs, LazarusIDEStrConsts, IDETranslations, LazConf,
diff --git a/ide/lazbuild.lpi b/ide/lazbuild.lpi
index bd87514580..d895e9e4a8 100644
--- a/ide/lazbuild.lpi
+++ b/ide/lazbuild.lpi
@@ -48,7 +48,6 @@
       <Unit0>
         <Filename Value="lazbuild.lpr"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="lazbuild"/>
       </Unit0>
       <Unit1>
         <Filename Value="buildmanager.pas"/>
@@ -58,12 +57,10 @@
       <Unit2>
         <Filename Value="basebuildmanager.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="BaseBuildManager"/>
       </Unit2>
       <Unit3>
         <Filename Value="idecmdline.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="IDECmdLine"/>
       </Unit3>
     </Units>
   </ProjectOptions>
@@ -77,8 +74,5 @@
       <OtherUnitFiles Value="../designer;../packager;../debugger"/>
       <UnitOutputDirectory Value="../units/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)"/>
     </SearchPaths>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
 </CONFIG>
diff --git a/packager/packagedefs.pas b/packager/packagedefs.pas
index 7d19c321b4..b302ec10d8 100644
--- a/packager/packagedefs.pas
+++ b/packager/packagedefs.pas
@@ -688,7 +688,7 @@ type
     procedure RemoveFile(PkgFile: TPkgFile); // move file to removed file list
     procedure UnremovePkgFile(PkgFile: TPkgFile); // move file back to file list
     // True if something changed. Param is ignored here, just to match with interface.
-    function RemoveNonExistingFiles(RemoveFromUsesSection: boolean = true): boolean;
+    function RemoveNonExistingFiles({%H-}RemoveFromUsesSection: boolean = true): boolean;
     function GetFileDialogInitialDir(const DefaultDirectory: string): string;
     procedure MoveFile(CurIndex, NewIndex: integer);
     procedure SortFiles;
diff --git a/packager/projpackbase.pas b/packager/projpackbase.pas
index e075b0bb20..813cf97ac7 100644
--- a/packager/projpackbase.pas
+++ b/packager/projpackbase.pas
@@ -7,7 +7,7 @@ interface
 
 uses
   Classes, SysUtils,
-  IDEProcs, ProjPackIntf, CompilerOptions,
+  IDEProcs, CompilerOptions,
   DefineTemplates, CodeToolManager, FileReferenceList;
 
 type