X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e854db32ddad25383026642e51382b58ce729b60..c12a74b0d825dcb685e48fdc15e9c5d53eb5932b:/src/common/uri.cpp diff --git a/src/common/uri.cpp b/src/common/uri.cpp index e1878f78c4..c7b04ebe25 100644 --- 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); } -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); } @@ -79,7 +79,7 @@ wxURI::~wxURI() void wxURI::Clear() { m_scheme = m_user = m_server = m_port = m_path = - m_query = m_fragment = wxT(""); + m_query = m_fragment = wxEmptyString; m_hostType = wxURI_REGNAME; @@ -401,7 +401,7 @@ const wxChar* wxURI::ParseScheme(const wxChar* uri) } else //relative uri with relative path reference - m_scheme = wxT(""); + m_scheme = wxEmptyString; } // else //relative uri with _possible_ relative path reference @@ -450,7 +450,7 @@ const wxChar* wxURI::ParseUser(const wxChar* uri) uricopy = ++uri; } else - m_user = wxT(""); + m_user = wxEmptyString; return uricopy; } @@ -474,7 +474,7 @@ const wxChar* wxURI::ParseServer(const wxChar* uri) m_hostType = wxURI_IPV6ADDRESS; wxStringBufferLength theBuffer(m_server, uri - uricopy); - wxMemcpy(theBuffer, uricopy, uri-uricopy); + wxTmemcpy(theBuffer, uricopy, uri-uricopy); theBuffer.SetLength(uri-uricopy); } else @@ -488,7 +488,7 @@ const wxChar* wxURI::ParseServer(const wxChar* uri) m_hostType = wxURI_IPVFUTURE; wxStringBufferLength theBuffer(m_server, uri - uricopy); - wxMemcpy(theBuffer, uricopy, uri-uricopy); + wxTmemcpy(theBuffer, uricopy, uri-uricopy); theBuffer.SetLength(uri-uricopy); } else @@ -502,7 +502,7 @@ const wxChar* wxURI::ParseServer(const wxChar* uri) m_hostType = wxURI_IPV4ADDRESS; wxStringBufferLength theBuffer(m_server, uri - uricopy); - wxMemcpy(theBuffer, uricopy, uri-uricopy); + wxTmemcpy(theBuffer, uricopy, uri-uricopy); theBuffer.SetLength(uri-uricopy); } else @@ -596,7 +596,7 @@ const wxChar* wxURI::ParsePath(const wxChar* uri, bool bReference, bool bNormali { wxStringBufferLength theBuffer(m_path, m_path.length() + 1); #if wxUSE_STL - wxMemcpy(theBuffer, m_path.c_str(), m_path.length()+1); + wxTmemcpy(theBuffer, m_path.c_str(), m_path.length()+1); #endif Normalize(theBuffer, true); theBuffer.SetLength(wxStrlen(theBuffer)); @@ -636,7 +636,7 @@ const wxChar* wxURI::ParsePath(const wxChar* uri, bool bReference, bool bNormali { wxStringBufferLength theBuffer(m_path, m_path.length() + 1); #if wxUSE_STL - wxMemcpy(theBuffer, m_path.c_str(), m_path.length()+1); + wxTmemcpy(theBuffer, m_path.c_str(), m_path.length()+1); #endif Normalize(theBuffer); theBuffer.SetLength(wxStrlen(theBuffer)); @@ -739,7 +739,7 @@ void wxURI::Resolve(const wxURI& base, int flags) return; } - //No sheme - inherit + //No scheme - inherit m_scheme = base.m_scheme; m_fields |= wxURI_SCHEME; @@ -802,7 +802,7 @@ void wxURI::Resolve(const wxURI& base, int flags) // 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(); @@ -1237,6 +1237,21 @@ bool wxURI::IsDigit(const wxChar& c) #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...