summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cpptoolsplugin.cpp
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2020-02-04 17:10:52 +0100
committerhjk <hjk@qt.io>2020-02-06 09:51:40 +0000
commitfd5461b93d6d3b5b5178f9929b57bcb313ac0717 (patch)
tree9f9c01472552d92a3b874a378dd5f486e7cf2a32 /src/plugins/cpptools/cpptoolsplugin.cpp
parent90f2f4b1dc9cffd40ab1b2e0a648799b50b7cd05 (diff)
downloadqt-creator-fd5461b93d6d3b5b5178f9929b57bcb313ac0717.tar.gz
CppTools: Use a normal plugin pimpl member for StringTable
Change-Id: I2804b623b7ec03f6f4375452c9a422604468aafa Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cpptoolsplugin.cpp')
-rw-r--r--src/plugins/cpptools/cpptoolsplugin.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp
index 401086ec54..f52358c2d3 100644
--- a/src/plugins/cpptools/cpptoolsplugin.cpp
+++ b/src/plugins/cpptools/cpptoolsplugin.cpp
@@ -82,7 +82,6 @@ class CppToolsPluginPrivate
public:
CppToolsPluginPrivate()
{
- StringTable::initialize();
CppModelManager::createCppModelManager(m_instance);
m_settings = new CppToolsSettings(m_instance); // force registration of cpp tools settings
m_codeModelSettings.fromSettings(ICore::settings());
@@ -91,12 +90,12 @@ public:
~CppToolsPluginPrivate()
{
- StringTable::destroy();
if (m_cppCodeStyleSettingsPage)
delete m_cppCodeStyleSettingsPage;
ExtensionSystem::PluginManager::removeObject(&m_cppProjectUpdaterFactory);
}
+ StringTable stringTable;
CppCodeModelSettings m_codeModelSettings;
CppToolsSettings *m_settings = nullptr;
CppFileSettings m_fileSettings;