From af211f7c93e9a7d4fc8fe76164f51b35b6a749c4 Mon Sep 17 00:00:00 2001 From: David Faure Date: Sat, 28 Apr 2012 13:03:35 +0200 Subject: [PATCH] KIcon("foo") -> KDE::icon("foo") include kicon.h -> kiconloader.h, or often, nothing at all. --- abstractrunner.cpp | 3 +-- applet.cpp | 1 - containment.cpp | 11 +++++------ corona.cpp | 1 - coronabase.cpp | 7 +++---- graphicsview/private/graphicsviewappletprivate.cpp | 10 +++++----- popupapplet.cpp | 9 ++++----- private/applethandle.cpp | 1 - private/appletprivate.cpp | 7 +++---- private/associatedapplicationmanager.cpp | 3 +-- private/nativetabbar.cpp | 1 - remote/accessappletjob.cpp | 3 +-- tooltipmanager.h | 2 +- widgets/iconwidget.cpp | 3 +-- widgets/iconwidget.h | 2 +- widgets/pushbutton.cpp | 3 +-- widgets/pushbutton.h | 3 +-- widgets/toolbutton.cpp | 3 +-- widgets/videowidget.cpp | 3 +-- 19 files changed, 30 insertions(+), 46 deletions(-) diff --git a/abstractrunner.cpp b/abstractrunner.cpp index dc19198f5..f80f69ce4 100644 --- a/abstractrunner.cpp +++ b/abstractrunner.cpp @@ -28,7 +28,6 @@ #include #include -#include #include #include #include @@ -296,7 +295,7 @@ QString AbstractRunner::name() const QIcon AbstractRunner::icon() const { if (d->runnerDescription.isValid()) { - return KIcon(d->runnerDescription.icon()); + return KDE::icon(d->runnerDescription.icon()); } return QIcon(); diff --git a/applet.cpp b/applet.cpp index d95de5b9c..30ebb7404 100644 --- a/applet.cpp +++ b/applet.cpp @@ -55,7 +55,6 @@ #include #include #include -#include #include #include #include diff --git a/containment.cpp b/containment.cpp index cb88f546b..a93e8b35f 100644 --- a/containment.cpp +++ b/containment.cpp @@ -38,7 +38,6 @@ #include #include -#include #include #include #include @@ -255,7 +254,7 @@ void ContainmentPrivate::addDefaultActions(KActionCollection *actions, Containme KAction *appletBrowserAction = actions->addAction("add widgets"); appletBrowserAction->setAutoRepeat(false); appletBrowserAction->setText(i18n("Add Widgets...")); - appletBrowserAction->setIcon(KIcon("list-add")); + appletBrowserAction->setIcon(KDE::icon("list-add")); appletBrowserAction->setShortcut(KShortcut("alt+d, a")); appletBrowserAction->setData(AbstractToolBox::AddTool); @@ -1319,7 +1318,7 @@ void ContainmentPrivate::dropData(QPointF scenePos, QPoint screenPos, QGraphicsS q, SLOT(mimeTypeRetrieved(KIO::Job*,QString))); KMenu *choices = new KMenu("Content dropped"); - choices->addAction(KIcon("process-working"), i18n("Fetching file type...")); + choices->addAction(KDE::icon("process-working"), i18n("Fetching file type...")); if (dropEvent) { choices->popup(dropEvent->screenPos()); } else { @@ -1365,7 +1364,7 @@ void ContainmentPrivate::dropData(QPointF scenePos, QPoint screenPos, QGraphicsS foreach (const KPluginInfo &info, seenPlugins) { QAction *action; if (!info.icon().isEmpty()) { - action = choices.addAction(KIcon(info.icon()), info.name()); + action = choices.addAction(KDE::icon(info.icon()), info.name()); } else { action = choices.addAction(info.name()); } @@ -1541,7 +1540,7 @@ void ContainmentPrivate::mimeTypeRetrieved(KIO::Job *job, const QString &mimeTyp #endif QAction *action; if (!info.icon().isEmpty()) { - action = choices->addAction(KIcon(info.icon()), info.name()); + action = choices->addAction(KDE::icon(info.icon()), info.name()); } else { action = choices->addAction(info.name()); } @@ -1565,7 +1564,7 @@ void ContainmentPrivate::mimeTypeRetrieved(KIO::Job *job, const QString &mimeTyp foreach (const KPluginInfo &info, wallpaperList) { QAction *action; if (!info.icon().isEmpty()) { - action = choices->addAction(KIcon(info.icon()), info.name()); + action = choices->addAction(KDE::icon(info.icon()), info.name()); } else { action = choices->addAction(info.name()); } diff --git a/corona.cpp b/corona.cpp index ba5b270eb..a9a474650 100644 --- a/corona.cpp +++ b/corona.cpp @@ -40,7 +40,6 @@ #include #include #include -#include #include "coronabase.h" #include "abstractdialogmanager.h" diff --git a/coronabase.cpp b/coronabase.cpp index 9db9f363e..3fc8fa216 100644 --- a/coronabase.cpp +++ b/coronabase.cpp @@ -40,7 +40,6 @@ #include #include #include -#include #include "abstractdialogmanager.h" #include "abstracttoolbox.h" @@ -338,7 +337,7 @@ void CoronaBase::setImmutability(const ImmutabilityType immutable) } else { bool unlocked = d->immutability == Mutable; action->setText(unlocked ? i18n("Lock Widgets") : i18n("Unlock Widgets")); - action->setIcon(KIcon(unlocked ? "object-locked" : "object-unlocked")); + action->setIcon(KDE::icon(unlocked ? "object-locked" : "object-unlocked")); action->setEnabled(true); action->setVisible(true); } @@ -478,7 +477,7 @@ void CoronaBasePrivate::init() QObject::connect(lockAction, SIGNAL(triggered(bool)), q, SLOT(toggleImmutability())); lockAction->setText(i18n("Lock Widgets")); lockAction->setAutoRepeat(true); - lockAction->setIcon(KIcon("object-locked")); + lockAction->setIcon(KDE::icon("object-locked")); lockAction->setData(AbstractToolBox::ControlTool); lockAction->setShortcut(KShortcut("alt+d, l")); lockAction->setShortcutContext(Qt::ApplicationShortcut); @@ -489,7 +488,7 @@ void CoronaBasePrivate::init() KAction *action = actions.addAction("configure shortcuts"); QObject::connect(action, SIGNAL(triggered()), q, SLOT(showShortcutConfig())); action->setText(i18n("Shortcut Settings")); - action->setIcon(KIcon("configure-shortcuts")); + action->setIcon(KDE::icon("configure-shortcuts")); action->setAutoRepeat(false); action->setData(AbstractToolBox::ConfigureTool); //action->setShortcut(KShortcut("ctrl+h")); diff --git a/graphicsview/private/graphicsviewappletprivate.cpp b/graphicsview/private/graphicsviewappletprivate.cpp index ca44b53d1..66c4a4c6e 100644 --- a/graphicsview/private/graphicsviewappletprivate.cpp +++ b/graphicsview/private/graphicsviewappletprivate.cpp @@ -94,7 +94,7 @@ void GraphicsViewAppletPrivate::showMessage(const QIcon &icon, const QString &me if (buttons & ButtonOk) { messageOkButton = new PushButton(mainWidget); messageOkButton.data()->setText(i18n("&OK")); - messageOkButton.data()->setIcon(KIcon("dialog-ok")); + messageOkButton.data()->setIcon(KDE::icon("dialog-ok")); buttonLayout->addItem(messageOkButton.data()); QObject::connect(messageOkButton.data(), SIGNAL(clicked()), q, SLOT(destroyMessageOverlay())); } @@ -116,7 +116,7 @@ void GraphicsViewAppletPrivate::showMessage(const QIcon &icon, const QString &me if (buttons & ButtonCancel) { messageCancelButton = new PushButton(mainWidget); messageCancelButton.data()->setText(i18n("&Cancel")); - messageCancelButton.data()->setIcon(KIcon("dialog-cancel")); + messageCancelButton.data()->setIcon(KDE::icon("dialog-cancel")); buttonLayout->addItem(messageCancelButton.data()); QObject::connect(messageCancelButton.data(), SIGNAL(clicked()), q, SLOT(destroyMessageOverlay())); } @@ -153,7 +153,7 @@ void GraphicsViewAppletPrivate::showMessage(const QIcon &icon, const QString &me if (buttonLayout->count() < 1) { PushButton *ok = new PushButton(mainWidget); ok->setText(i18n("OK")); - ok->setIcon(KIcon("dialog-ok")); + ok->setIcon(KDE::icon("dialog-ok")); buttonLayout->addItem(ok); QObject::connect(ok, SIGNAL(clicked()), q, SLOT(destroyMessageOverlay())); } @@ -216,7 +216,7 @@ void GraphicsViewAppletPrivate::updateFailedToLaunch(const QString &reason) failureLayout->setContentsMargins(0, 0, 0, 0); IconWidget *failureIcon = new IconWidget(q); - failureIcon->setIcon(KIcon("dialog-error")); + failureIcon->setIcon(KDE::icon("dialog-error")); failureLayout->addItem(failureIcon); Label *failureWidget = new Plasma::Label(q); @@ -227,7 +227,7 @@ void GraphicsViewAppletPrivate::updateFailedToLaunch(const QString &reason) Plasma::ToolTipManager::self()->registerWidget(failureIcon); Plasma::ToolTipContent data(i18n("Unable to load the widget"), reason, - KIcon("dialog-error")); + KDE::icon("dialog-error")); Plasma::ToolTipManager::self()->setContent(failureIcon, data); q->setLayout(failureLayout); diff --git a/popupapplet.cpp b/popupapplet.cpp index 67e06066c..976393b79 100644 --- a/popupapplet.cpp +++ b/popupapplet.cpp @@ -32,7 +32,6 @@ #include #endif -#include #include #include #include @@ -94,7 +93,7 @@ void PopupApplet::setPopupIcon(const QString &iconName) if (package().isValid()) { const QString file = package().filePath("images", iconName); if (!file.isEmpty()) { - setPopupIcon(KIcon(file)); + setPopupIcon(KDE::icon(file)); return; } } @@ -105,14 +104,14 @@ void PopupApplet::setPopupIcon(const QString &iconName) d->createIconWidget(); d->icon->setSvg(name, iconName); if (d->icon->svg().isEmpty()) { - setPopupIcon(KIcon(iconName)); + setPopupIcon(KDE::icon(iconName)); } return; } - // Final Attempt: use KIcon - setPopupIcon(KIcon(iconName)); + // Final Attempt: use KDE::icon + setPopupIcon(KDE::icon(iconName)); } QIcon PopupApplet::popupIcon() const diff --git a/private/applethandle.cpp b/private/applethandle.cpp index 9232e6c18..0c068dad4 100644 --- a/private/applethandle.cpp +++ b/private/applethandle.cpp @@ -34,7 +34,6 @@ #include #include -#include #include #include diff --git a/private/appletprivate.cpp b/private/appletprivate.cpp index 1b790c546..2f17a4593 100644 --- a/private/appletprivate.cpp +++ b/private/appletprivate.cpp @@ -36,7 +36,6 @@ #include #include -#include #include namespace Plasma @@ -292,21 +291,21 @@ KActionCollection* AppletPrivate::defaultActions(QObject *parent) KAction *configAction = actions->addAction("configure"); configAction->setAutoRepeat(false); configAction->setText(i18n("Widget Settings")); - configAction->setIcon(KIcon("configure")); + configAction->setIcon(KDE::icon("configure")); configAction->setShortcut(KShortcut("alt+d, s")); configAction->setData(AbstractToolBox::ConfigureTool); KAction *closeApplet = actions->addAction("remove"); closeApplet->setAutoRepeat(false); closeApplet->setText(i18n("Remove this Widget")); - closeApplet->setIcon(KIcon("edit-delete")); + closeApplet->setIcon(KDE::icon("edit-delete")); closeApplet->setShortcut(KShortcut("alt+d, r")); closeApplet->setData(AbstractToolBox::DestructiveTool); KAction *runAssociatedApplication = actions->addAction("run associated application"); runAssociatedApplication->setAutoRepeat(false); runAssociatedApplication->setText(i18n("Run the Associated Application")); - runAssociatedApplication->setIcon(KIcon("system-run")); + runAssociatedApplication->setIcon(KDE::icon("system-run")); runAssociatedApplication->setShortcut(KShortcut("alt+d, t")); runAssociatedApplication->setVisible(false); runAssociatedApplication->setEnabled(false); diff --git a/private/associatedapplicationmanager.cpp b/private/associatedapplicationmanager.cpp index ed309ef6e..efe8f2989 100644 --- a/private/associatedapplicationmanager.cpp +++ b/private/associatedapplicationmanager.cpp @@ -25,7 +25,6 @@ #include #include -#include #ifndef PLASMA_NO_KIO #include @@ -129,7 +128,7 @@ void AssociatedApplicationManager::run(Plasma::Applet *applet) #endif if (!success) { - applet->showMessage(KIcon("application-exit"), i18n("There was an error attempting to exec the associated application with this widget."), ButtonOk); + applet->showMessage(KDE::icon("application-exit"), i18n("There was an error attempting to exec the associated application with this widget."), ButtonOk); } } else if (d->urlLists.contains(applet) && !d->urlLists.value(applet).isEmpty()) { diff --git a/private/nativetabbar.cpp b/private/nativetabbar.cpp index f7affc53a..e6b14b167 100644 --- a/private/nativetabbar.cpp +++ b/private/nativetabbar.cpp @@ -37,7 +37,6 @@ // KDE #include #include -#include #include #include diff --git a/remote/accessappletjob.cpp b/remote/accessappletjob.cpp index 461435b78..620df730e 100644 --- a/remote/accessappletjob.cpp +++ b/remote/accessappletjob.cpp @@ -26,7 +26,6 @@ #include #include #include -#include #include "config-plasma.h" @@ -135,7 +134,7 @@ public: dialog->setButtonText(KDialog::Yes, i18n("Open Widget")); dialog->setButtonText(KDialog::No, i18n("Reject Widget")); - int answer = KMessageBox::createKMessageBox(dialog, KIcon(iconName), message, + int answer = KMessageBox::createKMessageBox(dialog, KDE::icon(iconName), message, QStringList(), QString(), 0, KMessageBox::Dangerous); diff --git a/tooltipmanager.h b/tooltipmanager.h index d8b5fc37f..3c01a0035 100644 --- a/tooltipmanager.h +++ b/tooltipmanager.h @@ -48,7 +48,7 @@ class Corona; * Plasma::ToolTipContent data; * data.mainText = i18n("My Title"); * data.subText = i18n("This is a little tooltip"); - * data.image = KIcon("some-icon").pixmap(IconSize(KIconLoader::Desktop)); + * data.image = KDE::icon("some-icon").pixmap(IconSize(KIconLoader::Desktop)); * Plasma::ToolTipManager::self()->setContent(widget, data); * @endcode * diff --git a/widgets/iconwidget.cpp b/widgets/iconwidget.cpp index 208b7a7cb..151cb7119 100644 --- a/widgets/iconwidget.cpp +++ b/widgets/iconwidget.cpp @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -1307,7 +1306,7 @@ void IconWidget::setIcon(const QString &icon) return; } - setIcon(KIcon(icon)); + setIcon(KDE::icon(icon)); } void IconWidget::setIcon(const QIcon &icon) diff --git a/widgets/iconwidget.h b/widgets/iconwidget.h index d96e90c96..3989fb1a3 100644 --- a/widgets/iconwidget.h +++ b/widgets/iconwidget.h @@ -139,7 +139,7 @@ public: /** * Sets the graphical icon for this Plasma::IconWidget. - * @param icon the KIcon to associate with this icon. + * @param icon the KDE::icon to associate with this icon. */ void setIcon(const QIcon &icon); diff --git a/widgets/pushbutton.cpp b/widgets/pushbutton.cpp index b607528d2..0e3ea8706 100644 --- a/widgets/pushbutton.cpp +++ b/widgets/pushbutton.cpp @@ -25,7 +25,6 @@ #include #include -#include #include #include #include @@ -99,7 +98,7 @@ public: pm = QPixmap(absImagePath); } - static_cast(q->widget())->setIcon(KIcon(pm)); + static_cast(q->widget())->setIcon(KDE::icon(pm)); } void pressedChanged() diff --git a/widgets/pushbutton.h b/widgets/pushbutton.h index b27e7fbf5..a2c0f161e 100644 --- a/widgets/pushbutton.h +++ b/widgets/pushbutton.h @@ -22,7 +22,6 @@ #include -#include class KPushButton; @@ -120,7 +119,7 @@ public: QAction *action() const; /** - * sets the icon for this push button using a KIcon + * sets the icon for this push button using a KDE::icon * * @param icon the icon to use * diff --git a/widgets/toolbutton.cpp b/widgets/toolbutton.cpp index e9f1e021d..b6e785b1a 100644 --- a/widgets/toolbutton.cpp +++ b/widgets/toolbutton.cpp @@ -26,7 +26,6 @@ #include #include -#include #include #include @@ -95,7 +94,7 @@ public: pm = QPixmap(absImagePath); } - static_cast(q->widget())->setIcon(KIcon(pm)); + static_cast(q->widget())->setIcon(KDE::icon(pm)); } void syncActiveRect(); diff --git a/widgets/videowidget.cpp b/widgets/videowidget.cpp index daebfe4d9..93288e959 100644 --- a/widgets/videowidget.cpp +++ b/widgets/videowidget.cpp @@ -26,7 +26,6 @@ #include #include -#include #include #ifndef PLASMA_NO_KIO @@ -458,7 +457,7 @@ void VideoWidget::setUsedControls(const Controls controls) if (controls&OpenFile) { if (!d->openFileButton) { d->openFileButton = new IconWidget(d->controlsWidget); - d->openFileButton->setIcon(KIcon("document-open")); + d->openFileButton->setIcon(KDE::icon("document-open")); connect(d->openFileButton, SIGNAL(clicked()), this, SLOT(showOpenFileDialog())); } controlsLayout->addItem(d->openFileButton);