IDE: clean up

git-svn-id: trunk@48206 -

ide/buildfiledlg.pas

@@ -92,7 +92,7 @@ type
     procedure BuildBrowseWorkDirButtonCLICK(Sender: TObject);
     procedure BuildFileDialogCREATE(Sender: TObject);
     procedure BuildFileDialogKEYDOWN(Sender: TObject; var Key: Word;
-                                     Shift: TShiftState);
+                                     {%H-}Shift: TShiftState);
     procedure BuildMacroSelectionBoxAddMacro(Sender: TObject);
     procedure HelpButtonClick(Sender: TObject);
     procedure OkButtonClick(Sender: TObject);
@@ -237,7 +237,7 @@ function GetIDEDirectiveFlag(const DirectiveValue,
 // Example: 'FPC+ Make off   BUILD  on  FPC-'
 
   function ReadNextWord(var ReadPos: integer;
-    var WordStart, WordEnd: integer): boolean;
+    out WordStart, WordEnd: integer): boolean;
   begin
     Result:=false;
     // skip space
@@ -493,6 +493,7 @@ var
   MacroCode: string;
   Macro: TTransferMacro;
 begin
+  MacroCode:='';
   Macro:=BuildMacroSelectionBox.GetSelectedMacro(MacroCode);
   if Macro=nil then exit;
   BuildCommandMemo.SelText:=MacroCode;
@@ -514,6 +515,7 @@ var
   MacroCode: string;
   Macro: TTransferMacro;
 begin
+  MacroCode:='';
   Macro:=RunMacroSelectionBox.GetSelectedMacro(MacroCode);
   if Macro=nil then exit;
   RunCommandMemo.SelText:=MacroCode;

ide/codeexplorer.pas

@@ -156,7 +156,7 @@ type
     procedure CodeRefreshSpeedButtonClick(Sender: TObject);
     procedure RenameMenuItemClick(Sender: TObject);
     procedure TreePopupmenuPopup(Sender: TObject);
-    procedure OnUserInput(Sender: TObject; Msg: Cardinal);
+    procedure OnUserInput(Sender: TObject; {%H-}Msg: Cardinal);
   private
     fCategoryNodes: array[TCodeExplorerCategory] of TTreeNode;
     FCodeFilename: string;

ide/extractprocdlg.pas

@@ -34,7 +34,7 @@ interface
 uses
   Classes, SysUtils, LCLProc, AVL_Tree, Forms, Controls, Graphics,
   Dialogs, ExtCtrls, Buttons, StdCtrls,
-  BasicCodeTools, CodeTree, CodeAtom, CodeCache, CodeToolManager,
+  BasicCodeTools, CodeTree, CodeCache, CodeToolManager,
   ExtractProcTool,
   IDEHelpIntf, IDEDialogs,
   LazarusIDEStrConsts, IDEProcs, MiscOptions;
@@ -61,7 +61,7 @@ type
     procedure HelpButtonClick(Sender: TObject);
     procedure ExtractProcDialogCreate(Sender: TObject);
     procedure ExtractProcDialogClose(Sender: TObject;
-      var CloseAction: TCloseAction);
+      var {%H-}CloseAction: TCloseAction);
     procedure OkButtonClick(Sender: TObject);
   private
     FMethodPossible: boolean;

ide/main.pp

@@ -10019,7 +10019,6 @@ begin
 
     // show make resourcestring dialog
     Result:=ShowMakeResStrDialog(StartPos,EndPos,StartCode,
-                                 CodeToolBoss.Positions,
                                  NewIdentifier,NewIdentValue,NewSourceLines,
                                  SectionCode,SectionCaretXY,InsertPolicy);
     if (Result<>mrOk) then exit;

ide/makeresstrdlg.pas

@@ -39,10 +39,10 @@ unit MakeResStrDlg;
 interface
 
 uses
-  Classes, SysUtils, LCLProc, Forms, Controls, Buttons, ComCtrls, StdCtrls,
+  Classes, SysUtils, LCLProc, Forms, Controls, Buttons, StdCtrls,
   Dialogs, ExtCtrls, IDEWindowIntf,
   SynHighlighterPas, SynEdit,
