From 57a280722d5364ce4b068a99af2428e87f7ab21d Mon Sep 17 00:00:00 2001 From: juha Date: Sat, 5 Feb 2011 10:00:46 +0000 Subject: [PATCH] Converter: Change sLineBreak to LineEnding for consistency. git-svn-id: trunk@29387 - --- converter/convcodetool.pas | 4 ++-- converter/convertdelphi.pas | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/converter/convcodetool.pas b/converter/convcodetool.pas index b534085b73..bda0d38603 100644 --- a/converter/convcodetool.pas +++ b/converter/convcodetool.pas @@ -454,7 +454,7 @@ begin [NewFunc, FuncInfo.InclSemiColon, FuncInfo.FuncName, Comment]); // Old function call with params for IDE message output. s:=copy(fCTLink.CodeTool.Src, FuncInfo.StartPos, FuncInfo.EndPos-FuncInfo.StartPos); - s:=StringReplace(s, sLineBreak, '', [rfReplaceAll]); + s:=StringReplace(s, LineEnding, '', [rfReplaceAll]); // Now replace it. fCTLink.ResetMainScanner; if not fCTLink.SrcCache.Replace(gtNone, gtNone, @@ -574,7 +574,7 @@ var for i:=0 to ReplaceFuncs.Funcs.Count-1 do begin FuncName:=ReplaceFuncs.Funcs[i]; if (IdentEndPos-xStart=length(FuncName)) - and (CompareIdentifiers(PChar(Pointer(FuncName)),@Src[xStart])=0) + and (CompareIdentifiers(PChar(FuncName),@Src[xStart])=0) and not fDefinedProcNames.Find(FuncName, x) then begin FuncDefInfo:=ReplaceFuncs.FuncAtInd(i); diff --git a/converter/convertdelphi.pas b/converter/convertdelphi.pas index 7371ef6fcd..36530b035f 100644 --- a/converter/convertdelphi.pas +++ b/converter/convertdelphi.pas @@ -320,8 +320,8 @@ begin LCLPath:=LCLPath+'$(TargetCPU)-$(TargetOS)'; Result:=QuestionDlg(lisLCLUnitPathMissing, Format(lisTheCurrentUnitPathForTheFileIsThePathToTheLCLUnits, - [sLineBreak,'"',Filename,'"',sLineBreak,'"',UnitPath,'"',sLineBreak, - sLineBreak,'"',LCLPath,'"',sLineBreak,sLineBreak,sLineBreak]), + [LineEnding,'"',Filename,'"',LineEnding,'"',UnitPath,'"',LineEnding, + LineEnding,'"',LCLPath,'"',LineEnding,LineEnding,LineEnding]), mtError, [mrOK, lisContinue, mrAbort, lisInfoBuildMakeAbort], 0); exit; end;