From 80a425acbae5334b70b468921173240e502ceeb3 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 8 May 2023 14:25:50 +0200 Subject: [PATCH] Core: Remove QObject inheritance of IOptionsPageProvider This was not really used. Change-Id: I86049697d211d88827a9633b367d2121fa8d1f1c Reviewed-by: Eike Ziller --- src/plugins/coreplugin/dialogs/ioptionspage.cpp | 3 +-- src/plugins/coreplugin/dialogs/ioptionspage.h | 8 ++++---- src/plugins/designer/settingspage.h | 2 -- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.cpp b/src/plugins/coreplugin/dialogs/ioptionspage.cpp index f7657498ca4..a19458c5fbb 100644 --- a/src/plugins/coreplugin/dialogs/ioptionspage.cpp +++ b/src/plugins/coreplugin/dialogs/ioptionspage.cpp @@ -277,8 +277,7 @@ bool IOptionsPage::matches(const QRegularExpression ®exp) const static QList g_optionsPagesProviders; -IOptionsPageProvider::IOptionsPageProvider(QObject *parent) - : QObject(parent) +IOptionsPageProvider::IOptionsPageProvider() { g_optionsPagesProviders.append(this); } diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.h b/src/plugins/coreplugin/dialogs/ioptionspage.h index 21b5a6ec445..7849ce0bb13 100644 --- a/src/plugins/coreplugin/dialogs/ioptionspage.h +++ b/src/plugins/coreplugin/dialogs/ioptionspage.h @@ -99,13 +99,13 @@ private: before the options pages get available.) */ -class CORE_EXPORT IOptionsPageProvider : public QObject +class CORE_EXPORT IOptionsPageProvider { - Q_OBJECT + Q_DISABLE_COPY_MOVE(IOptionsPageProvider); public: - IOptionsPageProvider(QObject *parent = nullptr); - ~IOptionsPageProvider() override; + IOptionsPageProvider(); + virtual ~IOptionsPageProvider(); static const QList allOptionsPagesProviders(); diff --git a/src/plugins/designer/settingspage.h b/src/plugins/designer/settingspage.h index 5efc062fcba..03206109dba 100644 --- a/src/plugins/designer/settingspage.h +++ b/src/plugins/designer/settingspage.h @@ -19,8 +19,6 @@ public: class SettingsPageProvider : public Core::IOptionsPageProvider { - Q_OBJECT - public: SettingsPageProvider();