rtl: change UTF8Decode, UTF8Encode, AnsiToUTF8, UTF8ToAnsi to use RawByteString as arguments/result for compatibility with the old code and also with delphicpstrnew

git-svn-id: http://svn.freepascal.org/svn/fpc/branches/cpstrnew@19076 3ad0048d-3df7-0310-abae-a5850022a9f2

6 files changed, 20 insertions, 20 deletions

diff --git a/rtl/inc/ustringh.inc b/rtl/inc/ustringh.inc
index 2e3dce5bb6..999e8847a1 100644
--- a/rtl/inc/ustringh.inc
+++ b/rtl/inc/ustringh.inc
@@ -110,11 +110,11 @@ function UnicodeToUtf8(Dest: PChar; Source: PUnicodeChar; MaxBytes: SizeInt): Si
 function UnicodeToUtf8(Dest: PChar; MaxDestBytes: SizeUInt; Source: PUnicodeChar; SourceChars: SizeUInt): SizeUInt;
 function Utf8ToUnicode(Dest: PUnicodeChar; Source: PChar; MaxChars: SizeInt): SizeInt;{$ifdef SYSTEMINLINE}inline;{$endif}
 function Utf8ToUnicode(Dest: PUnicodeChar; MaxDestChars: SizeUInt; Source: PChar; SourceBytes: SizeUInt): SizeUInt;
-function UTF8Encode(const s : RawByteString) : UTF8String; inline;
-function UTF8Encode(const s : UnicodeString) : UTF8String;
-function UTF8Decode(const s : UTF8String): UnicodeString;
-function AnsiToUtf8(const s : RawByteString): UTF8String;{$ifdef SYSTEMINLINE}inline;{$endif}
-function Utf8ToAnsi(const s : UTF8String) : RawByteString;{$ifdef SYSTEMINLINE}inline;{$endif}
+function UTF8Encode(const s : RawByteString) : RawByteString; inline;
+function UTF8Encode(const s : UnicodeString) : RawByteString;
+function UTF8Decode(const s : RawByteString): UnicodeString;
+function AnsiToUtf8(const s : RawByteString): RawByteString;{$ifdef SYSTEMINLINE}inline;{$endif}
+function Utf8ToAnsi(const s : RawByteString) : RawByteString;{$ifdef SYSTEMINLINE}inline;{$endif}
 function UnicodeStringToUCS4String(const s : UnicodeString) : UCS4String;
 function UCS4StringToUnicodeString(const s : UCS4String) : UnicodeString;
 function WideStringToUCS4String(const s : WideString) : UCS4String;
