Renamed wnativeToNative/nativeToWnative to wstringToString/stringToWstring

1 files changed, 11 insertions, 11 deletions

diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp
index 1b1bb3f6d04..c67ab7af6fe 100644
--- a/cpp/src/IceGrid/Activator.cpp
+++ b/cpp/src/IceGrid/Activator.cpp
@@ -380,9 +380,9 @@ Activator::activate(const string& name,
             
             //
             // IceGrid doesn't support to use string converters, so don't need to use
-            // any string converter in wnativeToNative conversions.
+            // any string converter in wstringToString conversions.
             //
-            if(SearchPathW(NULL, IceUtil::nativeToWnative(0, 0, path).c_str(), ext.c_str(), _MAX_PATH, absbuf, &fPart) == 0)
+            if(SearchPathW(NULL, IceUtil::stringToWstring(path).c_str(), ext.c_str(), _MAX_PATH, absbuf, &fPart) == 0)
             {
                 if(_traceLevels->activator > 0)
                 {
@@ -391,7 +391,7 @@ Activator::activate(const string& name,
                 }
                 throw string("Couldn't find `" + path + "' executable.");
             }
-            path = IceUtil::wnativeToNative(0, 0, absbuf);
+            path = IceUtil::wstringToString(absbuf);
         }
         else if(!pwd.empty())
         {
@@ -403,13 +403,13 @@ Activator::activate(const string& name,
     // Get the absolute pathname of the working directory.
     //
     // IceGrid doesn't support to use string converters, so
-    // don't need to use any string converter in nativeToWnative
+    // don't need to use any string converter in stringToWstring
     // conversions.
     //
     if(!pwd.empty())
     {
         wchar_t absbuf[_MAX_PATH];
-        if(_wfullpath(absbuf, IceUtil::nativeToWnative(0, 0, pwd).c_str(), _MAX_PATH) == NULL)
+        if(_wfullpath(absbuf, IceUtil::stringToWstring(pwd).c_str(), _MAX_PATH) == NULL)
         {
             if(_traceLevels->activator > 0)
             {
@@ -418,7 +418,7 @@ Activator::activate(const string& name,
             }
             throw string("The server working directory path `" + pwd + "' can't be converted into an absolute path.");
         }
-        pwd = IceUtil::wnativeToNative(0, 0, absbuf);
+        pwd = IceUtil::wstringToString(absbuf);
     }
 #endif
 
@@ -495,15 +495,15 @@ Activator::activate(const string& name,
 
     //
     // IceGrid doesn't support to use string converters, so don't need to use
-    // any string converter in nativeToWnative conversions.
+    // any string converter in stringToWstring conversions.
     //
-    wstring wpwd = IceUtil::nativeToWnative(0, 0, pwd);
+    wstring wpwd = IceUtil::stringToWstring(pwd);
     const wchar_t* dir = !wpwd.empty() ? wpwd.c_str() : NULL;
 
     //
     // Make a copy of the command line.
     //
-    wchar_t* cmdbuf = _wcsdup(IceUtil::nativeToWnative(0, 0, cmd).c_str());
+    wchar_t* cmdbuf = _wcsdup(IceUtil::stringToWstring(cmd).c_str());
 
     //
     // Create the environment block for the child process. We start with the environment
@@ -545,9 +545,9 @@ Activator::activate(const string& name,
         {
             //
             // IceGrid doesn't support to use string converters, so don't need to use
-            // any string converter in nativeToWnative conversions.
+            // any string converter in stringToWstring conversions.
             //
-            wstring s = IceUtil::nativeToWnative(0, 0, *p);
+            wstring s = IceUtil::stringToWstring(*p);
             wstring::size_type pos = s.find(L'=');
             if(pos != wstring::npos)
             {