From ede1d31a3f859ecdf0143d3e5b2aba208ede1b76 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 4 Feb 2020 17:38:55 +0100 Subject: CppTools: Make CppCodeStyleSettingsPage a plugin pimpl member Change-Id: I75f90ddbb3cb1f2dbded16c8b6eb6d6c9bbc9f50 Reviewed-by: Christian Kandeler --- src/plugins/cpptools/cpptoolsplugin.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/plugins/cpptools/cpptoolsplugin.cpp') diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp index eb7519d5f4..406f9048f8 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; }; -- cgit v1.2.1