diff --git a/src/filewidgets/kfilewidget.cpp b/src/filewidgets/kfilewidget.cpp --- a/src/filewidgets/kfilewidget.cpp +++ b/src/filewidgets/kfilewidget.cpp @@ -161,7 +161,7 @@ * Sets the dummy entry on the history combo box. If the dummy entry * already exists, it is overwritten with this information. */ - void setDummyHistoryEntry(const QString &text, const QPixmap &icon = QPixmap(), + void setDummyHistoryEntry(const QString &text, const QIcon &icon = QIcon(), bool usePreviousPixmapIfNull = true); /** @@ -1206,7 +1206,7 @@ setLocationText(list.urlList()); } -void KFileWidgetPrivate::setDummyHistoryEntry(const QString &text, const QPixmap &icon, +void KFileWidgetPrivate::setDummyHistoryEntry(const QString &text, const QIcon &icon, bool usePreviousPixmapIfNull) { // setCurrentItem() will cause textChanged() being emitted, @@ -1280,16 +1280,15 @@ void KFileWidgetPrivate::setLocationText(const QUrl &url) { if (!url.isEmpty()) { - QPixmap mimeTypeIcon = KIconLoader::global()->loadMimeTypeIcon(KIO::iconNameForUrl(url), KIconLoader::Small); if (!url.isRelative()) { const QUrl directory = url.adjusted(QUrl::RemoveFilename); if (!directory.path().isEmpty()) { q->setUrl(directory, false); } else { q->setUrl(url, false); } } - setDummyHistoryEntry(url.fileName(), mimeTypeIcon); + setDummyHistoryEntry(url.fileName(), QIcon::fromTheme(KIO::iconNameForUrl(url))); } else { removeDummyHistoryEntry(); } @@ -1325,10 +1324,9 @@ } urls = urls.left(urls.size() - 1); - setDummyHistoryEntry(urls, QPixmap(), false); + setDummyHistoryEntry(urls, QIcon(), false); } else if (urlList.count() == 1) { - const QPixmap mimeTypeIcon = KIconLoader::global()->loadMimeTypeIcon(KIO::iconNameForUrl(urlList[0]), KIconLoader::Small); - setDummyHistoryEntry(relativePathOrUrl(currUrl, urlList[0]), mimeTypeIcon); + setDummyHistoryEntry(relativePathOrUrl(currUrl, urlList[0]), QIcon::fromTheme(KIO::iconNameForUrl(urlList[0]))); } else { removeDummyHistoryEntry(); } @@ -1639,8 +1637,7 @@ } const QUrl url = urlFromString(match); - const QPixmap pix = KIconLoader::global()->loadMimeTypeIcon(KIO::iconNameForUrl(url), KIconLoader::Small); - setDummyHistoryEntry(locationEdit->currentText(), pix, !locationEdit->currentText().isEmpty()); + setDummyHistoryEntry(locationEdit->currentText(), QIcon::fromTheme(KIO::iconNameForUrl(url)), !locationEdit->currentText().isEmpty()); } void KFileWidgetPrivate::_k_slotLocationChanged(const QString &text)