Merge branch 'master' into frameworks

[dolphin.git] / src / settings / serviceitemdelegate.cpp

diff --git a/src/settings/serviceitemdelegate.cpp b/src/settings/serviceitemdelegate.cpp
index 3dc314631a1ac4845e735fa52714d113c1412387..43406eeda0eb1e4241fd2b92cecfd5fc5175cd4a 100644 (file)
--- a/src/settings/serviceitemdelegate.cpp
+++ b/src/settings/serviceitemdelegate.cpp
@@ -21,6 +21,7 @@
 
 #include <KDebug>
 #include <KPushButton>
+#include <KIcon>
 
 #include "servicemodel.h"
 
@@ -65,13 +66,16 @@ void ServiceItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& o
     painter->restore();
 }
 
-QList<QWidget*> ServiceItemDelegate::createItemWidgets() const
+QList<QWidget*> ServiceItemDelegate::createItemWidgets(const QModelIndex&) const
 {
     QCheckBox* checkBox = new QCheckBox();
-    connect(checkBox, SIGNAL(clicked(bool)), this, SLOT(slotCheckBoxClicked(bool)));
+    QPalette palette = checkBox->palette();
+    palette.setColor(QPalette::WindowText, palette.color(QPalette::Text));
+    checkBox->setPalette(palette);
+    connect(checkBox, &QCheckBox::clicked, this, &ServiceItemDelegate::slotCheckBoxClicked);
 
     KPushButton* configureButton = new KPushButton();
-    connect(configureButton, SIGNAL(clicked()), this, SLOT(slotConfigureButtonClicked()));
+    connect(configureButton, &KPushButton::clicked, this, &ServiceItemDelegate::slotConfigureButtonClicked);
 
     return QList<QWidget*>() << checkBox << configureButton;
 }
@@ -125,4 +129,3 @@ void ServiceItemDelegate::slotConfigureButtonClicked()
     emit requestServiceConfiguration(focusedIndex());
 }
 
-#include "serviceitemdelegate.moc"