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

Converter: Don't fix case of a unit name that gets replaced.

Browse Source 
git-svn-id: trunk@29493 -
This commit is contained in:
juha 2011-02-12 20:26:59 +00:00
parent bcb3d7d1a7
commit c88be7daf5
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
converter/usedunits.pas
View File

@ -59,7 +59,7 @@ type
fUnitsToFixCase: TStringToStringTree;// Like rename but done for every target.
fUnitsToComment: TStringList; // List of units to be commented.
fMissingUnits: TStringList; // Units not found in search path.
function FindMissingUnits: boolean;
function FindMissingUnits(AUnitUpdater: TStringMapUpdater): boolean;
procedure ToBeRenamedOrRemoved(AOldName, ANewName: string);
procedure FindReplacement(AUnitUpdater: TStringMapUpdater;
AMapToEdit: TStringToStringTree);
@ -192,7 +192,7 @@ begin
inherited Destroy;
end;
function TUsedUnits.FindMissingUnits: boolean;
function TUsedUnits.FindMissingUnits(AUnitUpdater: TStringMapUpdater): boolean;
var
UsesNode: TCodeTreeNode;
InAtom, UnitNameAtom: TAtomPosition;
@ -221,7 +221,9 @@ begin
if NewInFilename<>'' then
s:=s+' in '''+NewInFilename+'''';
if AFilename<>'' then begin // unit found
if NewUnitName<>OldUnitName then begin
if (NewUnitName<>OldUnitName) and
not AUnitUpdater.FindReplacement(NewUnitName, slo) then begin
// Character case differs and it will not be replaced.
fUnitsToFixCase[OldUnitName]:=NewUnitName; // fix case
IDEMessagesWindow.AddMsg(Format(lisConvDelphiFixedUnitCase,
[OldUnitName, NewUnitName]), '', -1);
@ -520,8 +522,8 @@ begin
if fCTLink.Settings.UnitsReplaceMode=rlInteractive then
MapToEdit:=TStringToStringTree.Create(false);
fCTLink.CodeTool.BuildTree(false);
if not (fMainUsedUnits.FindMissingUnits and
fImplUsedUnits.FindMissingUnits) then begin
if not (fMainUsedUnits.FindMissingUnits(UnitUpdater) and
fImplUsedUnits.FindMissingUnits(UnitUpdater)) then begin
Result:=mrCancel;
exit;
end;