1 files changed, 16 insertions, 20 deletions

diff --git a/src/lib/arch/win32/ArchInternetWindows.cpp b/src/lib/arch/win32/ArchInternetWindows.cpp
index 7f69c7f..8a28fde 100644
--- a/src/lib/arch/win32/ArchInternetWindows.cpp
+++ b/src/lib/arch/win32/ArchInternetWindows.cpp
@@ -18,6 +18,7 @@
 #include "arch/win32/ArchInternetWindows.h"
 #include "arch/win32/XArchWindows.h"
 #include "arch/Arch.h"
+#include "base/String.h"
 #include "common/Version.h"
 
 #include <sstream>
@@ -25,19 +26,19 @@
 #include <Shlwapi.h>
 
 struct WinINetUrl {
-    String                m_scheme;
-    String                m_host;
-    String                m_path;
+    std::string m_scheme;
+    std::string m_host;
+    std::string m_path;
     INTERNET_PORT        m_port;
     DWORD                m_flags;
 };
 
 class WinINetRequest {
 public:
-    WinINetRequest(const String& url);
+    WinINetRequest(const std::string& url);
     ~WinINetRequest();
 
-    String                send();
+    std::string send();
     void                openSession();
     void                connect();
     void                openRequest();
@@ -54,15 +55,13 @@ private:
 // ArchInternetWindows
 //
 
-String
-ArchInternetWindows::get(const String& url)
+std::string ArchInternetWindows::get(const std::string& url)
 {
     WinINetRequest request(url);
     return request.send();
 }
 
-String
-ArchInternetWindows::urlEncode(const String& url)
+std::string ArchInternetWindows::urlEncode(const std::string& url)
 {
     TCHAR buffer[1024];
     DWORD bufferSize = sizeof(buffer);
@@ -71,7 +70,7 @@ ArchInternetWindows::urlEncode(const String& url)
         throw XArch(new XArchEvalWindows());
     }
 
-    String result(buffer);
+    std::string result(buffer);
 
     // the win32 url encoding funcitons are pretty useless (to us) and only
     // escape "unsafe" chars, but not + or =, so we need to replace these
@@ -86,9 +85,9 @@ ArchInternetWindows::urlEncode(const String& url)
 // WinINetRequest
 //
 
-static WinINetUrl parseUrl(const String& url);
+static WinINetUrl parseUrl(const std::string& url);
 
-WinINetRequest::WinINetRequest(const String& url) :
+WinINetRequest::WinINetRequest(const std::string& url) :
     m_session(NULL),
     m_connect(NULL),
     m_request(NULL),
@@ -112,8 +111,7 @@ WinINetRequest::~WinINetRequest()
     }
 }
 
-String
-WinINetRequest::send()
+std::string WinINetRequest::send()
 {
     if (m_used) {
         throw XArch("class is one time use.");
@@ -124,7 +122,7 @@ WinINetRequest::send()
     connect();
     openRequest();
     
-    String headers("Content-Type: text/html");
+    std::string headers("Content-Type: text/html");
     if (!HttpSendRequest(m_request, headers.c_str(), (DWORD)headers.length(), NULL, NULL)) {
         throw XArch(new XArchEvalWindows());
     }
@@ -142,8 +140,7 @@ WinINetRequest::send()
     return result.str();
 }
 
-void
-WinINetRequest::openSession()
+void WinINetRequest::openSession()
 {
     std::stringstream userAgent;
     userAgent << "Barrier ";
@@ -200,8 +197,7 @@ WinINetRequest::openRequest()
 // nb: i tried to use InternetCrackUrl here, but couldn't quite get that to
 // work. here's some (less robust) code to split the url into components.
 // this works fine with simple urls, but doesn't consider the full url spec.
-static WinINetUrl
-parseUrl(const String& url)
+static WinINetUrl parseUrl(const std::string& url)
 {
     WinINetUrl parsed;
 
@@ -215,7 +211,7 @@ parseUrl(const String& url)
     parsed.m_port = INTERNET_DEFAULT_HTTP_PORT;
     parsed.m_flags = 0;
 
-    if (parsed.m_scheme.find("https") != String::npos) {
+    if (parsed.m_scheme.find("https") != std::string::npos) {
         parsed.m_port = INTERNET_DEFAULT_HTTPS_PORT;
         parsed.m_flags = INTERNET_FLAG_SECURE;
     }