From 8ec63ba013837266af3f4a17809333c1aba44429 Mon Sep 17 00:00:00 2001 From: mattias Date: Thu, 2 Jan 2025 10:40:58 +0100 Subject: [PATCH] ide: fixed compile --- ide/findrenameidentifier.pas | 9 +++++---- ide/sourcefilemanager.pas | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ide/findrenameidentifier.pas b/ide/findrenameidentifier.pas index 54dda1f18a..ca577661f9 100644 --- a/ide/findrenameidentifier.pas +++ b/ide/findrenameidentifier.pas @@ -450,13 +450,14 @@ begin OldChange:=LazarusIDE.OpenEditorsOnCodeToolChange; LazarusIDE.OpenEditorsOnCodeToolChange:=true; try + isConflicted:=false; // todo: check for conflicts and show user list if not CodeToolBoss.RenameIdentifier(PascalReferences, - Identifier, Options.RenameTo, DeclCode, @DeclarationCaretXY, isConflicted) + Identifier, Options.RenameTo, DeclCode, @DeclarationCaretXY) then begin if isConflicted then - IDEMessageDialog(lisRenamingConflict, - Format(lisIdentifierWasAlreadyUsed,[Options.RenameTo]), - mtError,[mbOK]) + IDEMessageDialog(lisRenamingConflict, + Format(lisIdentifierWasAlreadyUsed,[Options.RenameTo]), + mtError,[mbOK]) else LazarusIDE.DoJumpToCodeToolBossError; debugln('Error: (lazarus) DoFindRenameIdentifier unable to commit'); diff --git a/ide/sourcefilemanager.pas b/ide/sourcefilemanager.pas index 4ee2f8c135..8519e59b54 100644 --- a/ide/sourcefilemanager.pas +++ b/ide/sourcefilemanager.pas @@ -8563,7 +8563,7 @@ var PascalReferences: TAVLTree; i: Integer; MsgResult: TModalResult; - OnlyEditorFiles, isConflicted: Boolean; + OnlyEditorFiles: Boolean; aFilename: String; begin // compare unitnames case sensitive, maybe only the case changed @@ -8653,7 +8653,7 @@ begin end; end; if not CodeToolBoss.RenameIdentifier(PascalReferences,OldUnitName,NewUnitName, - Nil,Nil,isConflicted) then + Nil,Nil) then begin if (not IgnoreErrors) and (not Quiet) then MainIDE.DoJumpToCodeToolBossError;