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

LazUtils: LConvEncoding: change signature of TConvertEncodingFunction analogue to all XXXToUtf8() functions. Part of issue #39348;

Browse Source
This commit is contained in:
Bart 2021-12-11 17:31:23 +01:00
parent 2a51f03e2b
commit 01e627e35d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/lazutils/lconvencoding.pas
View File

@ -108,7 +108,7 @@ function GetConsoleTextEncoding: string;
function NormalizeEncoding(const Encoding: string): string; function NormalizeEncoding(const Encoding: string): string;
type type
TConvertEncodingFunction = function(const s: string): string; TConvertEncodingFunction = function(const s: string; SetTargetCodePage: boolean = False): string;
TConvertUTF8ToEncodingFunc = function(const s: string; SetTargetCodePage: boolean = false): RawByteString; TConvertUTF8ToEncodingFunc = function(const s: string; SetTargetCodePage: boolean = false): RawByteString;
TCharToUTF8Table = CodepagesCommon.TCharToUTF8Table; TCharToUTF8Table = CodepagesCommon.TCharToUTF8Table;
TUnicodeToCharID = function(Unicode: cardinal): integer; TUnicodeToCharID = function(Unicode: cardinal): integer;
@ -2434,7 +2434,7 @@ begin
if AFrom=EncodingUCS2BE then begin Result:=UCS2BEToUTF8(s, SetTargetCodePage); exit; end; if AFrom=EncodingUCS2BE then begin Result:=UCS2BEToUTF8(s, SetTargetCodePage); exit; end;
if (AFrom=GetDefaultTextEncoding) and Assigned(ConvertAnsiToUTF8) then begin if (AFrom=GetDefaultTextEncoding) and Assigned(ConvertAnsiToUTF8) then begin
Result:=ConvertAnsiToUTF8(s); Result:=ConvertAnsiToUTF8(s, SetTargetCodePage);
exit; exit;
end; end;