Load KFileItemAction plugins with json metadata

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

diff --git a/src/settings/kcm/kcmdolphinnavigation.cpp b/src/settings/kcm/kcmdolphinnavigation.cpp
index 36345a5156b9e905e1bc89a9a0f465aace369df1..7bdcfc5341f16313a85d5df46a8ae337177e5a92 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.cpp
+++ b/src/settings/kcm/kcmdolphinnavigation.cpp
@@ -19,9 +19,6 @@
 
 #include "kcmdolphinnavigation.h"
 
 
 #include "kcmdolphinnavigation.h"
 

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

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


@@ -29,25 +26,22 @@
 
 #include <QVBoxLayout>
 
 
 #include <QVBoxLayout>
 

-K_PLUGIN_FACTORY(KCMDolphinNavigationConfigFactory, registerPlugin<DolphinNavigationConfigModule>("dolphinnavigation");)
+K_PLUGIN_FACTORY(KCMDolphinNavigationConfigFactory, registerPlugin<DolphinNavigationConfigModule>(QStringLiteral("dolphinnavigation"));)

 K_EXPORT_PLUGIN(KCMDolphinNavigationConfigFactory("kcmdolphinnavigation"))
 
 DolphinNavigationConfigModule::DolphinNavigationConfigModule(QWidget* parent, const QVariantList& args) :
 K_EXPORT_PLUGIN(KCMDolphinNavigationConfigFactory("kcmdolphinnavigation"))
 
 DolphinNavigationConfigModule::DolphinNavigationConfigModule(QWidget* parent, const QVariantList& args) :

-    KCModule(KCMDolphinNavigationConfigFactory::componentData(), parent),
+    KCModule(parent),

     m_navigation(0)
 {
     Q_UNUSED(args);
 
     m_navigation(0)
 {
     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_navigation = new NavigationSettingsPage(this);
 
     m_navigation = new NavigationSettingsPage(this);

-    connect(m_navigation, SIGNAL(changed()), this, SLOT(changed()));
+    connect(m_navigation, &NavigationSettingsPage::changed, this, static_cast<void(DolphinNavigationConfigModule::*)()>(&DolphinNavigationConfigModule::changed));

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