From 2df6986f6a7e0b72403a2a839a53d6c68d78fc79 Mon Sep 17 00:00:00 2001 From: mattias Date: Tue, 10 Mar 2015 12:53:11 +0000 Subject: [PATCH] IDE: clean up git-svn-id: trunk@48205 - --- ide/cleandirdlg.pas | 3 ++- ide/emptymethodsdlg.pas | 10 +++++----- ide/findoverloadsdlg.pas | 4 ++-- ide/findrenameidentifier.pas | 13 ++++++------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ide/cleandirdlg.pas b/ide/cleandirdlg.pas index d1559ad04a..edba363a81 100644 --- a/ide/cleandirdlg.pas +++ b/ide/cleandirdlg.pas @@ -103,8 +103,9 @@ var begin ModalResult:=mrNone; SaveSettings; - if not SearchFilesToDelete(List) then exit; + List:=nil; try + if not SearchFilesToDelete(List) then exit; if not DeleteFiles(List) then exit; finally List.Free; diff --git a/ide/emptymethodsdlg.pas b/ide/emptymethodsdlg.pas index 8b88a0672b..2bb0352ecd 100644 --- a/ide/emptymethodsdlg.pas +++ b/ide/emptymethodsdlg.pas @@ -34,7 +34,7 @@ interface uses Classes, SysUtils, TypInfo, LCLProc, Forms, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls, ButtonPanel, SynEdit, SynHighlighterPas, - CodeToolsStructs, CodeAtom, CodeCache, CodeToolManager, PascalParserTool, + CodeToolsStructs, CodeCache, CodeToolManager, PascalParserTool, CodeTree, SrcEditorIntf, LazIDEIntf, PropEdits, IDEDialogs, CustomFormEditor, JitForms, Project, LazarusIDEStrConsts, EditorOptions; @@ -181,7 +181,7 @@ var AncestorRoot, AncestorComponent: TComponent; AncestorMethod: TMethod; begin - FillByte(Result, SizeOf(Result), 0); + FillByte(Result{%H-}, SizeOf(Result), 0); if csAncestor in AComponent.ComponentState then begin // search for ancestor component @@ -208,7 +208,7 @@ var end; end; - procedure CheckEvents(LookupRoot, AComponent: TComponent); + procedure CheckEvents(AComponent: TComponent); var TypeInfo: PTypeInfo; TypeData: PTypeData; @@ -292,9 +292,9 @@ begin and (SysUtils.CompareText(LookupRoot.ClassName,CurClassName)=0) then begin PropChanged:=false; - CheckEvents(LookupRoot,LookupRoot); + CheckEvents(LookupRoot); for i:=0 to LookupRoot.ComponentCount-1 do - CheckEvents(LookupRoot,LookupRoot.Components[i]); + CheckEvents(LookupRoot.Components[i]); // update objectinspector if PropChanged and (GlobalDesignHook.LookupRoot=LookupRoot) then GlobalDesignHook.RefreshPropertyValues; diff --git a/ide/findoverloadsdlg.pas b/ide/findoverloadsdlg.pas index 1c2044fe86..c252fe3899 100644 --- a/ide/findoverloadsdlg.pas +++ b/ide/findoverloadsdlg.pas @@ -40,8 +40,8 @@ uses Classes, SysUtils, LCLProc,FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls, Buttons, ButtonPanel, ComCtrls, AvgLvlTree, // codetools - FindDeclarationTool, PascalParserTool, CodeTree, CodeCache, CodeAtom, - CodeToolManager, CodeGraph, FindOverloads, + FindDeclarationTool, PascalParserTool, CodeTree, CodeCache, + CodeToolManager, FindOverloads, // IDE LazIDEIntf, ProjectIntf, SrcEditorIntf, IDEProcs; diff --git a/ide/findrenameidentifier.pas b/ide/findrenameidentifier.pas index 75b7c039aa..fbf8c142f8 100644 --- a/ide/findrenameidentifier.pas +++ b/ide/findrenameidentifier.pas @@ -31,7 +31,7 @@ interface uses Classes, SysUtils, LCLProc, Forms, Controls, Dialogs, - StdCtrls, ExtCtrls, AvgLvlTree, ComCtrls, + StdCtrls, ExtCtrls, ComCtrls, laz2_DOM, // codetools FileProcs, AVL_Tree, CTUnitGraph, CodeTree, CodeCache, @@ -59,7 +59,7 @@ type ScopeRadioGroup: TRadioGroup; procedure FindOrRenameButtonClick(Sender: TObject); procedure FindRenameIdentifierDialogClose(Sender: TObject; - var CloseAction: TCloseAction); + var {%H-}CloseAction: TCloseAction); procedure FindRenameIdentifierDialogCreate(Sender: TObject); procedure FormShow(Sender: TObject); procedure RenameCheckBoxChange(Sender: TObject); @@ -102,7 +102,7 @@ function ShowIdentifierReferences( DeclarationCode: TCodeBuffer; const DeclarationCaretXY: TPoint; TreeOfPCodeXYPosition: TAVLTree): TModalResult; procedure AddReferencesToResultView(DeclarationCode: TCodeBuffer; - const DeclarationCaretXY: TPoint; TargetCode: TCodeBuffer; + const DeclarationCaretXY: TPoint; TreeOfPCodeXYPosition: TAVLTree; ClearItems: boolean; SearchPageIndex: integer); function GatherFPDocReferencesForPascalFiles(PascalFiles: TStringList; @@ -312,7 +312,7 @@ begin // list results SearchResultsView.BeginUpdate(SearchPageIndex.PageIndex); AddReferencesToResultView(DeclarationCode,DeclarationCaretXY, - DeclarationCode,TreeOfPCodeXYPosition,true,SearchPageIndex.PageIndex); + TreeOfPCodeXYPosition,true,SearchPageIndex.PageIndex); OldSearchPageIndex:=SearchPageIndex; SearchPageIndex:=nil; SearchResultsView.EndUpdate(OldSearchPageIndex.PageIndex); @@ -324,9 +324,8 @@ begin end; procedure AddReferencesToResultView(DeclarationCode: TCodeBuffer; - const DeclarationCaretXY: TPoint; TargetCode: TCodeBuffer; - TreeOfPCodeXYPosition: TAVLTree; ClearItems: boolean; - SearchPageIndex: integer); + const DeclarationCaretXY: TPoint; TreeOfPCodeXYPosition: TAVLTree; + ClearItems: boolean; SearchPageIndex: integer); var Identifier: string; CodePos: PCodeXYPosition;