From 5c41870b1df650b874069095fab2d29e93c76d3f Mon Sep 17 00:00:00 2001
From: Bernard Normier <bernard@zeroc.com>
Date: Fri, 16 May 2014 10:42:54 -0400
Subject: Renamed wnativeToNative/nativeToWnative to
 wstringToString/stringToWstring

---
 cpp/test/IceUtil/unicode/Client.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'cpp/test/IceUtil/unicode/Client.cpp')

diff --git a/cpp/test/IceUtil/unicode/Client.cpp b/cpp/test/IceUtil/unicode/Client.cpp
index 63c2658dc32..62e115ce82e 100644
--- a/cpp/test/IceUtil/unicode/Client.cpp
+++ b/cpp/test/IceUtil/unicode/Client.cpp
@@ -7,7 +7,6 @@
 //
 // **********************************************************************
 
-#include <IceUtil/Unicode.h>
 #include <IceUtil/FileUtil.h>
 #include <IceUtil/StringConverter.h>
 #include <TestCommon.h>
@@ -22,7 +21,7 @@ using namespace IceUtil;
 using namespace std;
 
 //
-// Note that each file starts with a BOM; nativeToWnative and wnativeToNative
+// Note that each file starts with a BOM; stringToWstring and wstringToString
 // converts these BOMs back and forth.
 //
 
@@ -48,7 +47,7 @@ main(int argc, char* argv[])
 #   ifdef __MINGW32__
         dir = argv[1];
 #   else
-        dir = IceUtil::wnativeToNative(0, 0, argv[1]);
+        dir = IceUtil::wstringToString(argv[1]);
 #   endif
         dir += "\\";
 #else
@@ -84,7 +83,7 @@ main(int argc, char* argv[])
             test(isLegalUTF8Sequence(reinterpret_cast<const Byte*>(line.data()), 
                                      reinterpret_cast<const Byte*>(line.data() + line.size())));
             lineNumber++;
-            wstring wline = nativeToWnative(0, 0, line);
+            wstring wline = stringToWstring(line);
             
             for(size_t i = 0; i < wline.length(); ++i)
             {
@@ -157,7 +156,7 @@ main(int argc, char* argv[])
             }
         } while(bis.good());
         
-        string s = wnativeToNative(0, 0, ws);
+        string s = wstringToString(ws);
         
         IceUtilInternal::ifstream nbis((dir + "coeur.utf8"), ios_base::binary);
         test(nbis.good());
@@ -208,10 +207,10 @@ main(int argc, char* argv[])
 
             try
             {
-                wstring ws = IceUtil::nativeToWnative(0, 0, badUTF8[i]);
+                wstring ws = IceUtil::stringToWstring(badUTF8[i]);
                 test(false);
             }
-            catch(const IceUtil::UTFConversionException&)
+            catch(const IceUtil::IllegalConversionException&)
             {}
         }     
 
@@ -225,10 +224,10 @@ main(int argc, char* argv[])
         {
             try
             {
-                string s = IceUtil::wnativeToNative(0, 0, badWstring[i]);
+                string s = IceUtil::wstringToString(badWstring[i]);
                 test(false);
             }
-            catch(const IceUtil::UTFConversionException&)
+            catch(const IceUtil::IllegalConversionException&)
             {}
         }
 
-- 
cgit v1.2.3