Load KFileItemAction plugins with json metadata

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

diff --git a/src/settings/kcm/kcmdolphinservices.cpp b/src/settings/kcm/kcmdolphinservices.cpp
index 16bab07cd9cbf9b141b3cdde3d927b374c3f31c7..4885adf4f805bee5df2f671bdd6c59e9e8f6014d 100644 (file)
--- a/src/settings/kcm/kcmdolphinservices.cpp
+++ b/src/settings/kcm/kcmdolphinservices.cpp
@@ -19,18 +19,14 @@
 
 #include "kcmdolphinservices.h"
 
 
 #include "kcmdolphinservices.h"
 

-#include <KTabWidget>
-#include <KDialog>
-#include <KLocale>

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

-#include <KGlobal>

 
 #include <settings/services/servicessettingspage.h>
 
 #include <QVBoxLayout>
 
 
 #include <settings/services/servicessettingspage.h>
 
 #include <QVBoxLayout>
 

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

 K_EXPORT_PLUGIN(KCMDolphinServicesConfigFactory("kcmdolphinservices"))
 
 DolphinServicesConfigModule::DolphinServicesConfigModule(QWidget* parent, const QVariantList& args) :
 K_EXPORT_PLUGIN(KCMDolphinServicesConfigFactory("kcmdolphinservices"))
 
 DolphinServicesConfigModule::DolphinServicesConfigModule(QWidget* parent, const QVariantList& args) :


@@ -39,16 +35,13 @@ DolphinServicesConfigModule::DolphinServicesConfigModule(QWidget* parent, const
 {
     Q_UNUSED(args);
 
 {
     Q_UNUSED(args);
 

-    KGlobal::locale()->insertCatalog("dolphin");
-

     setButtons(KCModule::Default | KCModule::Help);
 
     QVBoxLayout* topLayout = new QVBoxLayout(this);
     topLayout->setMargin(0);
     setButtons(KCModule::Default | KCModule::Help);
 
     QVBoxLayout* topLayout = new QVBoxLayout(this);
     topLayout->setMargin(0);

-    topLayout->setSpacing(KDialog::spacingHint());

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

-    connect(m_services, SIGNAL(changed()), this, SLOT(changed()));
+    connect(m_services, &ServicesSettingsPage::changed, this, static_cast<void(DolphinServicesConfigModule::*)()>(&DolphinServicesConfigModule::changed));

     topLayout->addWidget(m_services, 0, 0);
 }
 
     topLayout->addWidget(m_services, 0, 0);
 }