diff options
Diffstat (limited to 'cpp/src/Ice/PropertiesI.cpp')
| -rw-r--r-- | cpp/src/Ice/PropertiesI.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp index 51a5ae151e7..d348255cda5 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::stringToWstring(file, _converter).substr(5).c_str(); + const wstring keyName = 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,7 +350,7 @@ Ice::PropertiesI::load(const std::string& file) getProcessLogger()->warning(os.str()); continue; } - string name = IceUtil::wstringToString( + string name = wstringToString( wstring(reinterpret_cast<wchar_t*>(&nameBuf[0]), nameBufSize), _converter); if(keyType != REG_SZ && keyType != REG_EXPAND_SZ) { @@ -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::wstringToString(valueW, _converter); + value = wstringToString(valueW, _converter); } else // keyType == REG_EXPAND_SZ { @@ -384,7 +384,7 @@ Ice::PropertiesI::load(const std::string& file) continue; } } - value = IceUtil::wstringToString(wstring(&expandedValue[0], sz -1), _converter); + value = wstringToString(wstring(&expandedValue[0], sz -1), _converter); } setProperty(name, value); } @@ -460,12 +460,12 @@ Ice::PropertiesI::PropertiesI(const PropertiesI* p) : { } -Ice::PropertiesI::PropertiesI(const IceUtil::StringConverterPtr& converter) : +Ice::PropertiesI::PropertiesI(const StringConverterPtr& converter) : _converter(converter) { } -Ice::PropertiesI::PropertiesI(StringSeq& args, const PropertiesPtr& defaults, const IceUtil::StringConverterPtr& converter) : +Ice::PropertiesI::PropertiesI(StringSeq& args, const PropertiesPtr& defaults, const StringConverterPtr& converter) : _converter(converter) { if(defaults != 0) @@ -537,7 +537,7 @@ Ice::PropertiesI::PropertiesI(StringSeq& args, const PropertiesPtr& defaults, co } void -Ice::PropertiesI::parseLine(const string& line, const IceUtil::StringConverterPtr& converter) +Ice::PropertiesI::parseLine(const string& line, const StringConverterPtr& converter) { string key; string value; @@ -702,8 +702,8 @@ Ice::PropertiesI::parseLine(const string& line, const IceUtil::StringConverterPt return; } - key = IceUtil::UTF8ToNative(key, converter); - value = IceUtil::UTF8ToNative(value, converter); + key = UTF8ToNative(key, converter); + value = UTF8ToNative(value, converter); setProperty(key, value); } @@ -728,7 +728,7 @@ Ice::PropertiesI::loadConfig() } if(ret > 0) { - value = IceUtil::wstringToString(wstring(&v[0], ret), _converter); + value = wstringToString(wstring(&v[0], ret), _converter); } else { |