paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-08 05:17:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Some corrections in set unit name based on filename

Browse Source 
git-svn-id: trunk@63153 -
This commit is contained in:
michael 2020-05-14 11:48:24 +00:00
parent 2bb9bcd7ac
commit 95bdfd1be4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/datadict/frmbaseconfigcodegenerator.pp
View File

@ -238,7 +238,7 @@ Var
OldName,NewName : string; OldName,NewName : string;
begin begin
OldName:=FGen.CodeOptions.UnitName; OldName:=FCodeOptions.UnitName;
if (OldName='') or if (OldName='') or
SameText(OldName,'Unit1') or SameText(OldName,'Unit1') or
SameText(OldName,FLastname) then SameText(OldName,FLastname) then
@ -246,10 +246,10 @@ begin
NewName:=ExtractFileName(FEFile.FileName); NewName:=ExtractFileName(FEFile.FileName);
FLastName:=NewName; FLastName:=NewName;
// Strip off known extensions // Strip off known extensions
if (IndexText(ExtractFileExt(FileName),['.pas','.pp','.inc','.lpr','.dpr'])<>-1) then if (IndexText(ExtractFileExt(NewName),['.pas','.pp','.inc','.lpr','.dpr'])<>-1) then
FGen.CodeOptions.UnitName:=ChangeFileExt(NewName,'') FCodeOptions.UnitName:=ChangeFileExt(NewName,'')
else else
FGen.CodeOptions.UnitName:=NewName; FCodeOptions.UnitName:=NewName;
end; end;
end; end;