Correct harmless typos.

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

diff --git a/src/common/uri.cpp b/src/common/uri.cpp
index f7351a56ac738e494c1e8c1c8bf10666f9a3f9fd..7fdac5d033810b46b7b6990c6c1d7afe8e4f09ed 100644 (file)
--- a/src/common/uri.cpp
+++ b/src/common/uri.cpp
@@ -62,7 +62,7 @@ wxURI::wxURI(const wxString& uri) : m_hostType(wxURI_REGNAME), m_fields(0)
     Create(uri);
 }
 
     Create(uri);
 }
 

-wxURI::wxURI(const wxURI& uri)  : m_hostType(wxURI_REGNAME), m_fields(0)
+wxURI::wxURI(const wxURI& uri)  : wxObject(), m_hostType(wxURI_REGNAME), m_fields(0)

 {
     Assign(uri);
 }
 {
     Assign(uri);
 }


@@ -78,8 +78,8 @@ wxURI::~wxURI()
 
 void wxURI::Clear()
 {
 
 void wxURI::Clear()
 {

-    m_scheme = m_user = m_server = m_port = m_path =
-    m_query = m_fragment = wxT("");
+    m_scheme = m_userinfo = m_server = m_port = m_path =
+    m_query = m_fragment = wxEmptyString;

 
     m_hostType = wxURI_REGNAME;
 
 
     m_hostType = wxURI_REGNAME;
 


@@ -115,10 +115,9 @@ const wxChar* wxURI::Create(const wxString& uri)
 
 wxChar wxURI::TranslateEscape(const wxChar* s)
 {
 
 wxChar wxURI::TranslateEscape(const wxChar* s)
 {

-    wxASSERT_MSG(IsHex(*s) && IsHex(*(s+1)), wxT("Invalid escape!"));
+    wxASSERT_MSG( IsHex(s[0]) && IsHex(s[1]), wxT("Invalid escape sequence!"));

 
 

-    //<<4 == 16
-    return (wxChar)( CharToHex(*s) << 4 ) | CharToHex(*++s);
+    return (wxChar)( CharToHex(s[0]) << 4 ) | CharToHex(s[1]);

 }
 
 wxString wxURI::Unescape(const wxString& uri)
 }
 
 wxString wxURI::Unescape(const wxString& uri)


@@ -159,6 +158,32 @@ bool wxURI::IsEscape(const wxChar*& uri)
         return false;
 }
 
         return false;
 }
 

+// ---------------------------------------------------------------------------
+// GetUser
+// GetPassword
+//
+// Gets the username and password via the old URL method.
+// ---------------------------------------------------------------------------
+wxString wxURI::GetUser() const
+{
+      size_t dwPasswordPos = m_userinfo.find(':');
+
+      if (dwPasswordPos == wxString::npos)
+          dwPasswordPos = 0;
+          
+      return m_userinfo(0, dwPasswordPos);
+}
+
+wxString wxURI::GetPassword() const
+{
+      size_t dwPasswordPos = m_userinfo.find(':');
+
+      if (dwPasswordPos == wxString::npos)
+          return wxT("");
+      else
+          return m_userinfo(dwPasswordPos+1, m_userinfo.length() + 1);    
+}
+

 // ---------------------------------------------------------------------------
 // BuildURI
 //
 // ---------------------------------------------------------------------------
 // BuildURI
 //


