summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2014-12-21 07:23:56 +0100
committerMontel Laurent <[email protected]>2014-12-21 07:23:56 +0100
commit9048ffaf10c8816e05885215293326f35a626efa (patch)
treef802d8027fcd95606c8c53dce08b199caf2d9a54
parent708cb04c7a2f00d93e0172d207380fe2b86b2f14 (diff)
Port to QIcon
-rw-r--r--src/detailDialog.cpp6
-rw-r--r--src/generalConfigurationWidget.cpp6
-rw-r--r--src/lib/logViewFilterWidget.cpp2
-rw-r--r--src/lib/logViewSearchWidget.cpp8
-rw-r--r--src/lib/logViewWidget.cpp4
-rw-r--r--src/lib/multipleActions.cpp2
-rw-r--r--src/lib/multipleActions.h4
-rw-r--r--src/lib/view.cpp2
-rw-r--r--src/mainWindow.cpp28
-rw-r--r--src/modes/acpid/acpidLogMode.cpp2
-rw-r--r--src/modes/apache/apacheAccessLogMode.cpp2
-rw-r--r--src/modes/apache/apacheFactory.cpp2
-rw-r--r--src/modes/apache/apacheLogMode.cpp2
-rw-r--r--src/modes/authentication/authenticationLogMode.cpp2
-rw-r--r--src/modes/base/fileList.cpp14
-rw-r--r--src/modes/base/logLevelFileList.cpp4
-rw-r--r--src/modes/base/multipleFileList.cpp14
-rw-r--r--src/modes/cron/cronLogMode.cpp2
-rw-r--r--src/modes/cups/cupsAccessLogMode.cpp2
-rw-r--r--src/modes/cups/cupsFactory.cpp2
-rw-r--r--src/modes/cups/cupsLogMode.cpp2
-rw-r--r--src/modes/cups/cupsPageLogMode.cpp2
-rw-r--r--src/modes/cups/cupsPdfLogMode.cpp2
-rw-r--r--src/modes/daemon/daemonLogMode.cpp2
-rw-r--r--src/modes/kernel/kernelLogMode.cpp2
-rw-r--r--src/modes/open/openLogMode.cpp2
-rw-r--r--src/modes/postfix/postfixLogMode.cpp2
-rw-r--r--src/modes/samba/netbiosLogMode.cpp2
-rw-r--r--src/modes/samba/sambaAccessLogMode.cpp2
-rw-r--r--src/modes/samba/sambaFactory.cpp2
-rw-r--r--src/modes/samba/sambaLogMode.cpp2
-rw-r--r--src/modes/system/systemLogMode.cpp2
-rw-r--r--src/modes/xorg/xorgLogMode.cpp2
-rw-r--r--src/modes/xsession/xsessionLogMode.cpp2
-rw-r--r--src/statusBar.cpp4
-rw-r--r--src/tabLogViewsWidget.cpp6
36 files changed, 74 insertions, 74 deletions
diff --git a/src/detailDialog.cpp b/src/detailDialog.cpp
index 87eb2af..3d509e1 100644
--- a/src/detailDialog.cpp
+++ b/src/detailDialog.cpp
@@ -23,7 +23,7 @@
//Qt includes
-#include <kicon.h>
+#include <QIcon>
#include <kiconloader.h>
#include <klocale.h>
@@ -40,11 +40,11 @@ DetailDialog::DetailDialog(QWidget* parent) :
setupUi(this);
previous->setText(i18n("&Previous"));
- previous->setIcon(KIcon( QLatin1String( "arrow-up" )));
+ previous->setIcon(QIcon::fromTheme( QLatin1String( "arrow-up" )));
connect(previous, SIGNAL(clicked()), this, SLOT(previousItem()));
next->setText(i18n("&Next"));
- next->setIcon(KIcon( QLatin1String( "arrow-down" )));
+ next->setIcon(QIcon::fromTheme( QLatin1String( "arrow-down" )));
connect(next, SIGNAL(clicked()), this, SLOT(nextItem()));
closeButton->setText(KStandardGuiItem::close().text());
diff --git a/src/generalConfigurationWidget.cpp b/src/generalConfigurationWidget.cpp
index 6b90324..15b2d9d 100644
--- a/src/generalConfigurationWidget.cpp
+++ b/src/generalConfigurationWidget.cpp
@@ -28,7 +28,7 @@
#include <kglobal.h>
#include <klocale.h>
-#include <kicon.h>
+#include <QIcon>
#include <kstandarddirs.h>
#include "logging.h"
@@ -48,13 +48,13 @@ GeneralConfigurationWidget::GeneralConfigurationWidget() :
setupUi(this);
- startupLogMode->addItem(KIcon( QLatin1String( NO_MODE_ICON) ), i18n("No Log Mode"), QVariant(QLatin1String( "" ) ));
+ startupLogMode->addItem(QIcon::fromTheme( QLatin1String( NO_MODE_ICON) ), i18n("No Log Mode"), QVariant(QLatin1String( "" ) ));
foreach(LogMode* logMode, Globals::instance()->logModes()) {
//Ignore this special case
if (logMode->id() == QLatin1String( "openLogMode" ))
continue;
- startupLogMode->addItem(KIcon(logMode->icon()), logMode->name(), QVariant(logMode->id()));
+ startupLogMode->addItem(QIcon::fromTheme(logMode->icon()), logMode->name(), QVariant(logMode->id()));
}
connect(startupLogMode, SIGNAL(currentIndexChanged(int)), this, SIGNAL(configurationChanged()));
diff --git a/src/lib/logViewFilterWidget.cpp b/src/lib/logViewFilterWidget.cpp
index f07909b..bc9650c 100644
--- a/src/lib/logViewFilterWidget.cpp
+++ b/src/lib/logViewFilterWidget.cpp
@@ -28,7 +28,7 @@
#include <kcombobox.h>
#include <kiconloader.h>
-#include <kicon.h>
+#include <QIcon>
#include <klocale.h>
#include "logViewWidget.h"
diff --git a/src/lib/logViewSearchWidget.cpp b/src/lib/logViewSearchWidget.cpp
index 4a0d038..96df68e 100644
--- a/src/lib/logViewSearchWidget.cpp
+++ b/src/lib/logViewSearchWidget.cpp
@@ -30,7 +30,7 @@
#include <kiconloader.h>
-#include <kicon.h>
+#include <QIcon>
#include <klocale.h>
#include "logging.h"
@@ -68,13 +68,13 @@ LogViewSearchWidget::LogViewSearchWidget() :
//The message widget is hidden by default
hideMessage();
- closeButton->setIcon(KIcon( QLatin1String( "dialog-close" )));
+ closeButton->setIcon(QIcon::fromTheme( QLatin1String( "dialog-close" )));
connect(closeButton, SIGNAL(clicked()), this, SLOT(hide()));
- next->setIcon(KIcon( QLatin1String( "arrow-down" )));
+ next->setIcon(QIcon::fromTheme( QLatin1String( "arrow-down" )));
connect(next, SIGNAL(clicked()), this, SLOT(findNext()));
- previous->setIcon(KIcon( QLatin1String( "arrow-up" )));
+ previous->setIcon(QIcon::fromTheme( QLatin1String( "arrow-up" )));
connect(previous, SIGNAL(clicked()), this, SLOT(findPrevious()));
searchLabel->setBuddy(searchLine);
diff --git a/src/lib/logViewWidget.cpp b/src/lib/logViewWidget.cpp
index 213d7e6..c5df56a 100644
--- a/src/lib/logViewWidget.cpp
+++ b/src/lib/logViewWidget.cpp
@@ -24,7 +24,7 @@
#include <QAction>
#include <QHeaderView>
-#include <kicon.h>
+#include <QIcon>
#include <klocale.h>
#include "logging.h"
@@ -117,7 +117,7 @@ void LogViewWidget::setColumns(const LogViewColumns& columns) {
foreach(const LogViewColumn &column, columns.columns()) {
QAction* action = new QAction(this);
action->setText(column.columnName());
- //helloAction->setIcon(KIcon( QLatin1String( "media-playback-start" )));
+ //helloAction->setIcon(QIcon::fromTheme( QLatin1String( "media-playback-start" )));
//helloAction->setShortcut(Qt::CTRL + Qt::Key_M);
action->setCheckable(true);
action->setChecked(true);
diff --git a/src/lib/multipleActions.cpp b/src/lib/multipleActions.cpp
index 1be13c1..4ef542d 100644
--- a/src/lib/multipleActions.cpp
+++ b/src/lib/multipleActions.cpp
@@ -25,7 +25,7 @@
#include "logging.h"
-MultipleActions::MultipleActions(const KIcon& icon, const QString& text, QObject* parent) {
+MultipleActions::MultipleActions(const QIcon& icon, const QString& text, QObject* parent) {
action = new KActionMenu(icon, text, parent);
}
diff --git a/src/lib/multipleActions.h b/src/lib/multipleActions.h
index 73df977..186d962 100644
--- a/src/lib/multipleActions.h
+++ b/src/lib/multipleActions.h
@@ -32,7 +32,7 @@
#include "globals.h"
#include "logModeAction.h"
-
+#include <QIcon>
class QAction;
/**
@@ -45,7 +45,7 @@ class MultipleActions : public LogModeAction {
Q_OBJECT
public:
- MultipleActions(const KIcon& icon, const QString& text, QObject* parent);
+ MultipleActions(const QIcon& icon, const QString& text, QObject* parent);
virtual ~MultipleActions();
diff --git a/src/lib/view.cpp b/src/lib/view.cpp
index 6ea59e3..0736522 100644
--- a/src/lib/view.cpp
+++ b/src/lib/view.cpp
@@ -33,7 +33,7 @@
#include <QVBoxLayout>
#include <kiconloader.h>
-#include <kicon.h>
+#include <QIcon>
#include <klocale.h>
#include "logging.h"
diff --git a/src/mainWindow.cpp b/src/mainWindow.cpp
index c423773..0d43798 100644
--- a/src/mainWindow.cpp
+++ b/src/mainWindow.cpp
@@ -38,7 +38,7 @@
#include <kglobal.h>
#include <klocale.h>
-#include <kicon.h>
+#include <QIcon>
#include <kservice.h>
#include <kservicetypetrader.h>
@@ -404,7 +404,7 @@ void MainWindow::changeResumePauseAction(bool paused) {
if (paused == true) {
d->resumePauseAction->setText(i18n("Resu&me"));
- d->resumePauseAction->setIcon(KIcon( QLatin1String( "media-playback-start" )));
+ d->resumePauseAction->setIcon(QIcon::fromTheme( QLatin1String( "media-playback-start" )));
d->resumePauseAction->setShortcut(Qt::CTRL + Qt::Key_M);
d->resumePauseAction->setToolTip(i18n("Resume the watching of the current log"));
d->resumePauseAction->setWhatsThis(i18n("Resumes the watching of the current log. This action is only available when the user has already paused the reading."));
@@ -412,7 +412,7 @@ void MainWindow::changeResumePauseAction(bool paused) {
}
else {
d->resumePauseAction->setText(i18n("S&top"));
- d->resumePauseAction->setIcon(KIcon( QLatin1String( "media-playback-stop" )));
+ d->resumePauseAction->setIcon(QIcon::fromTheme( QLatin1String( "media-playback-stop" )));
d->resumePauseAction->setShortcut(Qt::CTRL + Qt::Key_P);
d->resumePauseAction->setToolTip(i18n("Pause the watching of the current log"));
d->resumePauseAction->setWhatsThis(i18n("Pauses the watching of the current log. This action is particularly useful when the system is writing too many lines to log files, causing KSystemLog to reload too frequently."));
@@ -618,7 +618,7 @@ void MainWindow::setupActions() {
d->sendMailAction = actionCollection()->addAction( QLatin1String( "send_mail" ));
d->sendMailAction->setText(i18n("&Email Selection..."));
- d->sendMailAction->setIcon(KIcon( QLatin1String( "mail-message-new" )));
+ d->sendMailAction->setIcon(QIcon::fromTheme( QLatin1String( "mail-message-new" )));
d->sendMailAction->setShortcut(Qt::CTRL + Qt::Key_M);
d->sendMailAction->setToolTip(i18n("Send the selection by mail"));
d->sendMailAction->setWhatsThis(i18n("Sends the selection by mail. Simply select the important lines and click on this menu entry to send the selection to a friend or a mailing list."));
@@ -626,7 +626,7 @@ void MainWindow::setupActions() {
d->logMessageAction = actionCollection()->addAction( QLatin1String( "log_message" ), this, SLOT(showLogMessageDialog()));
d->logMessageAction->setText(i18n("&Add Log Entry..."));
- d->logMessageAction->setIcon(KIcon( QLatin1String( "document-new" )));
+ d->logMessageAction->setIcon(QIcon::fromTheme( QLatin1String( "document-new" )));
d->logMessageAction->setShortcut(Qt::CTRL + Qt::Key_L);
d->logMessageAction->setToolTip(i18n("Add a log entry to the log system"));
d->logMessageAction->setWhatsThis(i18n("This action will open a dialog which lets you send a message to the log system."));
@@ -651,7 +651,7 @@ void MainWindow::setupActions() {
QAction* newTabAction = actionCollection()->addAction( QLatin1String( "new_tab" ), d->tabs, SLOT(createTab()));
newTabAction->setText(i18n("&New Tab"));
- newTabAction->setIcon(KIcon( QLatin1String( "tab-new" )));
+ newTabAction->setIcon(QIcon::fromTheme( QLatin1String( "tab-new" )));
newTabAction->setShortcut(Qt::CTRL + Qt::Key_T);
newTabAction->setToolTip(i18n("Create a new tab"));
newTabAction->setWhatsThis(i18n("Creates a new tab which can display another log."));
@@ -659,7 +659,7 @@ void MainWindow::setupActions() {
QAction* closeTabAction = actionCollection()->addAction( QLatin1String( "close_tab" ), d->tabs, SLOT(closeTab()));
closeTabAction->setText(i18n("&Close Tab"));
- closeTabAction->setIcon(KIcon( QLatin1String( "tab-close" )));
+ closeTabAction->setIcon(QIcon::fromTheme( QLatin1String( "tab-close" )));
closeTabAction->setShortcut(Qt::CTRL+Qt::Key_W);
closeTabAction->setToolTip(i18n("Close the current tab"));
closeTabAction->setWhatsThis(i18n("Closes the current tab."));
@@ -667,7 +667,7 @@ void MainWindow::setupActions() {
QAction* duplicateTabAction = actionCollection()->addAction( QLatin1String( "duplicate_tab" ), d->tabs, SLOT(duplicateTab()));
duplicateTabAction->setText(i18n("&Duplicate Tab"));
- duplicateTabAction->setIcon(KIcon( QLatin1String( "tab-duplicate" )));
+ duplicateTabAction->setIcon(QIcon::fromTheme( QLatin1String( "tab-duplicate" )));
duplicateTabAction->setShortcut(Qt::SHIFT + Qt::CTRL + Qt::Key_N);
duplicateTabAction->setToolTip(i18n("Duplicate the current tab"));
duplicateTabAction->setWhatsThis(i18n("Duplicates the current tab."));
@@ -679,7 +679,7 @@ void MainWindow::setupActions() {
QAction* moveTabLeftAction = actionCollection()->addAction( QLatin1String( "move_tab_left" ), d->tabs, SLOT(moveTabLeft()));
moveTabLeftAction->setText(i18n("Move Tab &Left"));
- moveTabLeftAction->setIcon(KIcon( QLatin1String( "arrow-left" )));
+ moveTabLeftAction->setIcon(QIcon::fromTheme( QLatin1String( "arrow-left" )));
moveTabLeftAction->setShortcut(Qt::SHIFT+Qt::CTRL+Qt::Key_Left);
moveTabLeftAction->setToolTip(i18n("Move the current tab to the left"));
moveTabLeftAction->setWhatsThis(i18n("Moves the current tab to the left."));
@@ -687,7 +687,7 @@ void MainWindow::setupActions() {
QAction* moveTabRightAction = actionCollection()->addAction( QLatin1String( "move_tab_right" ), d->tabs, SLOT(moveTabRight()));
moveTabRightAction->setText(i18n("Move Tab &Right"));
- moveTabRightAction->setIcon(KIcon( QLatin1String( "arrow-right" )));
+ moveTabRightAction->setIcon(QIcon::fromTheme( QLatin1String( "arrow-right" )));
moveTabRightAction->setShortcut(Qt::SHIFT+Qt::CTRL+Qt::Key_Right);
moveTabRightAction->setToolTip(i18n("Move the current tab to the right"));
moveTabRightAction->setWhatsThis(i18n("Moves the current tab to the right."));
@@ -695,7 +695,7 @@ void MainWindow::setupActions() {
d->reloadAction = actionCollection()->addAction( QLatin1String( "reload" ), d->tabs, SLOT(reloadCurrent()));
d->reloadAction->setText(i18n("&Reload"));
- d->reloadAction->setIcon(KIcon( QLatin1String( "view-refresh" )));
+ d->reloadAction->setIcon(QIcon::fromTheme( QLatin1String( "view-refresh" )));
d->reloadAction->setShortcut(Qt::Key_F5);
d->reloadAction->setToolTip(i18n("Reload the current log"));
d->reloadAction->setWhatsThis(i18n("Reloads the current log, if you want to be sure that the view is correctly updated."));
@@ -708,7 +708,7 @@ void MainWindow::setupActions() {
d->detailAction = actionCollection()->addAction( QLatin1String( "details" ), this, SLOT(showDetailsDialog()));
d->detailAction->setText(i18n("&Details"));
- d->detailAction->setIcon(KIcon( QLatin1String( "document-preview" )));
+ d->detailAction->setIcon(QIcon::fromTheme( QLatin1String( "document-preview" )));
d->detailAction->setShortcut(Qt::ALT + Qt::Key_Return);
d->detailAction->setToolTip(i18n("Display details on the selected line"));
d->detailAction->setWhatsThis(i18n("Displays a dialog box which contains details on the selected line. You are able to navigate through the logs from this dialog box with the <b>Previous</b> and <b>Next</b> buttons."));
@@ -772,8 +772,8 @@ void MainWindow::setupLogActions() {
QList<QAction*> menuLogModeActions;
QList<QAction*> toolBarLogModeActions;
- KActionMenu* servicesAction = new KActionMenu(KIcon( QLatin1String( "preferences-system-session-services") ), i18n("Services"), this);
- KActionMenu* othersAction = new KActionMenu(KIcon( QLatin1String( "preferences-other")), i18n("Others"), this);
+ KActionMenu* servicesAction = new KActionMenu(QIcon::fromTheme( QLatin1String( "preferences-system-session-services") ), i18n("Services"), this);
+ KActionMenu* othersAction = new KActionMenu(QIcon::fromTheme( QLatin1String( "preferences-other")), i18n("Others"), this);
d->logModesActionGroup=new QActionGroup(actionCollection());
diff --git a/src/modes/acpid/acpidLogMode.cpp b/src/modes/acpid/acpidLogMode.cpp
index c2b9eeb..a16ab54 100644
--- a/src/modes/acpid/acpidLogMode.cpp
+++ b/src/modes/acpid/acpidLogMode.cpp
@@ -23,7 +23,7 @@
#include <QList>
-#include <kicon.h>
+#include <QIcon>
#include <klocale.h>
#include "logging.h"
diff --git a/src/modes/apache/apacheAccessLogMode.cpp b/src/modes/apache/apacheAccessLogMode.cpp
index 904d199..bbfe13c 100644
--- a/src/modes/apache/apacheAccessLogMode.cpp
+++ b/src/modes/apache/apacheAccessLogMode.cpp
@@ -23,7 +23,7 @@
#include <QList>
-#include <kicon.h>
+#include <QIcon>
#include <klocale.h>
#include "logging.h"
diff --git a/src/modes/apache/apacheFactory.cpp b/src/modes/apache/apacheFactory.cpp
index b9db735..202889f 100644
--- a/src/modes/apache/apacheFactory.cpp
+++ b/src/modes/apache/apacheFactory.cpp
@@ -51,7 +51,7 @@ QList<LogMode*> ApacheLogModeFactory::createLogModes() const {
LogModeAction* ApacheLogModeFactory::createLogModeAction() const {
LogMode* apacheLogMode = Globals::instance()->findLogMode(QLatin1String( APACHE_LOG_MODE_ID ));
- MultipleActions* multipleActions = new MultipleActions(KIcon( QLatin1String(APACHE_MODE_ICON) ), i18n("Apache"), apacheLogMode);
+ MultipleActions* multipleActions = new MultipleActions(QIcon::fromTheme( QLatin1String(APACHE_MODE_ICON) ), i18n("Apache"), apacheLogMode);
multipleActions->addInnerAction(apacheLogMode->action());
multipleActions->addInnerAction(Globals::instance()->findLogMode(QLatin1String( APACHE_ACCESS_LOG_MODE_ID ))->action());
diff --git a/src/modes/apache/apacheLogMode.cpp b/src/modes/apache/apacheLogMode.cpp
index 800663b..8d7a28f 100644
--- a/src/modes/apache/apacheLogMode.cpp
+++ b/src/modes/apache/apacheLogMode.cpp
@@ -23,7 +23,7 @@
#include <QList>
-#include <kicon.h>
+#include <QIcon>
#include <klocale.h>
#include "logging.h"
diff --git a/src/modes/authentication/authenticationLogMode.cpp b/src/modes/authentication/authenticationLogMode.cpp
index bcaad5e..201dab8 100644
--- a/src/modes/authentication/authenticationLogMode.cpp
+++ b/src/modes/authentication/authenticationLogMode.cpp
@@ -23,7 +23,7 @@
#include <QList>
-#include <kicon.h>
+#include <QIcon>
#include <klocale.h>
#include "logging.h"
diff --git a/src/modes/base/fileList.cpp b/src/modes/base/fileList.cpp
index 2929e67..6647741 100644
--- a/src/modes/base/fileList.cpp
+++ b/src/modes/base/fileList.cpp
@@ -30,7 +30,7 @@
#include <kfiledialog.h>
#include <kurl.h>
#include <kmessagebox.h>
-#include <kicon.h>
+#include <QIcon>
#include <kmenu.h>
#include "defaults.h"
@@ -48,22 +48,22 @@ FileList::FileList(QWidget* parent, const QString& descriptionText) :
description->setText(descriptionText);
- fileListHelper.prepareButton(add, KIcon( QLatin1String( "document-new" )), this, SLOT(addItem()), fileList);
+ fileListHelper.prepareButton(add, QIcon::fromTheme( QLatin1String( "document-new" )), this, SLOT(addItem()), fileList);
- fileListHelper.prepareButton(modify, KIcon( QLatin1String( "document-open" )), this, SLOT(modifyItem()), fileList);
+ fileListHelper.prepareButton(modify, QIcon::fromTheme( QLatin1String( "document-open" )), this, SLOT(modifyItem()), fileList);
//Add a separator in the FileList
QAction* separator = new QAction(this);
separator->setSeparator(true);
fileList->addAction(separator);
- fileListHelper.prepareButton(remove, KIcon( QLatin1String( "list-remove" )), this, SLOT(removeSelectedItem()), fileList);
+ fileListHelper.prepareButton(remove, QIcon::fromTheme( QLatin1String( "list-remove" )), this, SLOT(removeSelectedItem()), fileList);
- fileListHelper.prepareButton(up, KIcon( QLatin1String( "go-up" )), this, SLOT(moveUpItem()), fileList);
+ fileListHelper.prepareButton(up, QIcon::fromTheme( QLatin1String( "go-up" )), this, SLOT(moveUpItem()), fileList);
- fileListHelper.prepareButton(down, KIcon( QLatin1String( "go-down" )), this, SLOT(moveDownItem()), fileList);
+ fileListHelper.prepareButton(down, QIcon::fromTheme( QLatin1String( "go-down" )), this, SLOT(moveDownItem()), fileList);
- fileListHelper.prepareButton(removeAll, KIcon( QLatin1String( "trash-empty" )), this, SLOT(removeAllItems()), fileList);
+ fileListHelper.prepareButton(removeAll, QIcon::fromTheme( QLatin1String( "trash-empty" )), this, SLOT(removeAllItems()), fileList);
connect(fileList, SIGNAL(itemSelectionChanged()), this, SLOT(updateButtons()));
connect(fileList, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(modifyItem(QListWidgetItem*)));
diff --git a/src/modes/base/logLevelFileList.cpp b/src/modes/base/logLevelFileList.cpp
index 7d34f8b..2baf624 100644
--- a/src/modes/base/logLevelFileList.cpp
+++ b/src/modes/base/logLevelFileList.cpp
@@ -33,7 +33,7 @@
#include <kfiledialog.h>
#include <kdialog.h>
#include <kmessagebox.h>
-#include <kicon.h>
+#include <QIcon>
#include <kurl.h>
#include <kvbox.h>
@@ -63,7 +63,7 @@ LogLevelFileList::LogLevelFileList(QWidget* parent, const QString& description)
//Insert the button just after the "Modify File" button
buttonsLayout()->insertWidget(2, changeItem);
- QAction* action = fileListHelper.prepareButtonAndAction(changeItem, KIcon( QLatin1String( "favorites" )), this, SLOT(changeItemType()));
+ QAction* action = fileListHelper.prepareButtonAndAction(changeItem, QIcon::fromTheme( QLatin1String( "favorites" )), this, SLOT(changeItemType()));
//Insert the action just after the "Modify File" action
fileList->insertAction(fileList->actions().at(2), action);
diff --git a/src/modes/base/multipleFileList.cpp b/src/modes/base/multipleFileList.cpp
index 731a3c3..c7d3aa4 100644
--- a/src/modes/base/multipleFileList.cpp
+++ b/src/modes/base/multipleFileList.cpp
@@ -31,7 +31,7 @@
#include <kfiledialog.h>
#include <kurl.h>
#include <kmessagebox.h>
-#include <kicon.h>
+#include <QIcon>
#include <kmenu.h>
#include "defaults.h"
@@ -49,7 +49,7 @@ MultipleFileList::MultipleFileList(QWidget* parent, const QString& descriptionTe
description->setText(descriptionText);
- fileListHelper.prepareButton(modify, KIcon( QLatin1String( "document-open" )), this, SLOT(modifyItem()), fileList);
+ fileListHelper.prepareButton(modify, QIcon::fromTheme( QLatin1String( "document-open" )), this, SLOT(modifyItem()), fileList);
fileList->header()->setVisible(false);
@@ -58,13 +58,13 @@ MultipleFileList::MultipleFileList(QWidget* parent, const QString& descriptionTe
separator->setSeparator(true);
fileList->addAction(separator);
- fileListHelper.prepareButton(remove, KIcon( QLatin1String( "list-remove" )), this, SLOT(removeSelectedItem()), fileList);
+ fileListHelper.prepareButton(remove, QIcon::fromTheme( QLatin1String( "list-remove" )), this, SLOT(removeSelectedItem()), fileList);
- fileListHelper.prepareButton(up, KIcon( QLatin1String( "go-up" )), this, SLOT(moveUpItem()), fileList);
+ fileListHelper.prepareButton(up, QIcon::fromTheme( QLatin1String( "go-up" )), this, SLOT(moveUpItem()), fileList);
- fileListHelper.prepareButton(down, KIcon( QLatin1String( "go-down" )), this, SLOT(moveDownItem()), fileList);
+ fileListHelper.prepareButton(down, QIcon::fromTheme( QLatin1String( "go-down" )), this, SLOT(moveDownItem()), fileList);
- fileListHelper.prepareButton(removeAll, KIcon( QLatin1String( "trash-empty" )), this, SLOT(removeAllItems()), fileList);
+ fileListHelper.prepareButton(removeAll, QIcon::fromTheme( QLatin1String( "trash-empty" )), this, SLOT(removeAllItems()), fileList);
connect(fileList, SIGNAL(itemSelectionChanged()), this, SLOT(updateButtons()));
connect(fileList, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), this, SLOT(modifyItem(QTreeWidgetItem*)));
@@ -184,7 +184,7 @@ int MultipleFileList::addCategory(const QString& itemName, const QString& button
int index = fileList->indexOfTopLevelItem(item);
QPushButton* addButton = new QPushButton(buttonName, this);
- QAction* action = fileListHelper.prepareButtonAndAction(addButton, KIcon( QLatin1String( "document-new" )));
+ QAction* action = fileListHelper.prepareButtonAndAction(addButton, QIcon::fromTheme( QLatin1String( "document-new" )));
//Insert the action in first position
fileList->insertAction(fileList->actions().at(addButtons.buttons().size()), action);
diff --git a/src/modes/cron/cronLogMode.cpp b/src/modes/cron/cronLogMode.cpp
index 000b977..6588311 100644
--- a/src/modes/cron/cronLogMode.cpp
+++ b/src/modes/cron/cronLogMode.cpp
@@ -23,7 +23,7 @@
#include <QList>
-#include <kicon.h>
+#include <QIcon>
#include <klocale.h>
#include "logging.h"
diff --git a/src/modes/cups/cupsAccessLogMode.cpp b/src/modes/cups/cupsAccessLogMode.cpp
index 38725d6..bd9c573 100644
--- a/src/modes/cups/cupsAccessLogMode.cpp
+++ b/src/modes/cups/cupsAccessLogMode.cpp
@@ -23,7 +23,7 @@
#include <QList>
-#include <kicon.h>
+#include <QIcon>
#include <klocale.h>
#include "logging.h"
diff --git a/src/modes/cups/cupsFactory.cpp b/src/modes/cups/cupsFactory.cpp
index fb3fafa..b55b230 100644
--- a/src/modes/cups/cupsFactory.cpp
+++ b/src/modes/cups/cupsFactory.cpp
@@ -55,7 +55,7 @@ QList<LogMode*> CupsLogModeFactory::createLogModes() const {
LogModeAction* CupsLogModeFactory::createLogModeAction() const {
LogMode* cupsLogMode = Globals::instance()->findLogMode(QLatin1String( CUPS_LOG_MODE_ID ));
- MultipleActions* multipleActions = new MultipleActions(KIcon( QLatin1String( CUPS_MODE_ICON) ), i18n("Cups"), cupsLogMode);
+ MultipleActions* multipleActions = new MultipleActions(QIcon::fromTheme( QLatin1String( CUPS_MODE_ICON) ), i18n("Cups"), cupsLogMode);
multipleActions->addInnerAction(cupsLogMode->action());
multipleActions->addInnerAction(Globals::instance()->findLogMode(QLatin1String( CUPS_ACCESS_LOG_MODE_ID ))->action());
multipleActions->addInnerAction(Globals::instance()->findLogMode(QLatin1String( CUPS_PAGE_LOG_MODE_ID ))->action());
diff --git a/src/modes/cups/cupsLogMode.cpp b/src/modes/cups/cupsLogMode.cpp
index 7e98e34..b11c19e 100644
--- a/src/modes/cups/cupsLogMode.cpp
+++ b/src/modes/cups/cupsLogMode.cpp
@@ -23,7 +23,7 @@
#include <QList>
-#include <kicon.h>
+#include <QIcon>
#include <klocale.h>
#include "logging.h"
diff --git a/src/modes/cups/cupsPageLogMode.cpp b/src/modes/cups/cupsPageLogMode.cpp
index 0508953..cef9db7 100644
--- a/src/modes/cups/cupsPageLogMode.cpp
+++ b/src/modes/cups/cupsPageLogMode.cpp
@@ -23,7 +23,7 @@
#include <QList>
-#include <kicon.h>
+#include <QIcon>
#include <klocale.h>
#include "logging.h"
diff --git a/src/modes/cups/cupsPdfLogMode.cpp b/src/modes/cups/cupsPdfLogMode.cpp
index 7a97812..9183aec 100644
--- a/src/modes/cups/cupsPdfLogMode.cpp
+++ b/src/modes/cups/cupsPdfLogMode.cpp
@@ -23,7 +23,7 @@
#include <QList>
-#include <kicon.h>
+#include <QIcon>
#include <klocale.h>
#include "logging.h"
diff --git a/src/modes/daemon/daemonLogMode.cpp b/src/modes/daemon/daemonLogMode.cpp
index 7ab0fb1..0a03554 100644
--- a/src/modes/daemon/daemonLogMode.cpp
+++ b/src/modes/daemon/daemonLogMode.cpp
@@ -23,7 +23,7 @@
#include <QList>
-#include <kicon.h>
+#include <QIcon>
#include <klocale.h>
#include "logging.h"
diff --git a/src/modes/kernel/kernelLogMode.cpp b/src/modes/kernel/kernelLogMode.cpp
index 9d58c41..94dacd4 100644
--- a/src/modes/kernel/kernelLogMode.cpp
+++ b/src/modes/kernel/kernelLogMode.cpp
@@ -24,7 +24,7 @@
#include <QList>
#include <QAction>
-#include <kicon.h>
+#include <QIcon>
#include <klocale.h>
#include "logging.h"
diff --git a/src/modes/open/openLogMode.cpp b/src/modes/open/openLogMode.cpp
index 6a6dfe1..813f59c 100644
--- a/src/modes/open/openLogMode.cpp
+++ b/src/modes/open/openLogMode.cpp
@@ -24,7 +24,7 @@
#include <QString>
#include <QList>
-#include <kicon.h>
+#include <QIcon>
#include <klocale.h>
#include <ktoggleaction.h>
diff --git a/src/modes/postfix/postfixLogMode.cpp b/src/modes/postfix/postfixLogMode.cpp
index 17fdc3e..010e6d6 100644
--- a/src/modes/postfix/postfixLogMode.cpp
+++ b/src/modes/postfix/postfixLogMode.cpp
@@ -23,7 +23,7 @@
#include <QList>
-#include <kicon.h>
+#include <QIcon>
#include <klocale.h>
#include "logging.h"
diff --git a/src/modes/samba/netbiosLogMode.cpp b/src/modes/samba/netbiosLogMode.cpp
index 8fabf63..bcce8fb 100644
--- a/src/modes/samba/netbiosLogMode.cpp
+++ b/src/modes/samba/netbiosLogMode.cpp
@@ -23,7 +23,7 @@
#include <QList>
-#include <kicon.h>
+#include <QIcon>
#include <klocale.h>
#include "logging.h"
diff --git a/src/modes/samba/sambaAccessLogMode.cpp b/src/modes/samba/sambaAccessLogMode.cpp
index ba6f4a5..fa6e5a6 100644
--- a/src/modes/samba/sambaAccessLogMode.cpp
+++ b/src/modes/samba/sambaAccessLogMode.cpp
@@ -23,7 +23,7 @@
#include <QList>
-#include <kicon.h>
+#include <QIcon>
#include <klocale.h>
#include "logging.h"
diff --git a/src/modes/samba/sambaFactory.cpp b/src/modes/samba/sambaFactory.cpp
index f7908d1..80bef15 100644
--- a/src/modes/samba/sambaFactory.cpp
+++ b/src/modes/samba/sambaFactory.cpp
@@ -55,7 +55,7 @@ QList<LogMode*> SambaLogModeFactory::createLogModes() const {
LogModeAction* SambaLogModeFactory::createLogModeAction() const {
LogMode* sambaLogMode = Globals::instance()->findLogMode(QLatin1String( SAMBA_LOG_MODE_ID ));
- MultipleActions* multipleActions = new MultipleActions(KIcon( QLatin1String( SAMBA_MODE_ICON) ), i18n("Samba"), sambaLogMode);
+ MultipleActions* multipleActions = new MultipleActions(QIcon::fromTheme( QLatin1String( SAMBA_MODE_ICON) ), i18n("Samba"), sambaLogMode);
multipleActions->addInnerAction(sambaLogMode->action());
multipleActions->addInnerAction(Globals::instance()->findLogMode(QLatin1String( SAMBA_ACCESS_LOG_MODE_ID ))->action());
multipleActions->addInnerAction(Globals::instance()->findLogMode(QLatin1String( NETBIOS_LOG_MODE_ID ))->action());
diff --git a/src/modes/samba/sambaLogMode.cpp b/src/modes/samba/sambaLogMode.cpp
index 950c069..b5795c8 100644
--- a/src/modes/samba/sambaLogMode.cpp
+++ b/src/modes/samba/sambaLogMode.cpp
@@ -23,7 +23,7 @@
#include <QList>
-#include <kicon.h>
+#include <QIcon>
#include <klocale.h>
#include "logging.h"
diff --git a/src/modes/system/systemLogMode.cpp b/src/modes/system/systemLogMode.cpp
index b7cc636..4541b1b 100644
--- a/src/modes/system/systemLogMode.cpp
+++ b/src/modes/system/systemLogMode.cpp
@@ -23,7 +23,7 @@
#include <QList>
-#include <kicon.h>
+#include <QIcon>
#include <klocale.h>
#include "logging.h"
diff --git a/src/modes/xorg/xorgLogMode.cpp b/src/modes/xorg/xorgLogMode.cpp
index 68c751e..0f9b9cb 100644
--- a/src/modes/xorg/xorgLogMode.cpp
+++ b/src/modes/xorg/xorgLogMode.cpp
@@ -23,7 +23,7 @@
#include <QList>
-#include <kicon.h>
+#include <QIcon>
#include <klocale.h>
#include "logging.h"
diff --git a/src/modes/xsession/xsessionLogMode.cpp b/src/modes/xsession/xsessionLogMode.cpp
index d623e86..2e117cd 100644
--- a/src/modes/xsession/xsessionLogMode.cpp
+++ b/src/modes/xsession/xsessionLogMode.cpp
@@ -23,7 +23,7 @@
#include <QList>
-#include <kicon.h>
+#include <QIcon>
#include <klocale.h>
#include "logging.h"
diff --git a/src/statusBar.cpp b/src/statusBar.cpp
index d890ad0..581ab5e 100644
--- a/src/statusBar.cpp
+++ b/src/statusBar.cpp
@@ -26,7 +26,7 @@
#include <QComboBox>
#include <QTime>
-#include <kicon.h>
+#include <QIcon>
#include <kglobal.h>
#include <kcombobox.h>
@@ -70,7 +70,7 @@ StatusBar::StatusBar(QWidget* parent) :
/*
d->toggleHistory = new QPushButton(this);
- d->toggleHistory->setIcon(KIcon( QLatin1String( "view-history" )));
+ d->toggleHistory->setIcon(QIcon::fromTheme( QLatin1String( "view-history" )));
d->toggleHistory->setFlat(true);
addPermanentWidget(d->toggleHistory, 0);
diff --git a/src/tabLogViewsWidget.cpp b/src/tabLogViewsWidget.cpp
index ec3ee70..b557708 100644
--- a/src/tabLogViewsWidget.cpp
+++ b/src/tabLogViewsWidget.cpp
@@ -27,7 +27,7 @@
#include <klocale.h>
#include <kiconloader.h>
-#include <kicon.h>
+#include <QIcon>
#include "logging.h"
@@ -332,7 +332,7 @@ void TabLogViewsWidget::changeReloadingTab(View* view, bool reloading) {
TabLogManager* tabLogManager = findRelatedTabLogManager(view);
if (reloading == true)
- changeTab(tabLogManager->logManager()->usedView(), KIcon( QLatin1String( "view-refresh" )), tabLogManager->title());
+ changeTab(tabLogManager->logManager()->usedView(), QIcon::fromTheme( QLatin1String( "view-refresh" )), tabLogManager->title());
else
changeTab(tabLogManager->logManager()->usedView(), logModeIcon(tabLogManager->logManager()->logMode()), tabLogManager->title());
}
@@ -386,7 +386,7 @@ void TabLogViewsWidget::printSelectionCurrentView() {
QIcon TabLogViewsWidget::logModeIcon(LogMode* logMode) {
if ( logMode == NULL)
- return KIcon(QLatin1String( NO_MODE_ICON ));
+ return QIcon::fromTheme(QLatin1String( NO_MODE_ICON ));
else
return logMode->icon();