From fd5461b93d6d3b5b5178f9929b57bcb313ac0717 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 4 Feb 2020 17:10:52 +0100 Subject: CppTools: Use a normal plugin pimpl member for StringTable Change-Id: I2804b623b7ec03f6f4375452c9a422604468aafa Reviewed-by: Christian Kandeler --- src/plugins/cpptools/cpptoolsplugin.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/plugins/cpptools/cpptoolsplugin.cpp') 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; -- cgit v1.2.1