forked from qt-creator/qt-creator
CppTools: Use a normal plugin pimpl member for CppModelManager
Change-Id: Id2c4b098084808070ef91de13c8338184e52141d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
@@ -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()
|
||||
|
Reference in New Issue
Block a user