Merge branch 'master' into kf6

[dolphin.git] / src / settings / interface / previewssettingspage.cpp

diff --git a/src/settings/interface/previewssettingspage.cpp b/src/settings/interface/previewssettingspage.cpp
index ef98d0f8d368b82f304de7c3f02bb7ebd1846503..dd1ce942e076ee94898addf935e2ce2b94dad308 100644 (file)
--- a/src/settings/interface/previewssettingspage.cpp
+++ b/src/settings/interface/previewssettingspage.cpp
@@ -6,9 +6,7 @@
 
 #include "previewssettingspage.h"
 
 
 #include "previewssettingspage.h"
 

-#include "configurepreviewplugindialog.h"

 #include "dolphin_generalsettings.h"
 #include "dolphin_generalsettings.h"

-#include "settings/serviceitemdelegate.h"

 #include "settings/servicemodel.h"
 
 #include <KIO/PreviewJob>
 #include "settings/servicemodel.h"
 
 #include <KIO/PreviewJob>


@@ -45,12 +43,6 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget *parent)
     m_listView = new QListView(this);
     QScroller::grabGesture(m_listView->viewport(), QScroller::TouchGesture);
 
     m_listView = new QListView(this);
     QScroller::grabGesture(m_listView->viewport(), QScroller::TouchGesture);
 

-#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 87)
-    ServiceItemDelegate *delegate = new ServiceItemDelegate(m_listView, m_listView);
-    connect(delegate, &ServiceItemDelegate::requestServiceConfiguration, this, &PreviewsSettingsPage::configureService);
-    m_listView->setItemDelegate(delegate);
-#endif
-

     ServiceModel *serviceModel = new ServiceModel(this);
     QSortFilterProxyModel *proxyModel = new QSortFilterProxyModel(this);
     proxyModel->setSourceModel(serviceModel);
     ServiceModel *serviceModel = new ServiceModel(this);
     QSortFilterProxyModel *proxyModel = new QSortFilterProxyModel(this);
     proxyModel->setSourceModel(serviceModel);


@@ -111,7 +103,7 @@ void PreviewsSettingsPage::applySettings()
         m_enabledPreviewPlugins.clear();
         for (int i = 0; i < rowCount; ++i) {
             const QModelIndex index = model->index(i, 0);
         m_enabledPreviewPlugins.clear();
         for (int i = 0; i < rowCount; ++i) {
             const QModelIndex index = model->index(i, 0);

-            const bool checked = model->data(index, Qt::CheckStateRole).toBool();
+            const bool checked = model->data(index, Qt::CheckStateRole).value<Qt::CheckState>() == Qt::Checked;

             if (checked) {
                 const QString enabledPlugin = model->data(index, Qt::UserRole).toString();
                 m_enabledPreviewPlugins.append(enabledPlugin);
             if (checked) {
                 const QString enabledPlugin = model->data(index, Qt::UserRole).toString();
                 m_enabledPreviewPlugins.append(enabledPlugin);


@@ -150,19 +142,6 @@ void PreviewsSettingsPage::showEvent(QShowEvent *event)
     SettingsPageBase::showEvent(event);
 }
 
     SettingsPageBase::showEvent(event);
 }
 

-#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 87)
-void PreviewsSettingsPage::configureService(const QModelIndex &index)
-{
-    const QAbstractItemModel *model = index.model();
-    const QString pluginName = model->data(index).toString();
-    const QString desktopEntryName = model->data(index, ServiceModel::DesktopEntryNameRole).toString();
-
-    ConfigurePreviewPluginDialog *dialog = new ConfigurePreviewPluginDialog(pluginName, desktopEntryName, this);
-    dialog->setAttribute(Qt::WA_DeleteOnClose);
-    dialog->show();
-}
-#endif
-

 void PreviewsSettingsPage::loadPreviewPlugins()
 {
     QAbstractItemModel *model = m_listView->model();
 void PreviewsSettingsPage::loadPreviewPlugins()
 {
     QAbstractItemModel *model = m_listView->model();


@@ -173,14 +152,9 @@ void PreviewsSettingsPage::loadPreviewPlugins()
 
         model->insertRow(0);
         const QModelIndex index = model->index(0, 0);
 
         model->insertRow(0);
         const QModelIndex index = model->index(0, 0);

-        model->setData(index, show, Qt::CheckStateRole);
+        model->setData(index, show ? Qt::Checked : Qt::Unchecked, Qt::CheckStateRole);

         model->setData(index, plugin.name(), Qt::DisplayRole);
         model->setData(index, plugin.pluginId(), ServiceModel::DesktopEntryNameRole);
         model->setData(index, plugin.name(), Qt::DisplayRole);
         model->setData(index, plugin.pluginId(), ServiceModel::DesktopEntryNameRole);

-
-#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 87)
-        const bool configurable = plugin.value(QStringLiteral("Configurable"), false);
-        model->setData(index, configurable, ServiceModel::ConfigurableRole);
-#endif

     }
 
     model->sort(Qt::DisplayRole);
     }
 
     model->sort(Qt::DisplayRole);