Move StringConverter API to namespace Ice

4 files changed, 14 insertions, 15 deletions

diff --git a/cpp/src/IceSSL/Certificate.cpp b/cpp/src/IceSSL/Certificate.cpp
index 1d1a545e7a4..92374649035 100755
--- a/cpp/src/IceSSL/Certificate.cpp
+++ b/cpp/src/IceSSL/Certificate.cpp
@@ -512,12 +512,12 @@ certificateAltNames(CERT_INFO* certInfo, LPCSTR altNameOID)
             {
                 case CERT_ALT_NAME_RFC822_NAME:
                 {
-                    altNames.push_back(make_pair(AltNameEmail, IceUtil::wstringToString(entry->pwszRfc822Name)));
+                    altNames.push_back(make_pair(AltNameEmail, wstringToString(entry->pwszRfc822Name)));
                     break;
                 }
                 case CERT_ALT_NAME_DNS_NAME:
                 {
-                    altNames.push_back(make_pair(AltNameDNS, IceUtil::wstringToString(entry->pwszDNSName)));
+                    altNames.push_back(make_pair(AltNameDNS, wstringToString(entry->pwszDNSName)));
                     break;
                 }
                 case CERT_ALT_NAME_DIRECTORY_NAME:
@@ -527,7 +527,7 @@ certificateAltNames(CERT_INFO* certInfo, LPCSTR altNameOID)
                 }
                 case CERT_ALT_NAME_URL:
                 {
-                    altNames.push_back(make_pair(AltNameURL, IceUtil::wstringToString(entry->pwszURL)));
+                    altNames.push_back(make_pair(AltNameURL, wstringToString(entry->pwszURL)));
                     break;
                 }
                 case CERT_ALT_NAME_IP_ADDRESS:
@@ -576,19 +576,19 @@ certificateAltNames(Windows::Security::Cryptography::Certificates::SubjectAltern
     vector<pair<int, string> > altNames;
     for (auto iter = subAltNames->EmailName->First(); iter->HasCurrent; iter->MoveNext())
     {
-        altNames.push_back(make_pair(AltNameEmail, IceUtil::wstringToString(iter->Current->Data())));
+        altNames.push_back(make_pair(AltNameEmail, wstringToString(iter->Current->Data())));
     }
     for (auto iter = subAltNames->DnsName->First(); iter->HasCurrent; iter->MoveNext())
     {
-        altNames.push_back(make_pair(AltNameDNS, IceUtil::wstringToString(iter->Current->Data())));
+        altNames.push_back(make_pair(AltNameDNS, wstringToString(iter->Current->Data())));
     }
     for (auto iter = subAltNames->Url->First(); iter->HasCurrent; iter->MoveNext())
     {
-        altNames.push_back(make_pair(AltNameURL, IceUtil::wstringToString(iter->Current->Data())));
+        altNames.push_back(make_pair(AltNameURL, wstringToString(iter->Current->Data())));
     }
     for (auto iter = subAltNames->IPAddress->First(); iter->HasCurrent; iter->MoveNext())
     {
-        altNames.push_back(make_pair(AltNAmeIP, IceUtil::wstringToString(iter->Current->Data())));
+        altNames.push_back(make_pair(AltNAmeIP, wstringToString(iter->Current->Data())));
     }
     return altNames;
 }
@@ -1542,7 +1542,7 @@ Certificate::getIssuerDN() const
 #elif defined(ICE_USE_OPENSSL)
     return DistinguishedName(RFC2253::parseStrict(convertX509NameToString(X509_get_issuer_name(_cert))));
 #elif defined(ICE_OS_WINRT)
-    return DistinguishedName(IceUtil::wstringToString(_cert->Issuer->Data()));
+    return DistinguishedName(wstringToString(_cert->Issuer->Data()));
 #else
 #   error "Unknown platform"
 #endif
