From 15704379962ffbb787fc826abcf0d9276a9b2ee3 Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Sun, 5 Jun 2016 12:18:06 +0000
Subject: [PATCH]   - reverted merge of r32824: that commit contained new
 functionality,     was buggy and broke JVM building

git-svn-id: branches/fixes_3_0@33914 -
---
 rtl/inc/ustringh.inc |  6 -----
 rtl/inc/ustrings.inc | 61 --------------------------------------------
 2 files changed, 67 deletions(-)

diff --git a/rtl/inc/ustringh.inc b/rtl/inc/ustringh.inc
index 502e9bd852..ecaf2805a7 100644
--- a/rtl/inc/ustringh.inc
+++ b/rtl/inc/ustringh.inc
@@ -133,12 +133,6 @@ function Utf8ToUnicode(Dest: PUnicodeChar; MaxDestChars: SizeUInt; Source: PChar
 function UTF8Encode(const s : RawByteString) : RawByteString; inline;
 function UTF8Encode(const s : UnicodeString) : RawByteString;
 function UTF8Decode(const s : RawByteString): UnicodeString;
-function UTF8ToString(const s : UTF8String): UnicodeString;inline;
-function UTF8ToString(const s : RawByteString): UnicodeString;inline;
-function UTF8ToString(const S: ShortString): unicodestring;
-function UTF8ToString(const S: PAnsiChar): unicodestring;
-function UTF8ToString(const S: array of AnsiChar): unicodestring;
-function UTF8ToString(const S: array of Byte): 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;
diff --git a/rtl/inc/ustrings.inc b/rtl/inc/ustrings.inc
index 88b0cb21fb..096b9b5e09 100644
--- a/rtl/inc/ustrings.inc
+++ b/rtl/inc/ustrings.inc
@@ -2357,64 +2357,3 @@ Begin
   Result:=Str;
   SetCodePage(Result,DefaultFileSystemCodePage,True);
 End;
-
-function UTF8ToString(const S: UTF8String): UnicodeString; inline;
-begin
-  Result := UTF8Decode(S);
-end;
-
-function UTF8ToString(const S: RawByteString): UnicodeString; inline;
-
-Var
-  UTF8 : UTF8String;
-
-begin
-  UTF8:=S;
-  Result := UTF8Decode(UTF8);
-end;
-
-function UTF8ToString(const S: ShortString): UnicodeString; 
-
-Var
-  UTF8 : UTF8String;
-
-begin
-  UTF8:=S;
-  Result := UTF8Decode(UTF8);
-end;
-
-function UTF8ToString(const S: PAnsiChar): UnicodeString;
-var
-  UTF: UTF8String;
-  Count: Integer;
-begin
-  Count := StrLen(S);
-  SetLength(UTF, Count);
-  if Count > 0 then
-    Move(S^, UTF[1], Count);
-  Result := UTF8ToString(UTF);
-end;
-
-function UTF8ToString(const S: array of AnsiChar): UnicodeString;
-var
-  UTF: UTF8String;
-  Count: Integer;
-begin
-  Count := Length(S);
-  SetLength(UTF, Count);
-  if Count > 0 then
-    Move(S[Low(S)], UTF[1], Count);
-  Result := UTF8ToString(UTF);
-end;
-
-function UTF8ToString(const S: array of Byte): UnicodeString;
-var
-  UTF: UTF8String;
-  Count: Integer;
-begin
-  Count := Length(S);
-  SetLength(UTF, Count);
-  if Count > 0 then
-    Move(S[Low(S)], UTF[1], Count);
-  Result := UTF8ToString(UTF);
-end;