From 3d0c946eefefbe218f61954692df326f03c7838d Mon Sep 17 00:00:00 2001 From: Alexander Lohnau Date: Sat, 10 Jun 2023 10:26:58 +0200 Subject: [PATCH] Adjust KCMs to no longer do cast manually KCModule::widget returns the widget that should be a parent for widgets the KCM creates --- src/settings/kcm/kcmdolphingeneral.cpp | 7 +++---- src/settings/kcm/kcmdolphinnavigation.cpp | 7 +++---- src/settings/kcm/kcmdolphinviewmodes.cpp | 9 ++++----- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp index 417979d234..4e99a0e147 100644 --- 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(parent), data) + : KCModule(parent, data) , m_pages() { setButtons(KCModule::Default | KCModule::Help | KCModule::Apply); - const auto parentWidget = qobject_cast(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 b18f00c5b1..c77e198ff6 100644 --- 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(parent)) + : KCModule(parent) , m_navigation(nullptr) { setButtons(KCModule::Default | KCModule::Help | KCModule::Apply); - const auto parentWidget = qobject_cast(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 0f0068108f..7fcc35ac5a 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.cpp +++ b/src/settings/kcm/kcmdolphinviewmodes.cpp @@ -8,9 +8,9 @@ #include "settings/viewmodes/viewsettingstab.h" +#include #include #include -#include #include #include @@ -21,16 +21,15 @@ K_PLUGIN_CLASS_WITH_JSON(DolphinViewModesConfigModule, "kcmdolphinviewmodes.json") DolphinViewModesConfigModule::DolphinViewModesConfigModule(QObject *parent, const KPluginMetaData &data) - : KCModule(qobject_cast(parent), data) + : KCModule(parent, data) , m_tabs() { setButtons(KCModule::Default | KCModule::Help | KCModule::Apply); - const auto parentWidget = qobject_cast(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);