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

List:       kde-commits
Subject:    KDE/kdelibs/kfile
From:       Peter Penz <peter.penz () gmx ! at>
Date:       2010-05-28 13:45:48
Message-ID: 20100528134548.7D243AC8C1 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1131583 by ppenz:

Fix issue, that selecting a protocol might result in invalid URLs

CCBUG: 238926



 M  +6 -9      kurlnavigator.cpp  


--- trunk/KDE/kdelibs/kfile/kurlnavigator.cpp #1131582:1131583
@@ -323,17 +323,14 @@
 
 void KUrlNavigator::Private::slotProtocolChanged(const QString& protocol)
 {
+    Q_ASSERT(m_editable);
+    
     KUrl url;
-    if (m_editable) {
-        url.setScheme(protocol);
-        url.setPath("/");
+    url.setProtocol(protocol);  
+    url.setPath((protocol == QLatin1String("file")) ? QLatin1String("/") : QLatin1String("//"));
+    
         m_pathBox->setEditUrl(url);
-    } else {
-        url = q->locationUrl();
-        url.setScheme(protocol);
-        q->setLocationUrl(url);
     }
-}
 
 void KUrlNavigator::Private::openPathSelectorMenu()
 {
@@ -477,7 +474,7 @@
 void KUrlNavigator::Private::slotPathBoxChanged(const QString& text)
 {
     if (text.isEmpty()) {
-        const QString protocol = q->locationUrl().scheme();
+        const QString protocol = q->locationUrl().protocol();
         m_protocols->setProtocol(protocol);
         m_protocols->show();
     } else {
[prev in list] [next in list] [prev in thread] [next in thread]