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

List:       kde-commits
Subject:    [kde-baseapps/frameworks] konqueror/src: Fix more QUrl porting bugs.
From:       David Faure <faure () kde ! org>
Date:       2014-12-31 22:13:16
Message-ID: E1Y6RW0-0005Gd-Rr () scm ! kde ! org
[Download RAW message or body]

Git commit 98146f9b3941c70cf2435bf71e7b0a40c277271f by David Faure.
Committed on 31/12/2014 at 22:05.
Pushed by dfaure into branch 'frameworks'.

Fix more QUrl porting bugs.

At this point I have Q_ASSERT(!url.startsWith('/')); in the QUrl(QString)
constructor to catch such stuff... (there's one valid case for that though,
HTML links in webpages, to be resolved against the host)

M  +3    -3    konqueror/src/konqpixmapprovider.cpp

http://commits.kde.org/kde-baseapps/98146f9b3941c70cf2435bf71e7b0a40c277271f

diff --git a/konqueror/src/konqpixmapprovider.cpp b/konqueror/src/konqpixmapprovider.cpp
index 7682d02..9b177b3 100644
--- a/konqueror/src/konqpixmapprovider.cpp
+++ b/konqueror/src/konqpixmapprovider.cpp
@@ -87,7 +87,7 @@ QString KonqPixmapProvider::iconNameFor( const QUrl& url )
 
 QPixmap KonqPixmapProvider::pixmapFor( const QString& url, int size )
 {
-    return loadIcon( iconNameFor( QUrl( url ) ), size );
+    return loadIcon( iconNameFor( QUrl::fromUserInput( url ) ), size );
 }
 
 void KonqPixmapProvider::load( KConfigGroup& kc, const QString& key )
@@ -101,7 +101,7 @@ void KonqPixmapProvider::load( KConfigGroup& kc, const QString& key )
         if ( (++it) == itEnd )
             break;
         const QString icon (*it);
-        iconMap.insert( QUrl( url ), icon );
+        iconMap.insert( QUrl::fromUserInput( url ), icon );
         ++it;
     }
 }
@@ -114,7 +114,7 @@ void KonqPixmapProvider::save( KConfigGroup& kc, const QString& key,
     QStringList list;
     QStringList::const_iterator itEnd = items.end();
     for (QStringList::const_iterator it = items.begin(); it != itEnd; ++it) {
-        QMap<QUrl,QString>::const_iterator mit = iconMap.constFind( QUrl(*it) );
+        QMap<QUrl,QString>::const_iterator mit = iconMap.constFind( QUrl::fromUserInput(*it) );
         if ( mit != iconMap.constEnd() ) {
             list.append( mit.key().url() );
             list.append( mit.value() );
[prev in list] [next in list] [prev in thread] [next in thread]