From ddf1bb4d0fdcf79e1aed0a42339c8ccd566b3c5c Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Tue, 24 Dec 2024 22:41:52 +0800
Subject: [PATCH] Use U8String/U16String/WString instead of
 UTF8String/UTF16String/WideString

---
 DistributionChart2D.cpp      | 12 ++++++------
 datatype/SplitStringTest.cpp | 12 ++++++------
 time/time_count.cpp          |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/DistributionChart2D.cpp b/DistributionChart2D.cpp
index 2bdc544..75058e4 100644
--- a/DistributionChart2D.cpp
+++ b/DistributionChart2D.cpp
@@ -84,7 +84,7 @@ enum class DataSourceType
     TwoPosition,
 };
 
-DataSourceType CheckDataSourceType(const UTF8String &str)
+DataSourceType CheckDataSourceType(const U8String &str)
 {
     if(str.Length()<=11)return(DataSourceType::Error);
 
@@ -99,7 +99,7 @@ DataSourceType CheckDataSourceType(const UTF8String &str)
     return(DataSourceType::Error);
 }
 
-bool ParsePosition(Vector2i *result,const UTF8String &str)
+bool ParsePosition(Vector2i *result,const U8String &str)
 {
     if(!result)return(false);
 
@@ -149,7 +149,7 @@ struct LineSegment
 
 using LineSegmentData=List<LineSegment>;
 
-bool ParseLineSegment(LineSegment *result,const UTF8String &str)
+bool ParseLineSegment(LineSegment *result,const U8String &str)
 {
     if(!result)return(false);
 
@@ -189,7 +189,7 @@ bool ParseLineSegment(LineSegment *result,const UTF8String &str)
 }
 
 template<typename T>
-void ParseStringList(List<T> &data_list,const UTF8StringList &sl,bool (*ParseLineFunc)(T *,const UTF8String &))
+void ParseStringList(List<T> &data_list,const U8StringList &sl,bool (*ParseLineFunc)(T *,const U8String &))
 {
     const uint count=sl.GetCount();
 
@@ -197,7 +197,7 @@ void ParseStringList(List<T> &data_list,const UTF8StringList &sl,bool (*ParseLin
 
     T *p=data_list.GetData();
 
-    UTF8String str;
+    U8String str;
     uint result=0;
 
     for(uint i=0;i<count;i++)
@@ -596,7 +596,7 @@ int os_main(int argc,os_char **argv)
         return 2;
     }
 
-    UTF8StringList sl;
+    U8StringList sl;
 
     csv_filename=argv[1];
 
diff --git a/datatype/SplitStringTest.cpp b/datatype/SplitStringTest.cpp
index 24e10f3..0039633 100644
--- a/datatype/SplitStringTest.cpp
+++ b/datatype/SplitStringTest.cpp
@@ -4,7 +4,7 @@
 using namespace hgl;
 using namespace std;
 
-void Output(UTF8StringList &sl,const char *str)
+void Output(U8StringList &sl,const char *str)
 {
     cout<<str<<": ";
 
@@ -17,14 +17,14 @@ void Output(UTF8StringList &sl,const char *str)
 
 int main(int,char **)
 {
-    UTF8StringList sl;
+    U8StringList sl;
 
-    UTF8String str=u8"hello game world!";
+    U8String str=u8"hello game world!";
     
     {
-        UTF8String left,right;
+        U8String left,right;
 
-        SpliteByString(str, UTF8String(u8"game"), &left, &right);
+        SpliteByString(str, U8String(u8"game"), &left, &right);
 
         cout<<"SpliteByString"<<endl;
         cout << "left: \"" <<(char *) left.c_str() <<"\"" << endl;
@@ -87,7 +87,7 @@ int main(int,char **)
         str=u8"#include<hello.h>\n"
             "#include\"world.h\"\n";
 
-        SplitToStringListByChars(sl,str,UTF8String(u8"<>\"\n"));
+        SplitToStringListByChars(sl,str,U8String(u8"<>\"\n"));
         
         Output(sl,"SplitToStringListByChars");
     }
diff --git a/time/time_count.cpp b/time/time_count.cpp
index 281c5f2..29644d5 100644
--- a/time/time_count.cpp
+++ b/time/time_count.cpp
@@ -17,7 +17,7 @@ int main(int,char **)
 
     ToDateTime(d,t,cur_time);
 
-    UTF8String str=UTF8String::floatOf(cur_time,TIME_OUT_FRAC);
+    U8String str=U8String::floatOf(cur_time,TIME_OUT_FRAC);
 
     cout<<"cur_time="<<str.c_str()<<endl;
     cout<<"\tyear="<<d.GetYear()<<" month="<<d.GetMonth()<<" day="<<d.GetDay()<<endl;
@@ -26,7 +26,7 @@ int main(int,char **)
 
     const double new_time=FromDateTime(d,t);
 
-    str=UTF8String::floatOf(new_time,TIME_OUT_FRAC);
+    str=U8String::floatOf(new_time,TIME_OUT_FRAC);
     cout<<"new_time="<<str.c_str()<<endl;
 
     cout<<"TimeZone:"<<GetTimeZone()<<endl;