X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/74b31181b345aaaef0c967cc5707bef72ce0a405..89894079c04bba0ab2fd9efcb421516fc90545cb:/src/common/url.cpp

diff --git a/src/common/url.cpp b/src/common/url.cpp
index 1e142f1ef1..8c680f6905 100644
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -23,15 +23,13 @@
 #include <string.h>
 #include <ctype.h>
 
-#include <wx/string.h>
-#include <wx/list.h>
-#include <wx/utils.h>
-#include <wx/url.h>
+#include "wx/string.h"
+#include "wx/list.h"
+#include "wx/utils.h"
+#include "wx/url.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxProtoInfo, wxObject)
 IMPLEMENT_CLASS(wxURL, wxObject)
-#endif
 
 // Protocols list
 wxProtoInfo *wxURL::g_protocols = NULL;
@@ -105,9 +103,9 @@ bool wxURL::ParseURL()
     CleanData();
 
     // Third, we rebuild the URL.
-    m_url = m_protoname + _T(":");
+    m_url = m_protoname + wxT(":");
     if (m_protoinfo->m_needhost)
-      m_url = m_url + _T("//") + m_hostname;
+      m_url = m_url + wxT("//") + m_hostname;
 
     m_url += m_path;
 
@@ -146,7 +144,7 @@ bool wxURL::PrepProto(wxString& url)
   int pos;
 
   // Find end
-  pos = url.Find(_T(':'));
+  pos = url.Find(wxT(':'));
   if (pos == -1)
     return FALSE;
 
@@ -162,12 +160,12 @@ bool wxURL::PrepHost(wxString& url)
   wxString temp_url;
   int pos, pos2;
 
-  if ((url.GetChar(0) != '/') || (url.GetChar(1) != '/'))
+  if ((url.GetChar(0) != wxT('/')) || (url.GetChar(1) != wxT('/')))
     return FALSE;
 
   url = url(2, url.Length());
 
-  pos = url.Find(_T('/'));
+  pos = url.Find(wxT('/'));
   if (pos == -1)
     pos = url.Length();
 
@@ -175,10 +173,10 @@ bool wxURL::PrepHost(wxString& url)
     return FALSE;
 
   temp_url = url(0, pos);
-  url = url(url.Find(_T('/')), url.Length());
+  url = url(url.Find(wxT('/')), url.Length());
 
   // Retrieve service number
-  pos2 = temp_url.Find(_T(':'), TRUE);
+  pos2 = temp_url.Find(wxT(':'), TRUE);
   if (pos2 != -1 && pos2 < pos) {
     m_servname = temp_url(pos2+1, pos);
     if (!m_servname.IsNumber())
@@ -187,18 +185,18 @@ bool wxURL::PrepHost(wxString& url)
   }
 
   // Retrieve user and password.
-  pos2 = temp_url.Find(_T('@'));
+  pos2 = temp_url.Find(wxT('@'));
   // Even if pos2 equals -1, this code is right.
   m_hostname = temp_url(pos2+1, temp_url.Length());
 
-  m_user = _T("");
-  m_password = _T("");
+  m_user = wxT("");
+  m_password = wxT("");
 
   if (pos2 == -1)
     return TRUE;
 
   temp_url = temp_url(0, pos2);
-  pos2 = temp_url.Find(_T(':'));
+  pos2 = temp_url.Find(wxT(':'));
 
   if (pos2 == -1)
     return FALSE;
@@ -214,7 +212,7 @@ bool wxURL::PrepPath(wxString& url)
   if (url.Length() != 0)
     m_path = ConvertToValidURI(url);
   else
-    m_path = _T("/");
+    m_path = wxT("/");
   return TRUE;
 }
 
@@ -240,7 +238,7 @@ bool wxURL::FetchProtocol()
 // --------- wxURL get ------------------------------------------
 // --------------------------------------------------------------
 
-wxInputStream *wxURL::GetInputStream(void)
+wxInputStream *wxURL::GetInputStream()
 {
   wxInputStream *the_i_stream = NULL;
 
@@ -250,7 +248,7 @@ wxInputStream *wxURL::GetInputStream(void)
   }
 
   m_error = wxURL_NOERR;
-  if (m_user != _T("")) {
+  if (m_user != wxT("")) {
     m_protocol->SetUser(m_user);
     m_protocol->SetPassword(m_password);
   }
@@ -300,7 +298,7 @@ void wxURL::SetDefaultProxy(const wxString& url_proxy)
   }
 
   wxString tmp_str = url_proxy;
-  int pos = tmp_str.Find(_T(':'));
+  int pos = tmp_str.Find(wxT(':'));
   if (pos == -1)
     return;
 
@@ -338,7 +336,7 @@ void wxURL::SetProxy(const wxString& url_proxy)
   wxIPV4address addr;
 
   tmp_str = url_proxy;
-  pos = tmp_str.Find(_T(':'));
+  pos = tmp_str.Find(wxT(':'));
   // This is an invalid proxy name.
   if (pos == -1)
     return;
@@ -371,11 +369,11 @@ wxString wxURL::ConvertToValidURI(const wxString& uri)
   for (i=0;i<uri.Len();i++) {
     wxChar c = uri.GetChar(i);
 
-    if (c == _T(' '))
-      out_str += _T('+');
+    if (c == wxT(' '))
+      out_str += wxT('+');
     else {
-      if (!isalpha(c) && c != _T('.') && c != _T('+') && c != _T('/')) {
-        hexa_code.Printf(_T("%%%02X"), c);
+      if (!isalpha(c) && c != wxT('.') && c != wxT('+') && c != wxT('/')) {
+        hexa_code.Printf(wxT("%%%02X"), c);
         out_str += hexa_code;
       } else
         out_str += c;
@@ -392,17 +390,17 @@ wxString wxURL::ConvertFromURI(const wxString& uri)
   size_t i = 0;
   while (i<uri.Len()) {
     int code;
-    if (uri[i] == _T('%')) {
+    if (uri[i] == wxT('%')) {
       i++;
-      if (uri[i] >= _T('A') && uri[i] <= _T('F'))
-        code = (uri[i] - _T('A') + 10) * 16;
+      if (uri[i] >= wxT('A') && uri[i] <= wxT('F'))
+        code = (uri[i] - wxT('A') + 10) * 16;
       else
-        code = (uri[i] - _T('0')) * 16;
+        code = (uri[i] - wxT('0')) * 16;
       i++;
-      if (uri[i] >= _T('A') && uri[i] <= _T('F'))
-        code += (uri[i] - _T('A')) + 10;
+      if (uri[i] >= wxT('A') && uri[i] <= wxT('F'))
+        code += (uri[i] - wxT('A')) + 10;
       else
-        code += (uri[i] - _T('0'));
+        code += (uri[i] - wxT('0'));
       i++;
       new_uri += (wxChar)code;
       continue;