Adjust KCMs to no longer do cast manually

KCModule::widget returns the widget that should be a parent for widgets the KCM creates

diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp
index 417979d234d868c8e8f476dbbb1d402957130ae9..4e99a0e14706f2f08d5674ad36b22488ead37fcb 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.cpp
+++ b/src/settings/kcm/kcmdolphingeneral.cpp
@@ -20,16 +20,15 @@
 K_PLUGIN_CLASS_WITH_JSON(DolphinGeneralConfigModule, "kcmdolphingeneral.json")
 
 DolphinGeneralConfigModule::DolphinGeneralConfigModule(QObject *parent, const KPluginMetaData &data)
-    : KCModule(qobject_cast<QWidget *>(parent), data)
+    : KCModule(parent, data)
     , m_pages()
 {
     setButtons(KCModule::Default | KCModule::Help | KCModule::Apply);
 
-    const auto parentWidget = qobject_cast<QWidget *>(parent);
-    QVBoxLayout *topLayout = new QVBoxLayout(parentWidget);
+    QVBoxLayout *topLayout = new QVBoxLayout(widget());
     topLayout->setContentsMargins(0, 0, 0, 0);
 
-    QTabWidget *tabWidget = new QTabWidget(parentWidget);
+    QTabWidget *tabWidget = new QTabWidget(widget());
 
     // initialize 'Behavior' tab
     BehaviorSettingsPage *behaviorPage = new BehaviorSettingsPage(QUrl::fromLocalFile(QDir::homePath()), tabWidget);

diff --git a/src/settings/kcm/kcmdolphinnavigation.cpp b/src/settings/kcm/kcmdolphinnavigation.cpp
index b18f00c5b1a41e54831403f9b3ec2d4eceb775e6..c77e198ff616b66878f434664baa557be2ca602a 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.cpp
+++ b/src/settings/kcm/kcmdolphinnavigation.cpp
@@ -16,16 +16,15 @@
 K_PLUGIN_CLASS_WITH_JSON(DolphinNavigationConfigModule, "kcmdolphinnavigation.json")
 
 DolphinNavigationConfigModule::DolphinNavigationConfigModule(QObject *parent)
-    : KCModule(qobject_cast<QWidget *>(parent))
+    : KCModule(parent)
     , m_navigation(nullptr)
 {
     setButtons(KCModule::Default | KCModule::Help | KCModule::Apply);
 
-    const auto parentWidget = qobject_cast<QWidget *>(parent);
-    QVBoxLayout *topLayout = new QVBoxLayout(parentWidget);
+    QVBoxLayout *topLayout = new QVBoxLayout(widget());
     topLayout->setContentsMargins(0, 0, 0, 0);
 
-    m_navigation = new NavigationSettingsPage(parentWidget);
+    m_navigation = new NavigationSettingsPage(widget());
     connect(m_navigation, &NavigationSettingsPage::changed, this, &DolphinNavigationConfigModule::markAsChanged);
     topLayout->addWidget(m_navigation, 0, {});
 }

diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp
index 0f0068108f065ad984a6937cf86a43b8ced8257f..7fcc35ac5a726372297c5ea359ad354f038b915f 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.cpp
+++ b/src/settings/kcm/kcmdolphinviewmodes.cpp
@@ -8,9 +8,9 @@
 
 #include "settings/viewmodes/viewsettingstab.h"
 
+#include <KCModule>
 #include <KLocalizedString>
 #include <KPluginFactory>
-#include <KCModule>
 
 #include <QDBusConnection>
 #include <QDBusMessage>
@@ -21,16 +21,15 @@
 K_PLUGIN_CLASS_WITH_JSON(DolphinViewModesConfigModule, "kcmdolphinviewmodes.json")
 
 DolphinViewModesConfigModule::DolphinViewModesConfigModule(QObject *parent, const KPluginMetaData &data)
-    : KCModule(qobject_cast<QWidget *>(parent), data)
+    : KCModule(parent, data)
     , m_tabs()
 {
     setButtons(KCModule::Default | KCModule::Help | KCModule::Apply);
 
-    const auto parentWidget = qobject_cast<QWidget *>(parent);
-    QVBoxLayout *topLayout = new QVBoxLayout(parentWidget);
+    QVBoxLayout *topLayout = new QVBoxLayout(widget());
     topLayout->setContentsMargins(0, 0, 0, 0);
 
-    QTabWidget *tabWidget = new QTabWidget(parentWidget);
+    QTabWidget *tabWidget = new QTabWidget(widget());
 
     // Initialize 'Icons' tab
     ViewSettingsTab *iconsTab = new ViewSettingsTab(ViewSettingsTab::IconsMode, tabWidget);