Merge branch 'release/20.04'

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

diff --git a/src/settings/kcm/kcmdolphinnavigation.cpp b/src/settings/kcm/kcmdolphinnavigation.cpp
index 7bdcfc5341f16313a85d5df46a8ae337177e5a92..f8de4eed22e2c34ae0f9a18c00ca252c0b0fede9 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.cpp
+++ b/src/settings/kcm/kcmdolphinnavigation.cpp
@@ -19,30 +19,28 @@
 
 #include "kcmdolphinnavigation.h"
 
 
 #include "kcmdolphinnavigation.h"
 

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

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

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

 #include <QVBoxLayout>
 
 K_PLUGIN_FACTORY(KCMDolphinNavigationConfigFactory, registerPlugin<DolphinNavigationConfigModule>(QStringLiteral("dolphinnavigation"));)
 #include <QVBoxLayout>
 
 K_PLUGIN_FACTORY(KCMDolphinNavigationConfigFactory, registerPlugin<DolphinNavigationConfigModule>(QStringLiteral("dolphinnavigation"));)

-K_EXPORT_PLUGIN(KCMDolphinNavigationConfigFactory("kcmdolphinnavigation"))

 
 

-DolphinNavigationConfigModule::DolphinNavigationConfigModule(QWidget* parent, const QVariantList& args) :
-    KCModule(parent),
-    m_navigation(0)
+DolphinNavigationConfigModule::DolphinNavigationConfigModule(QWidget *parent, const QVariantList &args) :
+    KCModule(parent, args),
+    m_navigation(nullptr)

 {
 {

-    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->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);
+    connect(m_navigation, &NavigationSettingsPage::changed, this, &DolphinNavigationConfigModule::markAsChanged);
+    topLayout->addWidget(m_navigation, 0, {});

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