-  CodeToolManager, CodeAtom, CodeToolsStructs, CodeCache,
+  CodeToolManager, CodeToolsStructs, CodeCache,
   IDEHelpIntf, IDEDialogs,
   LazarusIDEStrConsts,
   EditorOptions, InputHistory, MiscOptions, IDEProcs;
@@ -121,7 +121,7 @@ type
     function ResStrExistsInCurrentSection(const Identifier: string): boolean;
     function ResStrExistsInAnySection(const Identifier: string): boolean;
     function ResStrExistsWithSameValue(const Identifier: string): boolean;
-    procedure GetNewSource(var NewSource, ResourceStringValue: string);
+    procedure GetNewSource(out NewSource, ResourceStringValue: string);
     procedure Init;
     procedure SaveHistories;
     procedure SaveIdentPrefixes;
@@ -131,7 +131,6 @@ type
   
 function ShowMakeResStrDialog(
   const StartPos, EndPos: TPoint; Code: TCodeBuffer;
-  Positions: TCodeXYPositions;
   out NewIdentifier, NewIdentifierValue: string;
   out NewSourceLines: string;
   out ResStrSectionCode: TCodeBuffer;
@@ -142,14 +141,12 @@ implementation
 
 {$R *.lfm}
 
-uses
-  Math;
 
 function ShowMakeResStrDialog(const StartPos, EndPos: TPoint;
-  Code: TCodeBuffer; Positions: TCodeXYPositions; out NewIdentifier,
+  Code: TCodeBuffer; out NewIdentifier, NewIdentifierValue: string; out
-  NewIdentifierValue: string; out NewSourceLines: string; out
+  NewSourceLines: string; out ResStrSectionCode: TCodeBuffer; out
-  ResStrSectionCode: TCodeBuffer; out ResStrSectionXY: TPoint; out
+  ResStrSectionXY: TPoint; out InsertPolicy: TResourcestringInsertPolicy
-  InsertPolicy: TResourcestringInsertPolicy): TModalResult;
+  ): TModalResult;
 var
   MakeResStrDialog: TMakeResStrDialog;
   Section: PCodeXYPosition;
@@ -533,7 +530,7 @@ begin
   Result:=false;
 end;
 
-procedure TMakeResStrDialog.GetNewSource(var NewSource,
+procedure TMakeResStrDialog.GetNewSource(out NewSource,
   ResourceStringValue: string);
 var
   FormatStringConstant: string;
@@ -544,6 +541,8 @@ var
   RightSide: String;
   StartInStringConst, EndInStringConst: boolean;
 begin
+  NewSource:='';
+  ResourceStringValue:='';
   if not CodeToolBoss.StringConstToFormatString(Code,StartPos.X,StartPos.Y,
      Code,EndPos.X,EndPos.Y,FormatStringConstant,FormatParameters,
      StartInStringConst,EndInStringConst)

ide/procedurelist.pas

@@ -39,7 +39,7 @@ interface
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ComCtrls,
   ExtCtrls, StdCtrls,
-  CodeTree, CodeToolManager, CodeAtom, CodeCache,
+  CodeTree, CodeToolManager, CodeCache,
   IDEImagesIntf;
 
 type
@@ -66,7 +66,7 @@ type
     procedure cbObjectsChange(Sender: TObject);
     procedure edMethodsChange(Sender: TObject);
     procedure edMethodsKeyDown(Sender: TObject; var Key: Word;
-      Shift: TShiftState);
+      {%H-}Shift: TShiftState);
     procedure edMethodsKeyPress(Sender: TObject; var Key: char);
     procedure FormCreate(Sender: TObject);
     procedure FormKeyPress(Sender: TObject; var Key: char);
@@ -105,8 +105,7 @@ implementation
 {$R *.lfm}
 
 uses
-  MenuIntf
+  SrcEditorIntf
-  ,SrcEditorIntf
   ,PascalParserTool
   ,KeywordFuncLists
   ,LCLType