diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2015-02-15 23:13:28 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2015-02-17 10:11:29 +0000 |
| commit | 831fb6181e592002f5c97c324991799e6e2337ef (patch) | |
| tree | 4b516169a0ca968ec508df136a94bf31da78c29e /src/plugins/classview | |
| parent | a22dc36aaf612735d09a51d4fb5865fc64297d02 (diff) | |
| download | qt-creator-831fb6181e592002f5c97c324991799e6e2337ef.tar.gz | |
CppTools: Remove assertions for CppModelManager::instance()
It cannot return null.
Change-Id: I3ac5f33e7e02554edc8df067c7b85518e58c1fc2
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Diffstat (limited to 'src/plugins/classview')
| -rw-r--r-- | src/plugins/classview/classviewmanager.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/classview/classviewparser.cpp | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/classview/classviewmanager.cpp b/src/plugins/classview/classviewmanager.cpp index 0a2e615082..caf39ef7ff 100644 --- a/src/plugins/classview/classviewmanager.cpp +++ b/src/plugins/classview/classviewmanager.cpp @@ -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)), diff --git a/src/plugins/classview/classviewparser.cpp b/src/plugins/classview/classviewparser.cpp index 71d958a172..27734c12cd 100644 --- a/src/plugins/classview/classviewparser.cpp +++ b/src/plugins/classview/classviewparser.cpp @@ -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()); } /*! |