Add Duplicate feature

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

diff --git a/src/settings/kcm/kcmdolphinnavigation.cpp b/src/settings/kcm/kcmdolphinnavigation.cpp
index 5a0be61be214e60da35bf32e264e248622525356..2cdabdeee0e22d124cb65b58356f1c4328a59f18 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.cpp
+++ b/src/settings/kcm/kcmdolphinnavigation.cpp
@@ -19,35 +19,34 @@
 
 #include "kcmdolphinnavigation.h"
 
 
 #include "kcmdolphinnavigation.h"
 

-#include <KDialog>
+#include "settings/navigation/navigationsettingspage.h"
+#include <kconfigwidgets_version.h>
+

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

-#include <settings/navigation/navigationsettingspage.h>
-

 #include <QVBoxLayout>
 
 #include <QVBoxLayout>
 

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

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

-    m_navigation(0)
+    m_navigation(nullptr)

 {
 {

-    Q_UNUSED(args);
-
-    //KF5 port: remove this line and define TRANSLATION_DOMAIN in CMakeLists.txt instead
-//KLocale::global()->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_navigation = new NavigationSettingsPage(this);
 
     m_navigation = new NavigationSettingsPage(this);

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

 }
 
 DolphinNavigationConfigModule::~DolphinNavigationConfigModule()
 }
 
 DolphinNavigationConfigModule::~DolphinNavigationConfigModule()