feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CppTools: Use a plugin pimpl data member for CppToolsSettings

Browse Source 
Change-Id: I05c2f8f34b88973fc916115f71c0557675396366
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-02-04 17:30:29 +01:00
parent cd9571b4f7
commit 7e326657e9
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/cpptools/cpptoolsplugin.cpp
View File

@@ -82,7 +82,6 @@ class CppToolsPluginPrivate
public: public:
CppToolsPluginPrivate() CppToolsPluginPrivate()
{ {
m_settings = new CppToolsSettings(m_instance); // force registration of cpp tools settings
m_codeModelSettings.fromSettings(ICore::settings()); m_codeModelSettings.fromSettings(ICore::settings());
m_cppCodeStyleSettingsPage = new CppCodeStyleSettingsPage; m_cppCodeStyleSettingsPage = new CppCodeStyleSettingsPage;
} }
@@ -97,7 +96,7 @@ public:
StringTable stringTable; StringTable stringTable;
CppModelManager modelManager; CppModelManager modelManager;
CppCodeModelSettings m_codeModelSettings; CppCodeModelSettings m_codeModelSettings;
CppToolsSettings *m_settings = nullptr; CppToolsSettings settings;
CppFileSettings m_fileSettings; CppFileSettings m_fileSettings;
CppFileSettingsPage m_cppFileSettingsPage{&m_fileSettings}; CppFileSettingsPage m_cppFileSettingsPage{&m_fileSettings};
CppCodeModelSettingsPage m_cppCodeModelSettingsPage{&m_codeModelSettings}; CppCodeModelSettingsPage m_cppCodeModelSettingsPage{&m_codeModelSettings};

5
src/plugins/cpptools/cpptoolssettings.cpp
View File

@@ -64,9 +64,8 @@ public:
CppToolsSettings *CppToolsSettings::m_instance = nullptr; CppToolsSettings *CppToolsSettings::m_instance = nullptr;
CppToolsSettings::CppToolsSettings(QObject *parent) CppToolsSettings::CppToolsSettings()
: QObject(parent) : d(new Internal::CppToolsSettingsPrivate)
, d(new Internal::CppToolsSettingsPrivate)
{ {
QTC_ASSERT(!m_instance, return); QTC_ASSERT(!m_instance, return);
m_instance = this; m_instance = this;

2
src/plugins/cpptools/cpptoolssettings.h
View File

@@ -50,7 +50,7 @@ class CPPTOOLS_EXPORT CppToolsSettings : public QObject
Q_OBJECT Q_OBJECT
public: public:
explicit CppToolsSettings(QObject *parent); CppToolsSettings();
~CppToolsSettings() override; ~CppToolsSettings() override;
static CppToolsSettings *instance(); static CppToolsSettings *instance();