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/panels/information | |
| parent | b111b1482ad7f2fe7989e3ee53ddfe04eb73fa9c (diff) | |
Ported KIcon to QIcon
REVIEW: 120159
Diffstat (limited to 'src/panels/information')
| -rw-r--r-- | src/panels/information/informationpanelcontent.cpp | 12 | ||||
| -rw-r--r-- | src/panels/information/phononwidget.cpp | 6 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp index 75052021b..327e72ba9 100644 --- a/src/panels/information/informationpanelcontent.cpp +++ b/src/panels/information/informationpanelcontent.cpp @@ -27,7 +27,7 @@ #include <KJobWidgets> #include <KIconEffect> #include <KIconLoader> -#include <KIcon> +#include <QIcon> #include <KLocale> #include <KMenu> #include <kseparator.h> @@ -297,7 +297,7 @@ void InformationPanelContent::configureSettings(const QList<QAction*>& customCon previewAction->setChecked(InformationPanelSettings::previewsShown()); QAction* configureAction = popup.addAction(i18nc("@action:inmenu", "Configure...")); - configureAction->setIcon(KIcon("configure")); + configureAction->setIcon(QIcon::fromTheme("configure")); popup.addSeparator(); foreach (QAction* action, customContextMenuActions) { @@ -332,8 +332,10 @@ void InformationPanelContent::showIcon(const KFileItem& item) { m_outdatedPreviewTimer->stop(); if (!applyPlace(item.targetUrl())) { - KIcon icon(item.iconName(), KIconLoader::global(), item.overlays()); - m_preview->setPixmap(icon.pixmap(KIconLoader::SizeEnormous)); + const QPixmap icon = KIconLoader::global()->loadIcon(item.iconName(), KIconLoader::Desktop, + KIconLoader::SizeEnormous, KIconLoader::DefaultState, + item.overlays()); + m_preview->setPixmap(icon); } } @@ -376,7 +378,7 @@ bool InformationPanelContent::applyPlace(const KUrl& url) const PlacesItem* item = m_placesItemModel->placesItem(i); if (item->url().equals(url, KUrl::CompareWithoutTrailingSlash)) { setNameLabelText(item->text()); - m_preview->setPixmap(KIcon(item->icon()).pixmap(128, 128)); + m_preview->setPixmap(QIcon::fromTheme(item->icon()).pixmap(128, 128)); return true; } } diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp index 4b2cc28c5..16dbabfed 100644 --- a/src/panels/information/phononwidget.cpp +++ b/src/panels/information/phononwidget.cpp @@ -32,7 +32,7 @@ #include <QToolButton> #include <KDialog> -#include <KIcon> +#include <QIcon> #include <KIconLoader> #include <KUrl> #include <KLocale> @@ -129,13 +129,13 @@ void PhononWidget::showEvent(QShowEvent *event) m_playButton->setToolTip(i18n("play")); m_playButton->setIconSize(buttonSize); - m_playButton->setIcon(KIcon("media-playback-start")); + m_playButton->setIcon(QIcon::fromTheme("media-playback-start")); m_playButton->setAutoRaise(true); connect(m_playButton, &QToolButton::clicked, this, &PhononWidget::play); m_stopButton->setToolTip(i18n("stop")); m_stopButton->setIconSize(buttonSize); - m_stopButton->setIcon(KIcon("media-playback-stop")); + m_stopButton->setIcon(QIcon::fromTheme("media-playback-stop")); m_stopButton->setAutoRaise(true); m_stopButton->hide(); connect(m_stopButton, &QToolButton::clicked, this, &PhononWidget::stop); |
