diff --git a/converter/convcodetool.pas b/converter/convcodetool.pas index 3a7070605f..f83b0fd6d0 100644 --- a/converter/convcodetool.pas +++ b/converter/convcodetool.pas @@ -487,7 +487,7 @@ begin end; procedure SplitParam(const aStr: string; aDelimiter: Char; Result: TStringList); -// A modified split function. Removes '%' in front of every token. +// A modified split function. Removes '$' in front of every token. procedure SetItem(Start, Len: integer); // Add the item. begin @@ -497,12 +497,12 @@ procedure SplitParam(const aStr: string; aDelimiter: Char; Result: TStringList); end; while (aStr[Start+Len-1]=' ') do // Trim trailing space. Dec(Len); - if (aStr[Start]='%') then begin // Parameters must begin with '%'. + if (aStr[Start]='$') then begin // Parameters must begin with '$'. Inc(Start); Dec(Len); end else - raise EConverterError.Create('Replacement function parameter should start with "%".'); + raise EConverterError.Create('Replacement function parameter should start with "$".'); Result.Add(Copy(aStr, Start, Len)); end; diff --git a/converter/convertsettings.pas b/converter/convertsettings.pas index ab524fd7db..9fe39084fe 100644 --- a/converter/convertsettings.pas +++ b/converter/convertsettings.pas @@ -253,14 +253,14 @@ begin // Map Delphi function names to FCL/LCL functions. TheMap:=fReplaceFuncs; - MapReplacement('ShellExecute', 'OpenURL(%3)'); + MapReplacement('ShellExecute', 'OpenURL($3)'); // File name encoding. ToDo: add other similar funcs with UTF8 counterparts. - MapReplacement('FileExists', 'FileExistsUTF8(%1)'); + MapReplacement('FileExists', 'FileExistsUTF8($1)'); // File functions using a handle. - MapReplacement('CreateFile', 'FileCreate(%1)'); // in SysUtils - MapReplacement('GetFileSize', 'FileSize(%1)'); // in SysUtils - MapReplacement('ReadFile', 'FileRead(%1)'); // in SysUtils - MapReplacement('CloseHandle', 'FileClose(%1)'); // in SysUtils + MapReplacement('CreateFile', 'FileCreate($1)'); // in SysUtils + MapReplacement('GetFileSize', 'FileSize($1)'); // in SysUtils + MapReplacement('ReadFile', 'FileRead($1)'); // in SysUtils + MapReplacement('CloseHandle', 'FileClose($1)'); // in SysUtils end; destructor TConvertSettings.Destroy;