diff --git a/src/plugins/cpptools/cppcodestylesettingspage.cpp b/src/plugins/cpptools/cppcodestylesettingspage.cpp index 160b2e1cbf9..1f29bac9f15 100644 --- a/src/plugins/cpptools/cppcodestylesettingspage.cpp +++ b/src/plugins/cpptools/cppcodestylesettingspage.cpp @@ -345,8 +345,7 @@ void CppCodeStylePreferencesWidget::setVisualizeWhitespace(bool on) // ------------------ CppCodeStyleSettingsPage -CppCodeStyleSettingsPage::CppCodeStyleSettingsPage(QWidget *parent) - : Core::IOptionsPage(parent) +CppCodeStyleSettingsPage::CppCodeStyleSettingsPage() { setId(Constants::CPP_CODE_STYLE_SETTINGS_ID); setDisplayName(QCoreApplication::translate("CppTools", Constants::CPP_CODE_STYLE_SETTINGS_NAME)); diff --git a/src/plugins/cpptools/cppcodestylesettingspage.h b/src/plugins/cpptools/cppcodestylesettingspage.h index 780a650a9ef..c9aba51d07a 100644 --- a/src/plugins/cpptools/cppcodestylesettingspage.h +++ b/src/plugins/cpptools/cppcodestylesettingspage.h @@ -80,10 +80,8 @@ private: class CppCodeStyleSettingsPage : public Core::IOptionsPage { - Q_OBJECT - public: - explicit CppCodeStyleSettingsPage(QWidget *parent = nullptr); + CppCodeStyleSettingsPage(); QWidget *widget() override; void apply() override; diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp index eb7519d5f40..406f9048f8a 100644 --- a/src/plugins/cpptools/cpptoolsplugin.cpp +++ b/src/plugins/cpptools/cpptoolsplugin.cpp @@ -83,13 +83,10 @@ public: CppToolsPluginPrivate() { m_codeModelSettings.fromSettings(ICore::settings()); - m_cppCodeStyleSettingsPage = new CppCodeStyleSettingsPage; } ~CppToolsPluginPrivate() { - if (m_cppCodeStyleSettingsPage) - delete m_cppCodeStyleSettingsPage; ExtensionSystem::PluginManager::removeObject(&m_cppProjectUpdaterFactory); } @@ -100,7 +97,7 @@ public: CppFileSettings m_fileSettings; CppFileSettingsPage m_cppFileSettingsPage{&m_fileSettings}; CppCodeModelSettingsPage m_cppCodeModelSettingsPage{&m_codeModelSettings}; - QPointer m_cppCodeStyleSettingsPage = nullptr; + CppCodeStyleSettingsPage m_cppCodeStyleSettingsPage; CppProjectUpdaterFactory m_cppProjectUpdaterFactory; };