@@ -1588,7 +1588,7 @@ Certificate::getSubjectDN() const
 #elif defined(ICE_USE_OPENSSL)
     return DistinguishedName(RFC2253::parseStrict(convertX509NameToString(X509_get_subject_name(_cert))));
 #elif defined(ICE_OS_WINRT)
-    return DistinguishedName(IceUtil::wstringToString(_cert->Subject->Data()));
+    return DistinguishedName(wstringToString(_cert->Subject->Data()));
 #else
 #   error "Unknown platform"
 #endif
diff --git a/cpp/src/IceSSL/OpenSSLEngine.cpp b/cpp/src/IceSSL/OpenSSLEngine.cpp
index 04409461957..0a248126467 100644
--- a/cpp/src/IceSSL/OpenSSLEngine.cpp
+++ b/cpp/src/IceSSL/OpenSSLEngine.cpp
@@ -19,7 +19,6 @@
 #include <Ice/LoggerUtil.h>
 #include <Ice/Properties.h>
 
-#include <IceUtil/StringConverter.h>
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/Mutex.h>
 #include <IceUtil/MutexPtrLock.h>
diff --git a/cpp/src/IceSSL/SChannelEngine.cpp b/cpp/src/IceSSL/SChannelEngine.cpp
index c8b2885909a..de509399d0b 100644
--- a/cpp/src/IceSSL/SChannelEngine.cpp
+++ b/cpp/src/IceSSL/SChannelEngine.cpp
@@ -395,7 +395,7 @@ SChannelEngine::initialize()
             do
             {
                 string s = password(false);
-                store = PFXImportCertStore(&pfxBlob, stringToWstring(s).c_str(), importFlags);
+                store = PFXImportCertStore(&pfxBlob, Ice::stringToWstring(s).c_str(), importFlags);
                 err = store ? 0 : GetLastError();
             }
             while(err == ERROR_INVALID_PASSWORD && passwordPrompt && ++count < passwordRetryMax);
@@ -537,7 +537,7 @@ SChannelEngine::initialize()
                 //
                 // Create a new RSA key set to store our key
                 //
-                const wstring keySetName = stringToWstring(generateUUID());
+                const wstring keySetName = Ice::stringToWstring(generateUUID());
                 HCRYPTPROV cryptProv = 0;
 
                 DWORD contextFlags = CRYPT_NEWKEYSET;
diff --git a/cpp/src/IceSSL/Util.cpp b/cpp/src/IceSSL/Util.cpp
index 5dc8bcf4b42..d75d8da861a 100755
--- a/cpp/src/IceSSL/Util.cpp
+++ b/cpp/src/IceSSL/Util.cpp
@@ -1457,7 +1457,7 @@ IceSSL::findCertificates(const string& location, const string& name, const strin
         storeLoc = CERT_SYSTEM_STORE_LOCAL_MACHINE;
     }
 
-    HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, storeLoc, stringToWstring(name).c_str());
+    HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, storeLoc, Ice::stringToWstring(name).c_str());
     if(!store)
     {
         throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: failed to open certificate store `" + name +
@@ -1558,13 +1558,13 @@ IceSSL::findCertificates(const string& location, const string& name, const strin
 
                 if(field == "SUBJECT" || field == "ISSUER")
                 {
-                    const wstring argW = stringToWstring(arg);
+                    const wstring argW = Ice::stringToWstring(arg);
                     DWORD findType = field == "SUBJECT" ? CERT_FIND_SUBJECT_STR : CERT_FIND_ISSUER_STR;
                     addMatchingCertificates(store, tmpStore, findType, argW.c_str());
                 }
                 else if(field == "SUBJECTDN" || field == "ISSUERDN")
                 {
-                    const wstring argW = stringToWstring(arg);
+                    const wstring argW = Ice::stringToWstring(arg);
                     DWORD flags[] = {
                         CERT_OID_NAME_STR,
                         CERT_OID_NAME_STR | CERT_NAME_STR_REVERSE_FLAG,