From e9c6f1c15261103d0d036f72d94d9eb9d1448f42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= <michael@freepascal.org>
Date: Thu, 18 Jan 2024 09:32:05 +0100
Subject: [PATCH] * Delphi-compatible overloads UTF8ToUnicodeString

---
 rtl/inc/ustringh.inc |  5 +++++
 rtl/inc/ustrings.inc | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/rtl/inc/ustringh.inc b/rtl/inc/ustringh.inc
index d57841ccd6..d2a72f11ba 100644
--- a/rtl/inc/ustringh.inc
+++ b/rtl/inc/ustringh.inc
@@ -142,6 +142,11 @@ function UTF8Decode(const s : RawByteString): UnicodeString;
 function UTF8ToString(const s : RawByteString): UnicodeString;inline;
 function UTF8ToString(const S: ShortString): unicodestring;
 function UTF8ToString(const S: PAnsiChar): unicodestring;
+// Delphi compatibility overloads...
+function UTF8ToUnicodeString(const s : RawByteString): UnicodeString;inline;
+function UTF8ToUnicodeString(const S: ShortString): unicodestring;inline;
+function UTF8ToUnicodeString(const S: PAnsiChar): unicodestring;inline;
+
 { byte and ansichar are the same on the JVM, and "array of" and "pointer to"
   are as well }
 {$ifndef CPUJVM}
diff --git a/rtl/inc/ustrings.inc b/rtl/inc/ustrings.inc
index d49fbc8099..9c7a17d1ee 100644
--- a/rtl/inc/ustrings.inc
+++ b/rtl/inc/ustrings.inc
@@ -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}