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

CppTools: Remove assertions for CppModelManager::instance()

Browse Source 
It cannot return null.

Change-Id: I3ac5f33e7e02554edc8df067c7b85518e58c1fc2
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-02-15 23:13:28 +02:00
committed by Orgad Shaneh
parent a22dc36aaf
commit 831fb6181e
13 changed files with 41 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/classview/classviewmanager.cpp
View File

@@ -270,8 +270,7 @@ void Manager::initialize()
&d->parser, SLOT(setFlatMode(bool)), Qt::QueuedConnection);
// connect to the cpp model manager for signals about document updates
CppTools::CppModelManager *codeModelManager
= CppTools::CppModelManager::instance();
CppTools::CppModelManager *codeModelManager = CppTools::CppModelManager::instance();
// when code manager signals that document is updated - handle it by ourselves
connect(codeModelManager, SIGNAL(documentUpdated(CPlusPlus::Document::Ptr)),

4
src/plugins/classview/classviewparser.cpp
View File

@@ -667,9 +667,7 @@ void Parser::resetData(const CPlusPlus::Snapshot &snapshot)
void Parser::resetDataToCurrentState()
{
// get latest data
CppTools::CppModelManager *codeModel = CppTools::CppModelManager::instance();
if (codeModel)
resetData(codeModel->snapshot());
resetData(CppTools::CppModelManager::instance()->snapshot());
}
/*!