diff --git a/rtl/inc/ustrings.inc b/rtl/inc/ustrings.inc
index 5d36dcffad..ce28be56aa 100644
--- a/rtl/inc/ustrings.inc
+++ b/rtl/inc/ustrings.inc
@@ -2380,13 +2380,13 @@ function UTF8ToUnicode(Dest: PUnicodeChar; MaxDestChars: SizeUInt; Source: PChar
   end;
 
 
-function UTF8Encode(const s : RawByteString) : UTF8String; inline;
+function UTF8Encode(const s : RawByteString) : RawByteString; inline;
   begin
     Result:=UTF8Encode(UnicodeString(s));
   end;
 
 
-function UTF8Encode(const s : UnicodeString) : UTF8String;
+function UTF8Encode(const s : UnicodeString) : RawByteString;
   var
     i : SizeInt;
     hs : UTF8String;
@@ -2404,7 +2404,7 @@ function UTF8Encode(const s : UnicodeString) : UTF8String;
   end;
 
 
-function UTF8Decode(const s : UTF8String): UnicodeString;
+function UTF8Decode(const s : RawByteString): UnicodeString;
   var
     i : SizeInt;
     hs : UnicodeString;
@@ -2422,13 +2422,13 @@ function UTF8Decode(const s : UTF8String): UnicodeString;
   end;
 
 
-function AnsiToUtf8(const s : RawByteString): UTF8String;{$ifdef SYSTEMINLINE}inline;{$endif}
+function AnsiToUtf8(const s : RawByteString): RawByteString;{$ifdef SYSTEMINLINE}inline;{$endif}
   begin
     Result:=Utf8Encode(s);
   end;
 
 
-function Utf8ToAnsi(const s : UTF8String) : RawByteString;{$ifdef SYSTEMINLINE}inline;{$endif}
+function Utf8ToAnsi(const s : RawByteString) : RawByteString;{$ifdef SYSTEMINLINE}inline;{$endif}
   begin
     Result:=Utf8Decode(s);
   end;
diff --git a/rtl/inc/wstring22h.inc b/rtl/inc/wstring22h.inc
index d562592dff..47be86228a 100644
--- a/rtl/inc/wstring22h.inc
+++ b/rtl/inc/wstring22h.inc
@@ -83,10 +83,10 @@ function UnicodeToUtf8(Dest: PChar; Source: PWideChar; MaxBytes: SizeInt): SizeI
 function UnicodeToUtf8(Dest: PChar; MaxDestBytes: SizeUInt; Source: PWideChar; SourceChars: SizeUInt): SizeUInt;
 function Utf8ToUnicode(Dest: PWideChar; Source: PChar; MaxChars: SizeInt): SizeInt;{$ifdef SYSTEMINLINE}inline;{$endif}
 function Utf8ToUnicode(Dest: PWideChar; MaxDestChars: SizeUInt; Source: PChar; SourceBytes: SizeUInt): SizeUInt;
-function UTF8Encode(const s : WideString) : UTF8String;
-function UTF8Decode(const s : UTF8String): WideString;
-function AnsiToUtf8(const s : RawByteString): UTF8String;{$ifdef SYSTEMINLINE}inline;{$endif}
-function Utf8ToAnsi(const s : UTF8String) : ansistring;{$ifdef SYSTEMINLINE}inline;{$endif}
+function UTF8Encode(const s : WideString) : RawByteString;
+function UTF8Decode(const s : RawByteString): WideString;
+function AnsiToUtf8(const s : RawByteString): RawByteString;{$ifdef SYSTEMINLINE}inline;{$endif}
+function Utf8ToAnsi(const s : RawByteString) : ansistring;{$ifdef SYSTEMINLINE}inline;{$endif}
 function WideStringToUCS4String(const s : WideString) : UCS4String;
 function UCS4StringToWideString(const s : UCS4String) : WideString;
 
diff --git a/rtl/inc/wstringh.inc b/rtl/inc/wstringh.inc
index a4bdc09f2c..f795102291 100644
--- a/rtl/inc/wstringh.inc
+++ b/rtl/inc/wstringh.inc
@@ -41,7 +41,7 @@ function UnicodeToUtf8(Dest: PChar; Source: PWideChar; MaxBytes: SizeInt): SizeI
 function UnicodeToUtf8(Dest: PChar; MaxDestBytes: SizeUInt; Source: PWideChar; SourceChars: SizeUInt): SizeUInt;
 function Utf8ToUnicode(Dest: PWideChar; Source: PChar; MaxChars: SizeInt): SizeInt;{$ifdef SYSTEMINLINE}inline;{$endif}
 function Utf8ToUnicode(Dest: PWideChar; MaxDestChars: SizeUInt; Source: PChar; SourceBytes: SizeUInt): SizeUInt;
-function UTF8Encode(const s : WideString) : UTF8String;
+function UTF8Encode(const s : WideString) : RawByteString;
 
 {$ifdef MSWINDOWS}
 const
diff --git a/rtl/inc/wstrings.inc b/rtl/inc/wstrings.inc
index 08f3a6d16b..f1fbeb3ded 100644
--- a/rtl/inc/wstrings.inc
+++ b/rtl/inc/wstrings.inc
@@ -1650,7 +1650,7 @@ function UTF8ToUnicode(Dest: PWideChar; MaxDestChars: SizeUInt; Source: PChar; S
   end;
 
 
-function UTF8Encode(const s : WideString) : UTF8String;
+function UTF8Encode(const s : WideString) : RawByteString;
   var
     i : SizeInt;
     hs : UTF8String;
diff --git a/rtl/inc/wustring22.inc b/rtl/inc/wustring22.inc
index 638f587d4b..c0a2795d87 100644
--- a/rtl/inc/wustring22.inc
+++ b/rtl/inc/wustring22.inc
@@ -1798,7 +1798,7 @@ begin
 end;
 
 
-function UTF8Encode(const s : WideString) : UTF8String;
+function UTF8Encode(const s : WideString) : RawByteString;
   var
     i : SizeInt;
     hs : UTF8String;
@@ -1816,7 +1816,7 @@ function UTF8Encode(const s : WideString) : UTF8String;
   end;
 
 
-function UTF8Decode(const s : UTF8String): WideString;
+function UTF8Decode(const s : RawByteString): WideString;
   var
     i : SizeInt;
     hs : WideString;
@@ -1834,13 +1834,13 @@ function UTF8Decode(const s : UTF8String): WideString;
   end;
 
 
-function AnsiToUtf8(const s : ansistring): UTF8String;{$ifdef SYSTEMINLINE}inline;{$endif}
+function AnsiToUtf8(const s : ansistring): RawByteString;{$ifdef SYSTEMINLINE}inline;{$endif}
   begin
     Result:=Utf8Encode(s);
   end;
 
 
-function Utf8ToAnsi(const s : UTF8String) : ansistring;{$ifdef SYSTEMINLINE}inline;{$endif}
+function Utf8ToAnsi(const s : RawByteString) : ansistring;{$ifdef SYSTEMINLINE}inline;{$endif}
   begin
     Result:=Utf8Decode(s);
   end;