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 5a0be61be214e60da35bf32e264e248622525356..7bdcfc5341f16313a85d5df46a8ae337177e5a92 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.cpp
+++ b/src/settings/kcm/kcmdolphinnavigation.cpp
@@ -19,7 +19,6 @@
 
 #include "kcmdolphinnavigation.h"
 
 
 #include "kcmdolphinnavigation.h"
 

-#include <KDialog>

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


@@ -27,7 +26,7 @@
 
 #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) :


@@ -36,14 +35,10 @@ DolphinNavigationConfigModule::DolphinNavigationConfigModule(QWidget* parent, co
 {
     Q_UNUSED(args);
 
 {
     Q_UNUSED(args);
 

-    //KF5 port: remove this line and define TRANSLATION_DOMAIN in CMakeLists.txt instead
-//KLocale::global()->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);
     connect(m_navigation, &NavigationSettingsPage::changed, this, static_cast<void(DolphinNavigationConfigModule::*)()>(&DolphinNavigationConfigModule::changed));
 
     m_navigation = new NavigationSettingsPage(this);
     connect(m_navigation, &NavigationSettingsPage::changed, this, static_cast<void(DolphinNavigationConfigModule::*)()>(&DolphinNavigationConfigModule::changed));