paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-22 05:59:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Converter: Cleanup

Browse Source 
git-svn-id: trunk@29607 -
This commit is contained in:
juha 2011-02-19 14:32:48 +00:00
parent 9cb146625a
commit e8002ff5cb
2 changed files with 0 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
converter/convertdelphi.pas
View File

@ -269,14 +269,6 @@ type
end;
}
// Some global functions from delphiunit2laz are not (yet) converted to class methods.
function CheckDelphiFileExt(const Filename: string): TModalResult;
function CheckFilenameForLCLPaths(const Filename: string): TModalResult;
// projects
function CheckDelphiProjectExt(const Filename: string): TModalResult;
// file names / search paths
function ConvertDelphiAbsoluteToRelativeFile(const Filename: string;
AProject: TProject): string;
function ExpandDelphiFilename(const Filename: string; AProject: TProject): string;
@ -286,57 +278,6 @@ type
implementation
function CheckDelphiFileExt(const Filename: string): TModalResult;
begin
Result:=mrOk;
if CompareFileExt(Filename,'.pas',false)<>0 then
Result:=QuestionDlg(lisNotADelphiUnit,
Format(lisTheFileIsNotADelphiUnit, ['"', Filename, '"']),
mtError, [mrCancel,lisConvDelphiSkipThisFile,mbAbort,lisInfoBuildMakeAbort], 0);
end;
function CheckFilenameForLCLPaths(const Filename: string): TModalResult;
// check if the unitpath of the directory of filename contains the path to the LCL
var
Directory: String;
UnitPath: String;
LazarusSrcDir: string;
LCLPath: String;
NextStartPos: Integer;
begin
// get directory of filename
Directory:=ExtractFilePath(Filename);
// get unitpath definition of directory
UnitPath:=CodeToolBoss.GetUnitPathForDirectory(Directory);
// get lazarus source directory
LazarusSrcDir:=CodeToolBoss.GlobalValues.Variables[ExternalMacroStart+'LazarusDir'];
// create base path to LCL compiled units <LazarusSrcDir>/lcl/units/
LCLPath:=TrimFilename(LazarusSrcDir+SetDirSeparators('/lcl/units/'));
NextStartPos:=1;
if GetNextUsedDirectoryInSearchPath(UnitPath,LCLPath,NextStartPos)='' then
begin
LCLPath:=LCLPath+'$(TargetCPU)-$(TargetOS)';
Result:=QuestionDlg(lisLCLUnitPathMissing,
Format(lisTheCurrentUnitPathForTheFileIsThePathToTheLCLUnits,
[LineEnding,'"',Filename,'"',LineEnding,'"',UnitPath,'"',LineEnding,
LineEnding,'"',LCLPath,'"',LineEnding,LineEnding,LineEnding]),
mtError, [mrOK, lisContinue, mrAbort, lisInfoBuildMakeAbort], 0);
exit;
end;
Result:=mrOk;
end;
function CheckDelphiProjectExt(const Filename: string): TModalResult;
begin
if CompareFileExt(Filename,'.dpr',false)<>0 then begin
Result:=QuestionDlg(lisNotADelphiProject,
Format(lisTheFileIsNotADelphiProjectDpr, ['"', Filename, '"']),
mtError, [mrCancel, lisConvDelphiSkipThisStep, mbAbort], 0);
exit;
end;
Result:=mrOk;
end;
function ConvertDelphiAbsoluteToRelativeFile(const Filename: string; AProject: TProject): string;
// often projects use paths near to their project directory. For example:
// A project /somewhere/MyProjects/project1.dpr
@ -610,11 +551,6 @@ begin
DfmFilename:=GetDfmFileName;
Result:=FixLfmFilename(DfmFilename);
if Result<>mrOk then exit;
// Check LCL path for single files. They are correct when converting projects.
{ if not Assigned(fOwnerConverter) then begin
Result:=CheckFilenameForLCLPaths(fLazUnitFilename);
if Result<>mrOk then exit;
end; }
// Fix include file names.
Result:=FixIncludeFiles;
if Result<>mrOk then exit;

6
ide/lazarusidestrconsts.pas
View File

@ -2962,10 +2962,6 @@ resourcestring
lisUninstallImpossible = 'Uninstall impossible';
lisThePackageCanNotBeUninstalledBecauseItIsNeededByTh = 'The package %s can '
+'not be uninstalled, because it is needed by the IDE itself.';
lisTheCurrentUnitPathForTheFileIsThePathToTheLCLUnits = 'The current unit '
+'path for the file%s%s%s%s is%s%s%s%s.%s%sThe path to the LCL units %s%s%'
+'s is missing.%s%sHint for newbies:%sCreate a lazarus application and '
+'put the file into the project directory.';
lisLCLUnitPathMissing = 'LCL unit path missing';
lisNotADelphiUnit = 'Not a Delphi unit';
lisTheFileIsNotADelphiUnit = 'The file %s%s%s is not a Delphi unit.';
@ -5097,8 +5093,6 @@ resourcestring
lisIDEInfoInformationAboutTheIDE = 'Information about the IDE';
//Delphi units and projects converter
lisConvDelphiSkipThisFile = 'Skip this file';
lisConvDelphiSkipThisStep = 'Skip this step';
lisConvDelphiConvertDelphiUnit = 'Convert Delphi unit';
lisConvDelphiConvertDelphiProject = 'Convert Delphi project';
lisConvDelphiConvertDelphiPackage = 'Convert Delphi package';