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

LazUtils: change order of new Count parameter in Utf8StringReplace/Utf16StringReplace.

Browse Source 
git-svn-id: trunk@60429 -
This commit is contained in:
bart 2019-02-15 15:52:00 +00:00
parent df8ad46b90
commit 642a3a9b68
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/lazutils/lazutf16.pas
View File

@ -46,7 +46,7 @@ function UnicodeToUTF16(u: cardinal): widestring;
function IsUTF16CharValid(AChar, ANextChar: WideChar): Boolean;
function IsUTF16StringValid(AWideStr: widestring): Boolean;
function Utf16StringReplace(const S, OldPattern, NewPattern: WideString; Flags: TReplaceFlags): WideString; Inline;
function Utf16StringReplace(const S, OldPattern, NewPattern: WideString; out Count: Integer; Flags: TReplaceFlags): WideString;
function Utf16StringReplace(const S, OldPattern, NewPattern: WideString; Flags: TReplaceFlags; out Count: Integer): WideString;
function UnicodeLowercase(u: cardinal): cardinal;
{$IFDEF FPC}
@ -261,12 +261,12 @@ function Utf16StringReplace(const S, OldPattern, NewPattern: WideString;
var
DummyCount: Integer;
begin
Result := Utf16StringReplace(S, OldPattern, NewPattern, DummyCount, Flags);
Result := Utf16StringReplace(S, OldPattern, NewPattern, Flags, DummyCount);
end;
//Same as SysUtil.StringReplace but for WideStrings/UnicodeStrings, since it's not available in fpc yet
function Utf16StringReplace(const S, OldPattern, NewPattern: WideString; out Count: Integer;
Flags: TReplaceFlags): WideString;
function Utf16StringReplace(const S, OldPattern, NewPattern: WideString;
Flags: TReplaceFlags; out Count: Integer): WideString;
var
Srch, OldP, RemS: WideString; // Srch and OldP can contain WideUpperCase versions of S,OldPattern
P: Integer;

10
components/lazutils/lazutf8.pas
View File

@ -123,8 +123,8 @@ procedure UTF8Insert(const source: Utf8String; var s: Utf8String; StartCharIndex
procedure UTF8Insert(const source: String; var s: String; StartCharIndex: PtrInt);
function UTF8StringReplace(const S, OldPattern, NewPattern: String;
Flags: TReplaceFlags; ALanguage: string=''): String; inline;
function UTF8StringReplace(const S, OldPattern, NewPattern: String; out Count: Integer;
Flags: TReplaceFlags; ALanguage: string=''): String;
function UTF8StringReplace(const S, OldPattern, NewPattern: String;
Flags: TReplaceFlags; out Count: Integer; ALanguage: string=''): String;
function UTF8LowerCase(const AInStr: string; ALanguage: string=''): string;
function UTF8LowerString(const s: string): string; inline;
@ -1159,11 +1159,11 @@ function UTF8StringReplace(const S, OldPattern, NewPattern: String;
var
DummyCount: Integer;
begin
Result := Utf8StringReplace(S, OldPattern, NewPattern, DummyCount, Flags, ALanguage);
Result := Utf8StringReplace(S, OldPattern, NewPattern, Flags, DummyCount, ALanguage);
end;
function UTF8StringReplace(const S, OldPattern, NewPattern: String; out Count: Integer;
Flags: TReplaceFlags; ALanguage: string): String;
function UTF8StringReplace(const S, OldPattern, NewPattern: String;
Flags: TReplaceFlags; out Count: Integer; ALanguage: string=''): String;
// same algorithm as StringReplace, but using UTF8LowerCase
// for case insensitive search
var