diff options
| author | Emmanuel Pescosta <[email protected]> | 2014-09-12 13:02:43 +0200 |
|---|---|---|
| committer | Emmanuel Pescosta <[email protected]> | 2014-09-12 13:15:54 +0200 |
| commit | 4de8cf43e62e23b766d9d457e060670401ce6128 (patch) | |
| tree | da56202877e50acbaac6c07c903d467460f70673 /src/kitemviews | |
| parent | b111b1482ad7f2fe7989e3ee53ddfe04eb73fa9c (diff) | |
Ported KIcon to QIcon
REVIEW: 120159
Diffstat (limited to 'src/kitemviews')
| -rw-r--r-- | src/kitemviews/kfileitemlistview.cpp | 4 | ||||
| -rw-r--r-- | src/kitemviews/kstandarditemlistwidget.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp index 0a92e75e5..aee10b5bd 100644 --- a/src/kitemviews/kfileitemlistview.cpp +++ b/src/kitemviews/kfileitemlistview.cpp @@ -27,7 +27,7 @@ #include "private/kpixmapmodifier.h" #include <KDebug> -#include <KIcon> +#include <QIcon> #include <KTextEdit> #include <KIconLoader> #include <KDateTime> @@ -171,7 +171,7 @@ QPixmap KFileItemListView::createDragPixmap(const KItemSet& indexes) const foreach (int index, indexes) { QPixmap pixmap = model()->data(index).value("iconPixmap").value<QPixmap>(); if (pixmap.isNull()) { - KIcon icon(model()->data(index).value("iconName").toString()); + QIcon icon = QIcon::fromTheme(model()->data(index).value("iconName").toString()); pixmap = icon.pixmap(size, size); } else { KPixmapModifier::scale(pixmap, QSize(size, size)); diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp index 8633a2571..eaed056e5 100644 --- a/src/kitemviews/kstandarditemlistwidget.cpp +++ b/src/kitemviews/kstandarditemlistwidget.cpp @@ -22,7 +22,7 @@ #include "kfileitemlistview.h" #include "kfileitemmodel.h" -#include <KIcon> +#include <QIcon> #include <KIconEffect> #include <KIconLoader> #include <KLocale> @@ -1440,7 +1440,7 @@ QPixmap KStandardItemListWidget::pixmapForIcon(const QString& name, const QStrin QPixmap pixmap; if (!QPixmapCache::find(key, pixmap)) { - const KIcon icon(name); + const QIcon icon = QIcon::fromTheme(name); int requestedSize; if (size <= KIconLoader::SizeSmall) { |