@@ -180,8 +205,8 @@ wxString wxURI::BuildURI() const
     {
         ret += wxT("//");
 
     {
         ret += wxT("//");
 

-        if (HasUser())
-            ret = ret + m_user + wxT("@");
+        if (HasUserInfo())
+            ret = ret + m_userinfo + wxT("@");

 
         ret += m_server;
 
 
         ret += m_server;
 


@@ -211,8 +236,8 @@ wxString wxURI::BuildUnescapedURI() const
     {
         ret += wxT("//");
 
     {
         ret += wxT("//");
 

-        if (HasUser())
-            ret = ret + wxURI::Unescape(m_user) + wxT("@");
+        if (HasUserInfo())
+            ret = ret + wxURI::Unescape(m_userinfo) + wxT("@");

 
         if (m_hostType == wxURI_REGNAME)
             ret += wxURI::Unescape(m_server);
 
         if (m_hostType == wxURI_REGNAME)
             ret += wxURI::Unescape(m_server);


@@ -245,7 +270,7 @@ wxURI& wxURI::Assign(const wxURI& uri)
 
     //ref over components
     m_scheme = uri.m_scheme;
 
     //ref over components
     m_scheme = uri.m_scheme;

-    m_user = uri.m_user;
+    m_userinfo = uri.m_userinfo;

     m_server = uri.m_server;
     m_hostType = uri.m_hostType;
     m_port = uri.m_port;
     m_server = uri.m_server;
     m_hostType = uri.m_hostType;
     m_port = uri.m_port;


@@ -284,12 +309,12 @@ bool wxURI::operator == (const wxURI& uri) const
 
     if (HasServer())
     {
 
     if (HasServer())
     {

-        if (HasUser())
+        if (HasUserInfo())

         {
         {

-            if (m_user != uri.m_user)
+            if (m_userinfo != uri.m_userinfo)

                 return false;
         }
                 return false;
         }

-        else if (uri.HasUser())
+        else if (uri.HasUserInfo())

             return false;
 
         if (m_server != uri.m_server ||
             return false;
 
         if (m_server != uri.m_server ||


@@ -350,7 +375,7 @@ bool wxURI::IsReference() const
 // Master URI parsing method.  Just calls the individual parsing methods
 //
 // URI = scheme ":" hier-part [ "?" query ] [ "#" fragment ]
 // Master URI parsing method.  Just calls the individual parsing methods
 //
 // URI = scheme ":" hier-part [ "?" query ] [ "#" fragment ]

-// URI-reference = URI / relative-URITestCase
+// URI-reference = URI / relative

 // ---------------------------------------------------------------------------
 
 const wxChar* wxURI::Parse(const wxChar* uri)
 // ---------------------------------------------------------------------------
 
 const wxChar* wxURI::Parse(const wxChar* uri)


@@ -401,7 +426,7 @@ const wxChar* wxURI::ParseScheme(const wxChar* uri)
         }
         else
             //relative uri with relative path reference
         }
         else
             //relative uri with relative path reference

-            m_scheme = wxT("");
+            m_scheme = wxEmptyString;

     }
 //    else
         //relative uri with _possible_ relative path reference
     }
 //    else
         //relative uri with _possible_ relative path reference


@@ -416,7 +441,7 @@ const wxChar* wxURI::ParseAuthority(const wxChar* uri)
     {
         uri += 2;
 
     {
         uri += 2;
 

-        uri = ParseUser(uri);
+        uri = ParseUserInfo(uri);

         uri = ParseServer(uri);
         return ParsePort(uri);
     }
         uri = ParseServer(uri);
         return ParsePort(uri);
     }


@@ -424,7 +449,7 @@ const wxChar* wxURI::ParseAuthority(const wxChar* uri)
     return uri;
 }
 
     return uri;
 }
 

-const wxChar* wxURI::ParseUser(const wxChar* uri)
+const wxChar* wxURI::ParseUserInfo(const wxChar* uri)

 {
     wxASSERT(uri != NULL);
 
 {
     wxASSERT(uri != NULL);
 


@@ -437,20 +462,20 @@ const wxChar* wxURI::ParseUser(const wxChar* uri)
     {
         if(IsUnreserved(*uri) || IsEscape(uri) ||
            IsSubDelim(*uri) || *uri == wxT(':'))
     {
         if(IsUnreserved(*uri) || IsEscape(uri) ||
            IsSubDelim(*uri) || *uri == wxT(':'))

-            m_user += *uri++;
+            m_userinfo += *uri++;

         else
         else

-            Escape(m_user, *uri++);
+            Escape(m_userinfo, *uri++);

     }
 
     if(*uri == wxT('@'))
     {
         //valid userinfo
     }
 
     if(*uri == wxT('@'))
     {
         //valid userinfo

-        m_fields |= wxURI_USER;
+        m_fields |= wxURI_USERINFO;

 
         uricopy = ++uri;
     }
     else
 
         uricopy = ++uri;
     }
     else

-        m_user = wxT("");
+        m_userinfo = wxEmptyString;

 
     return uricopy;
 }
 
     return uricopy;
 }


@@ -739,7 +764,7 @@ void wxURI::Resolve(const wxURI& base, int flags)
         return;
     }
 
         return;
     }
 

-    //No sheme - inherit
+    //No scheme - inherit

     m_scheme = base.m_scheme;
     m_fields |= wxURI_SCHEME;
 
     m_scheme = base.m_scheme;
     m_fields |= wxURI_SCHEME;
 


@@ -755,10 +780,10 @@ void wxURI::Resolve(const wxURI& base, int flags)
     }
 
     //No authority - inherit
     }
 
     //No authority - inherit

-    if (base.HasUser())
+    if (base.HasUserInfo())

     {
     {

-        m_user = base.m_user;
-        m_fields |= wxURI_USER;
+        m_userinfo = base.m_userinfo;
+        m_fields |= wxURI_USERINFO;

     }
 
     m_server = base.m_server;
     }
 
     m_server = base.m_server;


@@ -802,7 +827,7 @@ void wxURI::Resolve(const wxURI& base, int flags)
         //             T.query = R.query;
         if (m_path[0u] != wxT('/'))
         {
         //             T.query = R.query;
         if (m_path[0u] != wxT('/'))
         {

-            //Marge paths
+            //Merge paths

             const wxChar* op = m_path.c_str();
             const wxChar* bp = base.m_path.c_str() + base.m_path.Length();
 
             const wxChar* op = m_path.c_str();
             const wxChar* bp = base.m_path.c_str() + base.m_path.Length();
 


@@ -1227,7 +1252,7 @@ bool wxURI::IsDigit(const wxChar& c)
 
 // ---------------------------------------------------------------------------
 //
 
 // ---------------------------------------------------------------------------
 //

-//                        wxURL Compatability
+//                        wxURL Compatibility

 //
 // ---------------------------------------------------------------------------
 
 //
 // ---------------------------------------------------------------------------
 


@@ -1237,6 +1262,21 @@ bool wxURI::IsDigit(const wxChar& c)
 
 #include "wx/url.h"
 
 
 #include "wx/url.h"
 

+wxString wxURL::GetProtocolName() const
+{
+    return m_scheme;
+}
+
+wxString wxURL::GetHostName() const
+{
+    return m_server;
+}
+
+wxString wxURL::GetPath() const
+{
+    return m_path;
+}
+

 //Note that this old code really doesn't convert to a URI that well and looks
 //more like a dirty hack than anything else...
 
 //Note that this old code really doesn't convert to a URI that well and looks
 //more like a dirty hack than anything else...