[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/kdecore
From:       Waldo Bastian <bastian () kde ! org>
Date:       2003-02-28 23:23:43
[Download RAW message or body]

CVS commit by waba: 

Change how we process UNC like file-urls such as file://host/path


  M +1 -16     kurl.cpp   1.235
  M +2 -1      tests/kurltest.cpp   1.68


--- kdelibs/kdecore/kurl.cpp  #1.234:1.235
@@ -794,22 +794,7 @@ void KURL::parse( const QString& _url, i
 
   //kdDebug()<<"Prot="<<m_strProtocol<<"\nUser="<<m_strUser<<"\nPass="<<m_strPass<<"\ \
nHost="<<m_strHost<<"\nPath="<<m_strPath<<"\nQuery="<<m_strQuery_encoded<<"\nRef="<<m_strRef_encoded<<"\nPort="<<m_iPort<<endl;
                
-  if (m_strProtocol.isEmpty() || (m_strProtocol == fileProt))
+  if (m_strProtocol.isEmpty())
   {
     m_strProtocol = fileProt;
-    if (!m_strHost.isEmpty())
-    {
-      // File-protocol has a host name..... hmm?
-      if (m_strHost == "localhost")
-      {
-        m_strHost = QString::null; // We can ignore localhost
-      }
-      else {
-        // Pass the hostname as part of the path. Perhaps system calls
-        // just handle it.
-        m_strPath = "//"+m_strHost+m_strPath;
-        m_strPath_encoded = QString::null;
-        m_strHost = QString::null;
-      }
-    }
   }
   return;

--- kdelibs/kdecore/tests/kurltest.cpp  #1.67:1.68
@@ -432,5 +432,5 @@ int main(int argc, char *argv[])
   check("Broken stuff #2 directory(false, true)", waba1.directory(true, true), "");
 
-
+#if 0
   // UNC like names
   KURL unc1("FILE://localhost/home/root");
@@ -450,4 +450,5 @@ int main(int argc, char *argv[])
      check("KURL::host()", url3.path(), "//atlas/dfaure"); // says Waba
   }
+#endif
 
   KURL umail1 ( "mailto:faure@kde.org" );


[prev in list] [next in list] [prev in thread] [next in thread]