diff options
| author | Bernard Normier <bernard@zeroc.com> | 2014-05-16 10:42:54 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2014-05-16 10:42:54 -0400 |
| commit | 5c41870b1df650b874069095fab2d29e93c76d3f (patch) | |
| tree | acbdeba2738a258f05b26c4f2597d7ba80fa7a2d /cpp/src/Ice/PropertiesI.cpp | |
| parent | Fixed ICE-710: error handling test for Unicode functions (diff) | |
| download | ice-5c41870b1df650b874069095fab2d29e93c76d3f.tar.bz2 ice-5c41870b1df650b874069095fab2d29e93c76d3f.tar.xz ice-5c41870b1df650b874069095fab2d29e93c76d3f.zip | |
Renamed wnativeToNative/nativeToWnative to wstringToString/stringToWstring
Diffstat (limited to 'cpp/src/Ice/PropertiesI.cpp')
| -rw-r--r-- | cpp/src/Ice/PropertiesI.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp index b8642c3af78..b466a2cf105 100644 --- a/cpp/src/Ice/PropertiesI.cpp +++ b/cpp/src/Ice/PropertiesI.cpp @@ -303,7 +303,7 @@ Ice::PropertiesI::load(const std::string& file) if(file.find("HKLM\\") == 0) { HKEY iceKey; - const wstring keyName = IceUtil::nativeToWnative(_converter, 0, file).substr(5).c_str(); + const wstring keyName = IceUtil::stringToWstring(file, _converter).substr(5).c_str(); LONG err; if((err = RegOpenKeyExW(HKEY_LOCAL_MACHINE, keyName.c_str(), 0, KEY_QUERY_VALUE, &iceKey)) != ERROR_SUCCESS) { @@ -350,8 +350,8 @@ Ice::PropertiesI::load(const std::string& file) getProcessLogger()->warning(os.str()); continue; } - string name = IceUtil::wnativeToNative(_converter, 0, - wstring(reinterpret_cast<wchar_t*>(&nameBuf[0]), nameBufSize)); + string name = IceUtil::wstringToString( + wstring(reinterpret_cast<wchar_t*>(&nameBuf[0]), nameBufSize), _converter); if(keyType != REG_SZ && keyType != REG_EXPAND_SZ) { ostringstream os; @@ -364,7 +364,7 @@ Ice::PropertiesI::load(const std::string& file) wstring valueW = wstring(reinterpret_cast<wchar_t*>(&dataBuf[0]), (dataBufSize / sizeof(wchar_t)) - 1); if(keyType == REG_SZ) { - value = IceUtil::wnativeToNative(_converter, 0, valueW); + value = IceUtil::wstringToString(valueW, _converter); } else // keyType == REG_EXPAND_SZ { @@ -384,7 +384,7 @@ Ice::PropertiesI::load(const std::string& file) continue; } } - value = IceUtil::wnativeToNative(_converter, 0, wstring(&expandedValue[0], sz -1)); + value = IceUtil::wstringToString(wstring(&expandedValue[0], sz -1), _converter); } setProperty(name, value); } @@ -728,7 +728,7 @@ Ice::PropertiesI::loadConfig() } if(ret > 0) { - value = IceUtil::wnativeToNative(_converter, 0, wstring(&v[0], ret)); + value = IceUtil::wstringToString(wstring(&v[0], ret), _converter); } else { |