Add Duplicate feature

[dolphin.git] / src / settings / kcm / kcmdolphinservices.cpp

diff --git a/src/settings/kcm/kcmdolphinservices.cpp b/src/settings/kcm/kcmdolphinservices.cpp
index 87778dd81b4d2b4380a012acaf37d40f88007106..e6a8867d7dde1754f0d9f88d368e308d0f098d14 100644 (file)
--- a/src/settings/kcm/kcmdolphinservices.cpp
+++ b/src/settings/kcm/kcmdolphinservices.cpp
@@ -19,37 +19,34 @@
 
 #include "kcmdolphinservices.h"
 
 
 #include "kcmdolphinservices.h"
 

-#include <KTabWidget>
-#include <KDialog>
-#include <KLocale>
+#include "settings/services/servicessettingspage.h"
+
+#include <kconfigwidgets_version.h>

 #include <KPluginFactory>
 #include <KPluginLoader>
 #include <KPluginFactory>
 #include <KPluginLoader>

-#include <KGlobal>
-
-#include <settings/services/servicessettingspage.h>

 
 #include <QVBoxLayout>
 
 
 #include <QVBoxLayout>
 

-K_PLUGIN_FACTORY(KCMDolphinServicesConfigFactory, registerPlugin<DolphinServicesConfigModule>("dolphinservices");)
-K_EXPORT_PLUGIN(KCMDolphinServicesConfigFactory("kcmdolphinservices"))
+K_PLUGIN_FACTORY(KCMDolphinServicesConfigFactory, registerPlugin<DolphinServicesConfigModule>(QStringLiteral("dolphinservices"));)

 
 DolphinServicesConfigModule::DolphinServicesConfigModule(QWidget* parent, const QVariantList& args) :
     KCModule(parent),
 
 DolphinServicesConfigModule::DolphinServicesConfigModule(QWidget* parent, const QVariantList& args) :
     KCModule(parent),

-    m_services(0)
+    m_services(nullptr)

 {
 {

-    Q_UNUSED(args);
-
-    KGlobal::locale()->insertCatalog("dolphin");
+    Q_UNUSED(args)

 
     setButtons(KCModule::Default | KCModule::Help);
 
     QVBoxLayout* topLayout = new QVBoxLayout(this);
 
     setButtons(KCModule::Default | KCModule::Help);
 
     QVBoxLayout* topLayout = new QVBoxLayout(this);

-    topLayout->setMargin(0);
-    topLayout->setSpacing(KDialog::spacingHint());
+    topLayout->setContentsMargins(0, 0, 0, 0);

 
     m_services = new ServicesSettingsPage(this);
 
     m_services = new ServicesSettingsPage(this);

-    connect(m_services, &ServicesSettingsPage::changed, this, static_cast<void(DolphinServicesConfigModule::*)()>(&DolphinServicesConfigModule::changed));
-    topLayout->addWidget(m_services, 0, 0);
+#if KCONFIGWIDGETS_VERSION < QT_VERSION_CHECK(5, 64, 0)
+    connect(m_services, &ServicesSettingsPage::changed, this, QOverload<>::of(&DolphinServicesConfigModule::changed));
+#else
+    connect(m_services, &ServicesSettingsPage::changed, this, &DolphinServicesConfigModule::markAsChanged);
+#endif
+    topLayout->addWidget(m_services, 0, {});

 }
 
 DolphinServicesConfigModule::~DolphinServicesConfigModule()
 }
 
 DolphinServicesConfigModule::~DolphinServicesConfigModule()