X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/2f045c60109e0a5811f68bcce617236e3478e402..48b58f830a585b773435c9af5ee2fe8f0c7c641d:/src/settings/serviceitemdelegate.cpp

diff --git a/src/settings/serviceitemdelegate.cpp b/src/settings/serviceitemdelegate.cpp
index 8058b369b..0f2030484 100644
--- a/src/settings/serviceitemdelegate.cpp
+++ b/src/settings/serviceitemdelegate.cpp
@@ -19,16 +19,12 @@
 
 #include "serviceitemdelegate.h"
 
-#include <KDebug>
-#include <KPushButton>
-#include <KIcon>
-
 #include "servicemodel.h"
 
 #include <QAbstractItemView>
 #include <QCheckBox>
-#include <QModelIndex>
 #include <QPainter>
+#include <QPushButton>
 
 ServiceItemDelegate::ServiceItemDelegate(QAbstractItemView* itemView, QObject* parent) :
     KWidgetItemDelegate(itemView, parent)
@@ -72,12 +68,12 @@ QList<QWidget*> ServiceItemDelegate::createItemWidgets(const QModelIndex&) const
     QPalette palette = checkBox->palette();
     palette.setColor(QPalette::WindowText, palette.color(QPalette::Text));
     checkBox->setPalette(palette);
-    connect(checkBox, SIGNAL(clicked(bool)), this, SLOT(slotCheckBoxClicked(bool)));
+    connect(checkBox, &QCheckBox::clicked, this, &ServiceItemDelegate::slotCheckBoxClicked);
 
-    KPushButton* configureButton = new KPushButton();
-    connect(configureButton, SIGNAL(clicked()), this, SLOT(slotConfigureButtonClicked()));
+    QPushButton* configureButton = new QPushButton();
+    connect(configureButton, &QPushButton::clicked, this, &ServiceItemDelegate::slotConfigureButtonClicked);
 
-    return QList<QWidget*>() << checkBox << configureButton;
+    return {checkBox, configureButton};
 }
 
 void ServiceItemDelegate::updateItemWidgets(const QList<QWidget*> widgets,
@@ -85,7 +81,7 @@ void ServiceItemDelegate::updateItemWidgets(const QList<QWidget*> widgets,
                                               const QPersistentModelIndex& index) const
 {
     QCheckBox* checkBox = static_cast<QCheckBox*>(widgets[0]);
-    KPushButton *configureButton = static_cast<KPushButton*>(widgets[1]);
+    QPushButton *configureButton = static_cast<QPushButton*>(widgets[1]);
 
     const int itemHeight = sizeHint(option, index).height();
 
@@ -94,7 +90,7 @@ void ServiceItemDelegate::updateItemWidgets(const QList<QWidget*> widgets,
     checkBox->setText(model->data(index).toString());
     const QString iconName = model->data(index, Qt::DecorationRole).toString();
     if (!iconName.isEmpty()) {
-        checkBox->setIcon(KIcon(iconName));
+        checkBox->setIcon(QIcon::fromTheme(iconName));
     }
     checkBox->setChecked(model->data(index, Qt::CheckStateRole).toBool());
 
@@ -110,7 +106,7 @@ void ServiceItemDelegate::updateItemWidgets(const QList<QWidget*> widgets,
     // Update the configuration button
     if (configurable) {
         configureButton->setEnabled(checkBox->isChecked());
-        configureButton->setIcon(KIcon("configure"));
+        configureButton->setIcon(QIcon::fromTheme(QStringLiteral("configure")));
         configureButton->resize(configureButton->sizeHint());
         configureButton->move(option.rect.right() - configureButton->width(),
                               (itemHeight - configureButton->height()) / 2);
@@ -129,4 +125,3 @@ void ServiceItemDelegate::slotConfigureButtonClicked()
     emit requestServiceConfiguration(focusedIndex());
 }
 
-#include "serviceitemdelegate.moc"