Fix for crash which was introduced by commit

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

diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp
index dbae987d1913c61394b90770fed366f2f211a419..3b85a201d4e54879acea5695abf8681dc187e84e 100644 (file)
--- a/src/settings/general/previewssettingspage.cpp
+++ b/src/settings/general/previewssettingspage.cpp
@@ -25,7 +25,7 @@
 #include <KConfigGroup>
 #include <KDialog>
 #include <KGlobal>
 #include <KConfigGroup>
 #include <KDialog>
 #include <KGlobal>

-#include <KLocale>
+#include <KLocalizedString>

 #include <KNumInput>
 #include <KServiceTypeTrader>
 #include <KService>
 #include <KNumInput>
 #include <KServiceTypeTrader>
 #include <KService>


@@ -65,8 +65,8 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) :
     m_listView = new QListView(this);
 
     ServiceItemDelegate* delegate = new ServiceItemDelegate(m_listView, m_listView);
     m_listView = new QListView(this);
 
     ServiceItemDelegate* delegate = new ServiceItemDelegate(m_listView, m_listView);

-    connect(delegate, SIGNAL(requestServiceConfiguration(QModelIndex)),
-            this, SLOT(configureService(QModelIndex)));
+    connect(delegate, &ServiceItemDelegate::requestServiceConfiguration,
+            this, &PreviewsSettingsPage::configureService);

 
     ServiceModel* serviceModel = new ServiceModel(this);
     QSortFilterProxyModel* proxyModel = new QSortFilterProxyModel(this);
 
     ServiceModel* serviceModel = new ServiceModel(this);
     QSortFilterProxyModel* proxyModel = new QSortFilterProxyModel(this);


@@ -79,7 +79,7 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) :
 
     QLabel* remoteFileSizeLabel = new QLabel(i18nc("@label", "Skip previews for remote files above:"), this);
 
 
     QLabel* remoteFileSizeLabel = new QLabel(i18nc("@label", "Skip previews for remote files above:"), this);
 

-    m_remoteFileSizeBox = new KIntSpinBox(this);
+    m_remoteFileSizeBox = new QSpinBox(this);

     m_remoteFileSizeBox->setSingleStep(1);
     m_remoteFileSizeBox->setSuffix(QLatin1String(" MB"));
     m_remoteFileSizeBox->setRange(0, 9999999); /* MB */
     m_remoteFileSizeBox->setSingleStep(1);
     m_remoteFileSizeBox->setSuffix(QLatin1String(" MB"));
     m_remoteFileSizeBox->setRange(0, 9999999); /* MB */


@@ -95,8 +95,8 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) :
 
     loadSettings();
 
 
     loadSettings();
 

-    connect(m_listView, SIGNAL(clicked(QModelIndex)), this, SIGNAL(changed()));
-    connect(m_remoteFileSizeBox, SIGNAL(valueChanged(int)), this, SIGNAL(changed()));
+    connect(m_listView, &QListView::clicked, this, &PreviewsSettingsPage::changed);
+    connect(m_remoteFileSizeBox, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &PreviewsSettingsPage::changed);

 }
 
 PreviewsSettingsPage::~PreviewsSettingsPage()
 }
 
 PreviewsSettingsPage::~PreviewsSettingsPage()


@@ -119,7 +119,7 @@ void PreviewsSettingsPage::applySettings()
         }
     }
 
         }
     }
 

-    KConfigGroup globalConfig(KGlobal::config(), QLatin1String("PreviewSettings"));
+    KConfigGroup globalConfig(KSharedConfig::openConfig(), QLatin1String("PreviewSettings"));

     globalConfig.writeEntry("Plugins", m_enabledPreviewPlugins);
 
     const qulonglong maximumRemoteSize = static_cast<qulonglong>(m_remoteFileSizeBox->value()) * 1024 * 1024;
     globalConfig.writeEntry("Plugins", m_enabledPreviewPlugins);
 
     const qulonglong maximumRemoteSize = static_cast<qulonglong>(m_remoteFileSizeBox->value()) * 1024 * 1024;


@@ -176,7 +176,7 @@ void PreviewsSettingsPage::loadPreviewPlugins()
 
 void PreviewsSettingsPage::loadSettings()
 {
 
 void PreviewsSettingsPage::loadSettings()
 {

-    KConfigGroup globalConfig(KGlobal::config(), "PreviewSettings");
+    KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");

     m_enabledPreviewPlugins = globalConfig.readEntry("Plugins", QStringList()
                                                      << QLatin1String("directorythumbnail")
                                                      << QLatin1String("imagethumbnail")
     m_enabledPreviewPlugins = globalConfig.readEntry("Plugins", QStringList()
                                                      << QLatin1String("directorythumbnail")
                                                      << QLatin1String("imagethumbnail")


@@ -201,4 +201,3 @@ void PreviewsSettingsPage::loadSettings()
     m_remoteFileSizeBox->setValue(maxRemoteMByteSize);
 }
 
     m_remoteFileSizeBox->setValue(maxRemoteMByteSize);
 }
 

-#include "previewssettingspage.moc"