replaced T() makro with wxT() due to namespace probs, _T() exists, too

[wxWidgets.git] / src / common / url.cpp

diff --git a/src/common/url.cpp b/src/common/url.cpp
index aba9e7a5b5b4815c1a3e64035e38b3dbca3f1acd..813ac542e57777c017262a3fd7f93eb886efd326 100644 (file)
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -105,9 +105,9 @@ bool wxURL::ParseURL()
     CleanData();
 
     // Third, we rebuild the URL.
     CleanData();
 
     // Third, we rebuild the URL.

-    m_url = m_protoname + T(":");
+    m_url = m_protoname + wxT(":");

     if (m_protoinfo->m_needhost)
     if (m_protoinfo->m_needhost)

-      m_url = m_url + T("//") + m_hostname;
+      m_url = m_url + wxT("//") + m_hostname;

 
     m_url += m_path;
 
 
     m_url += m_path;
 


@@ -146,7 +146,7 @@ bool wxURL::PrepProto(wxString& url)
   int pos;
 
   // Find end
   int pos;
 
   // Find end

-  pos = url.Find(T(':'));
+  pos = url.Find(wxT(':'));

   if (pos == -1)
     return FALSE;
 
   if (pos == -1)
     return FALSE;
 


@@ -167,7 +167,7 @@ bool wxURL::PrepHost(wxString& url)
 
   url = url(2, url.Length());
 
 
   url = url(2, url.Length());
 

-  pos = url.Find(T('/'));
+  pos = url.Find(wxT('/'));

   if (pos == -1)
     pos = url.Length();
 
   if (pos == -1)
     pos = url.Length();
 


@@ -175,10 +175,10 @@ bool wxURL::PrepHost(wxString& url)
     return FALSE;
 
   temp_url = url(0, pos);
     return FALSE;
 
   temp_url = url(0, pos);

-  url = url(url.Find(T('/')), url.Length());
+  url = url(url.Find(wxT('/')), url.Length());

 
   // Retrieve service number
 
   // 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())
   if (pos2 != -1 && pos2 < pos) {
     m_servname = temp_url(pos2+1, pos);
     if (!m_servname.IsNumber())


@@ -187,18 +187,18 @@ bool wxURL::PrepHost(wxString& url)
   }
 
   // Retrieve user and password.
   }
 
   // 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());
 
   // 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);
 
   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;
 
   if (pos2 == -1)
     return FALSE;


@@ -214,7 +214,7 @@ bool wxURL::PrepPath(wxString& url)
   if (url.Length() != 0)
     m_path = ConvertToValidURI(url);
   else
   if (url.Length() != 0)
     m_path = ConvertToValidURI(url);
   else

-    m_path = T("/");
+    m_path = wxT("/");

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -250,7 +250,7 @@ wxInputStream *wxURL::GetInputStream(void)
   }
 
   m_error = wxURL_NOERR;
   }
 
   m_error = wxURL_NOERR;

-  if (m_user != T("")) {
+  if (m_user != wxT("")) {

     m_protocol->SetUser(m_user);
     m_protocol->SetPassword(m_password);
   }
     m_protocol->SetUser(m_user);
     m_protocol->SetPassword(m_password);
   }


@@ -300,7 +300,7 @@ void wxURL::SetDefaultProxy(const wxString& url_proxy)
   }
 
   wxString tmp_str = url_proxy;
   }
 
   wxString tmp_str = url_proxy;

-  int pos = tmp_str.Find(T(':'));
+  int pos = tmp_str.Find(wxT(':'));

   if (pos == -1)
     return;
 
   if (pos == -1)
     return;
 


@@ -338,7 +338,7 @@ void wxURL::SetProxy(const wxString& url_proxy)
   wxIPV4address addr;
 
   tmp_str = 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;
   // This is an invalid proxy name.
   if (pos == -1)
     return;


@@ -371,11 +371,11 @@ wxString wxURL::ConvertToValidURI(const wxString& uri)
   for (i=0;i<uri.Len();i++) {
     wxChar c = uri.GetChar(i);
 
   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 {
     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;
         out_str += hexa_code;
       } else
         out_str += c;


@@ -392,17 +392,17 @@ wxString wxURL::ConvertFromURI(const wxString& uri)
   size_t i = 0;
   while (i<uri.Len()) {
     int code;
   size_t i = 0;
   while (i<uri.Len()) {
     int code;

-    if (uri[i] == T('%')) {
+    if (uri[i] == wxT('%')) {

       i++;
       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
       else

-        code = (uri[i] - T('0')) * 16;
+        code = (uri[i] - wxT('0')) * 16;

       i++;
       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
       else

-        code += (uri[i] - T('0'));
+        code += (uri[i] - wxT('0'));

       i++;
       new_uri += (wxChar)code;
       continue;
       i++;
       new_uri += (wxChar)code;
       continue;