From 4e8c2c24c26a49f6904a984a1a46293a136a3b0c Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 30 May 2024 02:16:14 +0300 Subject: [PATCH] generic: replace KMimeType::iconNameForUrl() with KIO::pixmapForUrl() Signed-off-by: Ivailo Monev --- ark/kerfuffle/adddialog.cpp | 4 ++-- gwenview/lib/historymodel.cpp | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ark/kerfuffle/adddialog.cpp b/ark/kerfuffle/adddialog.cpp index 7b5ab263..fe47355f 100644 --- a/ark/kerfuffle/adddialog.cpp +++ b/ark/kerfuffle/adddialog.cpp @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -116,8 +117,7 @@ void AddDialog::setupIconList(const QStringList& itemsToAdd) QStandardItem* item = new QStandardItem; item->setText(url.fileName()); - QString iconName = KMimeType::iconNameForUrl(url); - item->setIcon(KIcon(iconName)); + item->setIcon(KIcon(KIO::pixmapForUrl(url))); item->setData(QVariant(url), KFilePlacesModel::UrlRole); diff --git a/gwenview/lib/historymodel.cpp b/gwenview/lib/historymodel.cpp index ade2bdb9..a356efac 100644 --- a/gwenview/lib/historymodel.cpp +++ b/gwenview/lib/historymodel.cpp @@ -127,24 +127,23 @@ private: HistoryItem(const KUrl& url, const QDateTime& dateTime, const QString& configPath) : mUrl(url) , mDateTime(dateTime) - , mConfigPath(configPath) { + , mConfigPath(configPath) + { mUrl.cleanPath(); KUrl urlForView = mUrl; urlForView.adjustPath(KUrl::RemoveTrailingSlash); + setText(urlForView.pathOrUrl()); - - QString iconName = KMimeType::iconNameForUrl(mUrl); - setIcon(KIcon(iconName)); - + setIcon(KIcon(KIO::pixmapForUrl(mUrl))); setData(qVariantFromValue(mUrl), KFilePlacesModel::UrlRole); - setData(QVariant(KFileItem(mUrl)), KDirModel::FileItemRole); QString date = KGlobal::locale()->formatDateTime(mDateTime, QLocale::NarrowFormat); setData(QVariant(i18n("Last visited: %1", date)), Qt::ToolTipRole); } - bool operator<(const QStandardItem& other) const { + bool operator<(const QStandardItem& other) const + { return mDateTime > static_cast(&other)->mDateTime; } };