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/cpptools | |
| 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/cpptools')
| -rw-r--r-- | src/plugins/cpptools/cppeditoroutline.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/cpptools/cpptoolstestcase.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/cpptools/modelmanagertesthelper.cpp | 4 |
3 files changed, 0 insertions, 8 deletions
diff --git a/src/plugins/cpptools/cppeditoroutline.cpp b/src/plugins/cpptools/cppeditoroutline.cpp index ba7575cb3f..8102cd8d40 100644 --- a/src/plugins/cpptools/cppeditoroutline.cpp +++ b/src/plugins/cpptools/cppeditoroutline.cpp @@ -187,9 +187,6 @@ QWidget *CppEditorOutline::widget() const void CppEditorOutline::updateNow() { CppTools::CppModelManager *cmmi = CppTools::CppModelManager::instance(); - if (!cmmi) - return; - const CPlusPlus::Snapshot snapshot = cmmi->snapshot(); const QString filePath = m_editorWidget->textDocument()->filePath().toString(); CPlusPlus::Document::Ptr document = snapshot.document(filePath); diff --git a/src/plugins/cpptools/cpptoolstestcase.cpp b/src/plugins/cpptools/cpptoolstestcase.cpp index 45960a01d8..d7a96300fc 100644 --- a/src/plugins/cpptools/cpptoolstestcase.cpp +++ b/src/plugins/cpptools/cpptoolstestcase.cpp @@ -358,7 +358,6 @@ VerifyCleanCppModelManager::~VerifyCleanCppModelManager() { bool VerifyCleanCppModelManager::isClean() { CppModelManager *mm = CppModelManager::instance(); - RETURN_FALSE_IF_NOT(mm); RETURN_FALSE_IF_NOT(mm->projectInfos().isEmpty()); RETURN_FALSE_IF_NOT(mm->headerPaths().isEmpty()); RETURN_FALSE_IF_NOT(mm->definedMacros().isEmpty()); diff --git a/src/plugins/cpptools/modelmanagertesthelper.cpp b/src/plugins/cpptools/modelmanagertesthelper.cpp index 10480482e1..3189dfc43e 100644 --- a/src/plugins/cpptools/modelmanagertesthelper.cpp +++ b/src/plugins/cpptools/modelmanagertesthelper.cpp @@ -58,8 +58,6 @@ ModelManagerTestHelper::ModelManagerTestHelper(QObject *parent) : { CppModelManager *mm = CppModelManager::instance(); - assert(mm); - connect(this, &ModelManagerTestHelper::aboutToRemoveProject, mm, &CppModelManager::onAboutToRemoveProject); connect(this, &ModelManagerTestHelper::projectAdded, @@ -82,8 +80,6 @@ ModelManagerTestHelper::~ModelManagerTestHelper() void ModelManagerTestHelper::cleanup() { CppModelManager *mm = CppModelManager::instance(); - assert(mm); - QList<ProjectInfo> pies = mm->projectInfos(); foreach (const ProjectInfo &pie, pies) emit aboutToRemoveProject(pie.project().data()); |