From e3e6cece891d2ac2d4eebe36f47accf8ff74779c Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 4 Feb 2020 17:23:27 +0100 Subject: CppTools: Use a normal plugin pimpl member for CppModelManager Change-Id: Id2c4b098084808070ef91de13c8338184e52141d Reviewed-by: Christian Kandeler --- src/plugins/cpptools/cppmodelmanager.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/plugins/cpptools/cppmodelmanager.cpp') diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index 9ca78cabe4..e836fba590 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -465,14 +465,6 @@ CppModelManager *CppModelManager::instance() return m_instance; } -void CppModelManager::createCppModelManager(Internal::CppToolsPlugin *parent) -{ - QTC_ASSERT(!m_instance, return;); - m_instance = new CppModelManager(); - m_instance->initCppTools(); - m_instance->setParent(parent); -} - void CppModelManager::initCppTools() { // Objects @@ -512,6 +504,8 @@ CppModelManager::CppModelManager() : CppModelManagerBase(nullptr) , d(new CppModelManagerPrivate) { + m_instance = this; + // Used for weak dependency in VcsBaseSubmitEditor setObjectName("CppModelManager"); ExtensionSystem::PluginManager::addObject(this); @@ -562,6 +556,8 @@ CppModelManager::CppModelManager() initializeBuiltinModelManagerSupport(); d->m_internalIndexingSupport = new BuiltinIndexingSupport; + + initCppTools(); } CppModelManager::~CppModelManager() -- cgit v1.2.1