|
@@ -2361,6 +2361,13 @@ begin
|
|
|
Result := UTF8Decode(S);
|
|
|
end;
|
|
|
|
|
|
+function UTF8ToUnicodeString(const s : RawByteString): UnicodeString;
|
|
|
+begin
|
|
|
+ Result := UTF8Decode(S);
|
|
|
+end;
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
function UTF8ToString(const S: ShortString): UnicodeString;
|
|
|
Var
|
|
|
rs: RawByteString;
|
|
@@ -2369,6 +2376,11 @@ begin
|
|
|
Result := UTF8Decode(rs);
|
|
|
end;
|
|
|
|
|
|
+function UTF8ToUnicodeString(const S: ShortString): unicodestring;
|
|
|
+begin
|
|
|
+ Result:=UTF8ToString(S);
|
|
|
+end;
|
|
|
+
|
|
|
function UTF8ToString(const S: PAnsiChar): UnicodeString;
|
|
|
var
|
|
|
rs: RawByteString;
|
|
@@ -2381,6 +2393,12 @@ begin
|
|
|
Result := UTF8ToString(rs);
|
|
|
end;
|
|
|
|
|
|
+function UTF8ToUnicodeString(const S: PAnsiChar): unicodestring;
|
|
|
+
|
|
|
+begin
|
|
|
+ Result:=UTF8ToString(S);
|
|
|
+end;
|
|
|
+
|
|
|
{ byte and ansichar are the same on the JVM, and "array of" and "pointer to"
|
|
|
are as well }
|
|
|
{$ifndef CPUJVM}
|