- WideStringUpperCase moved to UUnicodeUtils.pas

- WideCharUpperCase removed as single characters (code-point) can be represented by two WideChars (surrogates). Convert to UCS4 instead (one code-point <-> one UCS4Char).
- UCS4 functions added to UUUnicodeUtils
- string replaced with UTF8String (although it's just a typedef) to mark UTF8 strings.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1507 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 10 insertions, 7 deletions

diff --git a/unicode/src/screens/UScreenSing.pas b/unicode/src/screens/UScreenSing.pas
index 5783366d..1be1371e 100644
--- a/unicode/src/screens/UScreenSing.pas
+++ b/unicode/src/screens/UScreenSing.pas
@@ -34,10 +34,12 @@ interface
 {$I switches.inc}
 
 
-uses UMenu,
-  UMusic,
+uses
   SDL,
   SysUtils,
+  gl,
+  UMenu,
+  UMusic,
   UFiles,
   UTime,
   USongs,
@@ -46,7 +48,6 @@ uses UMenu,
   UTexture,
   ULyrics,
   TextGL,
-  gl,
   UThemes,
   UGraphicClasses,
   USingScores;
@@ -119,14 +120,16 @@ type
 
 implementation
 
-uses UGraphic,
+uses
+  Classes,
+  Math,
+  UGraphic,
   UDraw,
   UMain,
   USong,
-  Classes,
   URecord,
   ULanguage,
-  Math;
+  UUnicodeUtils;
 
  // Method for input parsing. If False is returned, GetNextWindow
  // should be checked to know the next window to load;
@@ -137,7 +140,7 @@ begin
   if (PressedDown) then
   begin // Key Down
         // check normal keys
-    case WideCharUpperCase(CharCode)[1] of
+    case WideStringUpperCase(CharCode)[1] of
       'Q':
       begin
         //When not ask before Exit then Finish now