* Changed char to wxChar in operators.

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

diff --git a/src/common/url.cpp b/src/common/url.cpp
index ef280923ab5553bd5b0ae68e3756127295731b90..3c8aebe2dc8cda5b303362112c888c0d84bd72e6 100644 (file)
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -45,15 +45,13 @@ IMPLEMENT_CLASS(wxURL, wxObject)
 wxProtoInfo *wxURL::g_protocols = NULL;
 wxHTTP *wxURL::g_proxy;
 
 wxProtoInfo *wxURL::g_protocols = NULL;
 wxHTTP *wxURL::g_proxy;
 

-/////////////////////////////////////////////////////////////////
-// wxURL ////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////
+// --------------------------------------------------------------
+// wxURL
+// --------------------------------------------------------------

 
 

-/*
- * --------------------------------------------------------------
- * --------- wxURL CONSTRUCTOR DESTRUCTOR -----------------------
- * --------------------------------------------------------------
- */
+// --------------------------------------------------------------
+// --------- wxURL CONSTRUCTOR DESTRUCTOR -----------------------
+// --------------------------------------------------------------

 
 wxURL::wxURL(const wxString& url)
 {
 
 wxURL::wxURL(const wxString& url)
 {


@@ -118,11 +116,10 @@ wxURL::~wxURL()
   CleanData();
 }
 
   CleanData();
 }
 

-/*
- * --------------------------------------------------------------
- * --------- wxURL urls decoders --------------------------------
- * --------------------------------------------------------------
- */
+// --------------------------------------------------------------
+// --------- wxURL urls decoders --------------------------------
+// --------------------------------------------------------------
+

 bool wxURL::PrepProto(wxString& url)
 {
   int pos;
 bool wxURL::PrepProto(wxString& url)
 {
   int pos;


@@ -219,11 +216,10 @@ bool wxURL::FetchProtocol()
   return FALSE;
 }
 
   return FALSE;
 }
 

-/*
- * --------------------------------------------------------------
- * --------- wxURL get ------------------------------------------
- * --------------------------------------------------------------
- */
+// --------------------------------------------------------------
+// --------- wxURL get ------------------------------------------
+// --------------------------------------------------------------
+

 wxInputStream *wxURL::GetInputStream(void)
 {
   wxIPV4address addr;
 wxInputStream *wxURL::GetInputStream(void)
 {
   wxIPV4address addr;


@@ -316,5 +312,25 @@ void wxURL::SetProxy(const wxString& url_proxy)
   m_path = url_proxy;
 }
 
   m_path = url_proxy;
 }
 

+wxString wxURL::ConvertToValidURI(const wxString& uri)
+{
+  wxString out_str;
+  wxString hexa_code;
+  size_t i;
+
+  for (i=0;i<uri.Len();i++) {
+    wxChar c = uri.GetChar(i);
+
+    if (!isalpha(c) && c != _T('.') && c != _T('+') && c != _T('.') && 
+                       c != _T('/')) {
+      hexa_code.Printf(_T("%02X"), c);
+      out_str += hexa_code;
+    } else
+      out_str += c;
+  }
+  
+  return out_str;
+}
+

 #endif
   // wxUSE_SOCKETS
 #endif
   // wxUSE_SOCKETS