paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-10-26 00:01:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Converter: fix fPrevSelectedPath. Renaming vars.

Browse Source 
git-svn-id: trunk@41760 -
This commit is contained in:
juha 2013-06-18 11:19:51 +00:00
parent d441ae5b4f
commit 21cba76a0d
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
converter/convertdelphi.pas
View File

@ -149,9 +149,9 @@ type
// Delphi unit conversion. // Delphi unit conversion.
TConvertDelphiUnit = class(TConvertDelphiPBase) TConvertDelphiUnit = class(TConvertDelphiPBase)
private private
DirectoryTemplate: TDefineTemplate; fDirTemplate: TDefineTemplate;
public public
constructor Create(aFiles: TStrings); constructor Create(aFileNames: TStrings);
destructor Destroy; override; destructor Destroy; override;
function Convert: TModalResult; function Convert: TModalResult;
end; end;
@ -830,7 +830,7 @@ constructor TConvertDelphiPBase.Create(const AFilename, ADescription: string);
begin begin
Create(ADescription); Create(ADescription);
fSettings.MainFilenames.Add(AFilename); fSettings.MainFilenames.Add(AFilename);
fPrevSelectedPath:=AFilename; fPrevSelectedPath:=fSettings.MainPath;
end; end;
destructor TConvertDelphiPBase.Destroy; destructor TConvertDelphiPBase.Destroy;
@ -867,33 +867,31 @@ end;
{ TConvertDelphiUnit } { TConvertDelphiUnit }
constructor TConvertDelphiUnit.Create(aFiles: TStrings); constructor TConvertDelphiUnit.Create(aFileNames: TStrings);
var var
MacroName, s: String; MacroName, s: String;
i: Integer; i: Integer;
begin begin
inherited Create(lisConvDelphiConvertDelphiUnit); inherited Create(lisConvDelphiConvertDelphiUnit);
// Add the list of files if they exist. // Add the list of files if they exist.
for i := 0 to aFiles.Count-1 do begin for i:=0 to aFileNames.Count-1 do begin
s:=CleanAndExpandFilename(aFiles[i]); s:=CleanAndExpandFilename(aFileNames[i]);
if FileExistsUTF8(s) then begin if FileExistsUTF8(s) then
fSettings.MainFilenames.Add(s); fSettings.MainFilenames.Add(s);
if (i=0) and (fPrevSelectedPath='') then
fPrevSelectedPath:=s;
end;
end; end;
fPrevSelectedPath:=fSettings.MainPath;
// use a template for compiler mode delphi for a single directory // use a template for compiler mode delphi for a single directory
DirectoryTemplate:=TDefineTemplate.Create('Delphi unit conversion', fDirTemplate:=TDefineTemplate.Create('Delphi unit conversion',
'Mode Delphi for single unit conversion', '', fSettings.MainPath, da_Directory); 'Mode Delphi for single unit conversion', '', fSettings.MainPath, da_Directory);
MacroName:=CompilerModeVars[cmDELPHI]; MacroName:=CompilerModeVars[cmDELPHI];
s:='Define'+MacroName; s:='Define'+MacroName;
DirectoryTemplate.AddChild(TDefineTemplate.Create(s, s, MacroName, '1', da_Define)); fDirTemplate.AddChild(TDefineTemplate.Create(s, s, MacroName, '1', da_Define));
CodeToolBoss.DefineTree.Add(DirectoryTemplate); // add directory template to tree CodeToolBoss.DefineTree.Add(fDirTemplate); // add directory template to tree
end; end;
destructor TConvertDelphiUnit.Destroy; destructor TConvertDelphiUnit.Destroy;
begin begin
CodeToolBoss.DefineTree.RemoveDefineTemplate(DirectoryTemplate); CodeToolBoss.DefineTree.RemoveDefineTemplate(fDirTemplate);
inherited Destroy; inherited Destroy;
end; end;
@ -911,7 +909,7 @@ begin
Application.ProcessMessages; Application.ProcessMessages;
if i>0 then if i>0 then
fSettings.AddLogLine(''); fSettings.AddLogLine('');
DelphiUnit := TDelphiUnit.Create(Self, fSettings.MainFilenames[i], []); DelphiUnit:=TDelphiUnit.Create(Self, fSettings.MainFilenames[i], []);
with DelphiUnit do with DelphiUnit do
try try
Result:=CopyAndLoadFile; Result:=CopyAndLoadFile;