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

Converter: make TConvDelphiCodeTool.RenameResourceDirectives public. New Constuctor for TConvDelphiCodeTool.

Browse Source 
git-svn-id: trunk@36373 -
This commit is contained in:
juha 2012-03-27 07:34:38 +00:00
parent 62369e60a5
commit 2510694d18
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
converter/convcodetool.pas
View File

@ -75,6 +75,7 @@ type
TConvDelphiCodeTool = class TConvDelphiCodeTool = class
private private
fCTLink: TCodeToolLink; fCTLink: TCodeToolLink;
fCTLinkCreated: boolean;
fIsConsoleApp: Boolean; fIsConsoleApp: Boolean;
fHasFormFile: boolean; fHasFormFile: boolean;
fLowerCaseRes: boolean; fLowerCaseRes: boolean;
@ -85,15 +86,16 @@ type
fFuncsToReplace: TObjectList; fFuncsToReplace: TObjectList;
function AddModeDelphiDirective: boolean; function AddModeDelphiDirective: boolean;
function RenameResourceDirectives: boolean;
function ReplaceFuncsInSource: boolean; function ReplaceFuncsInSource: boolean;
function RememberProcDefinition(aNode: TCodeTreeNode): TCodeTreeNode; function RememberProcDefinition(aNode: TCodeTreeNode): TCodeTreeNode;
function ReplaceFuncCalls(aIsConsoleApp: boolean): boolean; function ReplaceFuncCalls(aIsConsoleApp: boolean): boolean;
public public
constructor Create(APascalBuffer: TCodeBuffer);
constructor Create(ACTLink: TCodeToolLink); constructor Create(ACTLink: TCodeToolLink);
destructor Destroy; override; destructor Destroy; override;
function Convert: TModalResult; function Convert: TModalResult;
function FindApptypeConsole: boolean; function FindApptypeConsole: boolean;
function RenameResourceDirectives: boolean;
function FixMainClassAncestor(const AClassName: string; function FixMainClassAncestor(const AClassName: string;
AReplaceTypes: TStringToStringTree): boolean; AReplaceTypes: TStringToStringTree): boolean;
public public
@ -161,16 +163,29 @@ end;
{ TConvDelphiCodeTool } { TConvDelphiCodeTool }
constructor TConvDelphiCodeTool.Create(APascalBuffer: TCodeBuffer);
begin
inherited Create;
fCTLink:=TCodeToolLink.Create(APascalBuffer);
fCTLink.AskAboutError:=False;
fLowerCaseRes:=True;
fIsConsoleApp:=False;
fCTLinkCreated:=True;
end;
constructor TConvDelphiCodeTool.Create(ACTLink: TCodeToolLink); constructor TConvDelphiCodeTool.Create(ACTLink: TCodeToolLink);
begin begin
inherited Create; inherited Create;
fCTLink:=ACTLink; fCTLink:=ACTLink;
fLowerCaseRes:=False; fLowerCaseRes:=False;
fIsConsoleApp:=False; fIsConsoleApp:=False;
fCTLinkCreated:=False;
end; end;
destructor TConvDelphiCodeTool.Destroy; destructor TConvDelphiCodeTool.Destroy;
begin begin
if fCTLinkCreated then
fCTLink.Free;
inherited Destroy; inherited Destroy;
end; end;
@ -269,7 +284,7 @@ begin
LowKey:=LowerCase(Key); LowKey:=LowerCase(Key);
// Form file resource rename or lowercase: // Form file resource rename or lowercase:
if (LowKey='dfm') or (LowKey='xfm') then begin if (LowKey='dfm') or (LowKey='xfm') then begin
if fCTLink.Settings.SupportDelphi then begin if Assigned(fCTLink.Settings) and fCTLink.Settings.SupportDelphi then begin
// Use the same dfm file. Lowercase existing key. // Use the same dfm file. Lowercase existing key.
if fCTLink.Settings.SameDfmFile then begin if fCTLink.Settings.SameDfmFile then begin
if Key<>LowKey then if Key<>LowKey then