Renamed wnativeToNative/nativeToWnative to wstringToString/stringToWstring

5 files changed, 17 insertions, 20 deletions

diff --git a/cpp/test/Ice/custom/StringConverterI.cpp b/cpp/test/Ice/custom/StringConverterI.cpp
index dc1e2cfdbba..a879c58b9bb 100644
--- a/cpp/test/Ice/custom/StringConverterI.cpp
+++ b/cpp/test/Ice/custom/StringConverterI.cpp
@@ -8,7 +8,6 @@
 // **********************************************************************
 
 #include <StringConverterI.h>
-#include <IceUtil/Unicode.h>
 
 using namespace std;
 using namespace IceUtil;
@@ -48,7 +47,7 @@ Byte*
 Test::WstringConverterI::toUTF8(const wchar_t* sourceStart, const wchar_t* sourceEnd, IceUtil::UTF8Buffer& buffer) const
 {
     wstring ws(sourceStart, sourceEnd);
-    string s = IceUtil::wnativeToNative(0, 0, ws);
+    string s = IceUtil::wstringToString(ws);
 
     size_t size = s.size();
     Byte* targetStart = buffer.getMoreBytes(size, 0);
@@ -76,6 +75,6 @@ Test::WstringConverterI::fromUTF8(const Byte* sourceStart, const Byte* sourceEnd
         s[i] = sourceStart[--j];
     }
 
-    target = IceUtil::nativeToWnative(0, 0, s);
+    target = IceUtil::stringToWstring(s);
 }
 
diff --git a/cpp/test/Ice/stringConverter/Server.cpp b/cpp/test/Ice/stringConverter/Server.cpp
index 4b9c6a78c20..7b0f9bcc978 100644
--- a/cpp/test/Ice/stringConverter/Server.cpp
+++ b/cpp/test/Ice/stringConverter/Server.cpp
@@ -31,14 +31,14 @@ public:
             throw Test::BadEncodingException();
         }
 
-        return IceUtil::nativeToWnative(IceUtil::getProcessStringConverter(),
-                                        IceUtil::getProcessWstringConverter(), msg);
+        return IceUtil::stringToWstring(msg, IceUtil::getProcessStringConverter(),
+                                        IceUtil::getProcessWstringConverter());
     }
     
     virtual string narrow(const wstring& wmsg, const Ice::Current&)
     {
-        return IceUtil::wnativeToNative(IceUtil::getProcessStringConverter(),
-                                        IceUtil::getProcessWstringConverter(), wmsg);
+        return IceUtil::wstringToString(wmsg, IceUtil::getProcessStringConverter(),
+                                        IceUtil::getProcessWstringConverter());
     }
     
     virtual void shutdown(const Ice::Current& current)
diff --git a/cpp/test/IceGrid/deployer/Server.cpp b/cpp/test/IceGrid/deployer/Server.cpp
index 3d576116fa4..7673e082a6e 100644
--- a/cpp/test/IceGrid/deployer/Server.cpp
+++ b/cpp/test/IceGrid/deployer/Server.cpp
@@ -80,13 +80,13 @@ main(int argc, char* argv[])
 
 #if defined(_WIN32)
     wchar_t* value2 = _wgetenv(L"MY_ENV_UNICODE_VARIABLE");
-    test(value2 != 0 && wstring(value2) == IceUtil::nativeToWnative(0, 0, unicodeVar));
+    test(value2 != 0 && wstring(value2) == IceUtil::stringToWstring(unicodeVar));
 
-    wchar_t* value3 = _wgetenv(IceUtil::nativeToWnative(0, 0, varname1).c_str());
+    wchar_t* value3 = _wgetenv(IceUtil::stringToWstring(varname1).c_str());
     test(value3 != 0 && wstring(value3) == L"2");
 
     // Environment variables are case insensitive on Windows.
-    wchar_t* value4 = _wgetenv(IceUtil::nativeToWnative(0, 0, varname1).c_str());
+    wchar_t* value4 = _wgetenv(IceUtil::stringToWstring(varname1).c_str());
     test(value4 != 0 && wstring(value4) == L"2");
 
     char* value5 = getenv("MY_WINDOWS_COMPOSED_VARIABLE");
diff --git a/cpp/test/IceUtil/inputUtil/Client.cpp b/cpp/test/IceUtil/inputUtil/Client.cpp
index 27a4a6522d3..d4f14acec12 100644
--- a/cpp/test/IceUtil/inputUtil/Client.cpp
+++ b/cpp/test/IceUtil/inputUtil/Client.cpp
@@ -7,7 +7,6 @@
 //
 // **********************************************************************
 
-#include <IceUtil/Unicode.h>
 #include <IceUtil/InputUtil.h>
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/Options.h>
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&)
             {}
         }