From 5661bb71205c75f0adfd01dccaa2b41005230591 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Fri, 24 Jan 2025 16:47:19 +0100
Subject: [PATCH] ide: use RemoveAmpersands

---
 ide/lazarusidestrconsts.pas | 4 +---
 ide/sourcefilemanager.pas   | 8 ++++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index 7ca0ee73e7..081252cb3b 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -713,9 +713,7 @@ resourcestring
   lisReplacementFuncs = 'Replacement functions';
   lisFilesHaveRightEncoding = '*** All found files already have the right encoding ***';
   lisEncodingNumberOfFilesFailed = 'Number of files failed to convert: %d';
-
-  //
-  lisnoname = 'noname';
+  lisnoname = 'noname'; // default unit name, must be a valid identifier
   lisTheDestinationDirectoryDoesNotExist = 'The destination directory%s"%s" does not exist.';
   lisRenameFile = 'Rename file?';
   lisThisLooksLikeAPascalFileItIsRecommendedToUseLowerC = 'This looks like a Pascal file.'
diff --git a/ide/sourcefilemanager.pas b/ide/sourcefilemanager.pas
index 8519e59b54..98243821a4 100644
--- a/ide/sourcefilemanager.pas
+++ b/ide/sourcefilemanager.pas
@@ -4930,7 +4930,7 @@ begin
     OldUnitName:='';
   //debugln('ShowSaveFileAsDialog sourceunitname=',OldUnitName);
   if sfskipReferences in Flags then
-    SaveAsFilename:=LowerCase(StringReplace(OldUnitName,'&','',[rfReplaceAll]))
+    SaveAsFilename:=LowerCase(RemoveAmpersands(OldUnitName))
   else
     SaveAsFilename:=OldUnitName;
   if SaveAsFilename='' then
@@ -8221,17 +8221,17 @@ begin
     if Assigned(Project1.MainUnitInfo) then begin
       NewProgramName := Project1.MainUnitInfo.ReadUnitNameFromSource(false);
       ANewPath := ExtractFilePath(Project1.MainUnitInfo.Filename);
-      AFileName := StringReplace(NewProgramName,'&','',[rfReplaceAll]);
+      AFileName := RemoveAmpersands(NewProgramName);
     end;
     if AFilename = '' then begin
       NewProgramName := ExtractFileName(Project1.ProjectInfoFile);
       ANewPath := ExtractFilePath(Project1.ProjectInfoFile);
-      AFilename := StringReplace(NewProgramName,'&','',[rfReplaceAll]);
+      AFilename := RemoveAmpersands(NewProgramName);
     end;
     if AFilename = '' then begin
       NewProgramName := Trim(Project1.GetTitle);
       ANewPath := Project1.Directory;
-      AFilename := StringReplace(NewProgramName,'&','',[rfReplaceAll]);
+      AFilename := RemoveAmpersands(NewProgramName);
     end;
     if AFilename = '' then begin
       NewProgramName := 'Project1';