Better wxFile support, warning fixes and minor source cleaning.

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

diff --git a/src/common/url.cpp b/src/common/url.cpp
index 46f40e2300cfd92aa6a67ae0fc1c59c0e737f5f5..a78708b6ee3e31b9c984ac83d0bf0646ade6ab83 100644 (file)
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -239,16 +239,16 @@ wxInputStream *wxURL::GetInputStream()
   }
 
   m_error = wxURL_NOERR;
   }
 
   m_error = wxURL_NOERR;

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

   {
   {

-      size_t dwPasswordPos = m_user.find(':');
+      size_t dwPasswordPos = m_userinfo.find(':');

 
       if (dwPasswordPos == wxString::npos)
 
       if (dwPasswordPos == wxString::npos)

-          m_protocol->SetUser(m_user);
+          m_protocol->SetUser(m_userinfo);

       else
       {
       else
       {

-          m_protocol->SetUser(m_user(0, dwPasswordPos));
-          m_protocol->SetPassword(m_user(dwPasswordPos+1, m_user.length() + 1));
+          m_protocol->SetUser(m_userinfo(0, dwPasswordPos));
+          m_protocol->SetPassword(m_userinfo(dwPasswordPos+1, m_userinfo.length() + 1));

       }
   }
 
       }
   }