Load KFileItemAction plugins with json metadata

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

diff --git a/src/settings/serviceitemdelegate.cpp b/src/settings/serviceitemdelegate.cpp
index 8058b369bb1e6b6f9b7092655aac987e4efbe1c8..e2398d7fb15987d0fb93410bdd313250ab77cecd 100644 (file)
--- a/src/settings/serviceitemdelegate.cpp
+++ b/src/settings/serviceitemdelegate.cpp
@@ -19,9 +19,9 @@
 
 #include "serviceitemdelegate.h"
 
 
 #include "serviceitemdelegate.h"
 

-#include <KDebug>
-#include <KPushButton>
-#include <KIcon>
+#include "dolphindebug.h"
+#include <QPushButton>
+#include <QIcon>

 
 #include "servicemodel.h"
 
 
 #include "servicemodel.h"
 


@@ -72,12 +72,12 @@ QList<QWidget*> ServiceItemDelegate::createItemWidgets(const QModelIndex&) const
     QPalette palette = checkBox->palette();
     palette.setColor(QPalette::WindowText, palette.color(QPalette::Text));
     checkBox->setPalette(palette);
     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,
 }
 
 void ServiceItemDelegate::updateItemWidgets(const QList<QWidget*> widgets,


@@ -85,7 +85,7 @@ void ServiceItemDelegate::updateItemWidgets(const QList<QWidget*> widgets,
                                               const QPersistentModelIndex& index) const
 {
     QCheckBox* checkBox = static_cast<QCheckBox*>(widgets[0]);
                                               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();
 
 
     const int itemHeight = sizeHint(option, index).height();
 


@@ -94,7 +94,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->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());
 
     }
     checkBox->setChecked(model->data(index, Qt::CheckStateRole).toBool());
 


@@ -110,7 +110,7 @@ void ServiceItemDelegate::updateItemWidgets(const QList<QWidget*> widgets,
     // Update the configuration button
     if (configurable) {
         configureButton->setEnabled(checkBox->isChecked());
     // 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);
         configureButton->resize(configureButton->sizeHint());
         configureButton->move(option.rect.right() - configureButton->width(),
                               (itemHeight - configureButton->height()) / 2);


@@ -129,4 +129,3 @@ void ServiceItemDelegate::slotConfigureButtonClicked()
     emit requestServiceConfiguration(focusedIndex());
 }
 
     emit requestServiceConfiguration(focusedIndex());
 }
 

-#include "serviceitemdelegate.moc"