diff options
| author | Alexander Lohnau <[email protected]> | 2023-06-10 10:26:58 +0200 |
|---|---|---|
| committer | Alexander Lohnau <[email protected]> | 2023-06-10 10:26:58 +0200 |
| commit | 3d0c946eefefbe218f61954692df326f03c7838d (patch) | |
| tree | 0d0d8f77f005495edd83419e2c02144861a78efa | |
| parent | 1c393f50d5dc2e843962e17d0e8c144f019e1da2 (diff) | |
Adjust KCMs to no longer do cast manually
KCModule::widget returns the widget that should be a parent for widgets the KCM creates
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.cpp | 7 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinnavigation.cpp | 7 | ||||
| -rw-r--r-- | 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 417979d23..4e99a0e14 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<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 b18f00c5b..c77e198ff 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<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 0f0068108..7fcc35ac5 100644 --- 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); |
