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

lcl: less need for widestringmanager

Browse Source 
git-svn-id: trunk@38101 -
This commit is contained in:
mattias 2012-08-01 09:11:45 +00:00
parent 07c5091ba9
commit a5342ca134
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lcl/lclproc.pas
View File

@ -2827,15 +2827,10 @@ end;
Params: S1, S2 - UTF8 encoded strings Params: S1, S2 - UTF8 encoded strings
Returns: < 0 if S1 < S2, 0 if S1 = S2, > 0 if S2 > S1. Returns: < 0 if S1 < S2, 0 if S1 = S2, > 0 if S2 > S1.
Compare 2 UTF8 encoded strings, case sensitive. Compare 2 UTF8 encoded strings, case sensitive.
Remark: A widestring manager must be installed in order for this function
to work correctly with various character sets. eg. under unixes cwstring unit
must be included in project.
Note: Use this function instead of AnsiCompareStr.
This function guarantees proper collation on all supported platforms.
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
function UTF8CompareStr(const S1, S2: String): Integer; function UTF8CompareStr(const S1, S2: String): Integer;
begin begin
Result := WideCompareStr(UTF8ToUTF16(S1), UTF8ToUTF16(S2)); Result := LazUTF8.UTF8CompareStr(S1,S2);
end; end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------
@ -2843,15 +2838,10 @@ end;
Params: S1, S2 - UTF8 encoded strings Params: S1, S2 - UTF8 encoded strings
Returns: < 0 if S1 < S2, 0 if S1 = S2, > 0 if S2 > S1. Returns: < 0 if S1 < S2, 0 if S1 = S2, > 0 if S2 > S1.
Compare 2 UTF8 encoded strings, case insensitive. Compare 2 UTF8 encoded strings, case insensitive.
Remark: A widestring manager must be installed in order for this function
to work correctly with various character sets. eg. under unixes cwstring unit
must be included in project.
Note: Use this function instead of AnsiCompareText.
This function guarantees proper collation on all supported platforms.
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
function UTF8CompareText(const S1, S2: String): Integer; function UTF8CompareText(const S1, S2: String): Integer;
begin begin
Result := WideCompareText(UTF8ToUTF16(S1), UTF8ToUTF16(S2)); Result := LazUTF8.UTF8CompareText(S1,S2);
end; end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------