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

C++: changed the CppModelManager to use a normal singleton.

Browse Source 
Also removed two TODOs.

Change-Id: I91b235795da7e87a21782d189844eacdd68c5f3c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Erik Verbruggen
2012-10-15 16:38:56 +02:00
parent 826a90ba13
commit b6608da7d1
4 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/cpptools/cppmodelmanager.cpp
View File

@@ -309,7 +309,7 @@ public:
_doc->check(_mode);
if (_modelManager)
_modelManager->emitDocumentUpdated(_doc); // ### TODO: compress
_modelManager->emitDocumentUpdated(_doc);
_doc->releaseSourceAndAST();
}
@@ -654,13 +654,6 @@ void CppModelManager::updateModifiedSourceFiles()
updateSourceFiles(sourceFiles);
}
CppModelManager *CppModelManager::instance()
{
// TODO this is pretty stupid. use regular singleton pattern.
return ExtensionSystem::PluginManager::getObject<CppModelManager>();
}
/*!
\class CppTools::CppModelManager
\brief The CppModelManager keeps track of one CppCodeModel instance
@@ -670,6 +663,20 @@ CppModelManager *CppModelManager::instance()
modified within Qt Creator.
*/
QMutex CppModelManager::m_modelManagerMutex;
CppModelManager *CppModelManager::m_modelManagerInstance = 0;
CppModelManager *CppModelManager::instance()
{
if (m_modelManagerInstance)
return m_modelManagerInstance;
QMutexLocker locker(&m_modelManagerMutex);
if (!m_modelManagerInstance) {
m_modelManagerInstance = new CppModelManager;
}
return m_modelManagerInstance;
}
CppModelManager::CppModelManager(QObject *parent)
: CppModelManagerInterface(parent)
{