diff --git a/src/plugins/classview/classviewparser.cpp b/src/plugins/classview/classviewparser.cpp index 33ef4909c5c..b4bd9a36bce 100644 --- a/src/plugins/classview/classviewparser.cpp +++ b/src/plugins/classview/classviewparser.cpp @@ -679,7 +679,6 @@ QList Parser::getProjectList() const // check all projects ProjectExplorer::SessionManager *sessionManager = ProjectExplorer::ProjectExplorerPlugin::instance()->session(); - QTC_ASSERT(sessionManager, return list); list = sessionManager->projects(); diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index 54c6dbe51d5..4000228aae1 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -673,8 +673,6 @@ CppModelManager::CppModelManager(QObject *parent) QTC_ASSERT(pe, return); ProjectExplorer::SessionManager *session = pe->session(); - QTC_ASSERT(session, return); - m_updateEditorSelectionsTimer = new QTimer(this); m_updateEditorSelectionsTimer->setInterval(500); m_updateEditorSelectionsTimer->setSingleShot(true); diff --git a/src/plugins/projectexplorer/allprojectsfilter.cpp b/src/plugins/projectexplorer/allprojectsfilter.cpp index 99e62c49851..36efc2f0f86 100644 --- a/src/plugins/projectexplorer/allprojectsfilter.cpp +++ b/src/plugins/projectexplorer/allprojectsfilter.cpp @@ -62,10 +62,7 @@ void AllProjectsFilter::updateFiles() return; m_filesUpToDate = true; files().clear(); - SessionManager *session = m_projectExplorer->session(); - if (!session) - return; - foreach (Project *project, session->projects()) + foreach (Project *project, m_projectExplorer->session()->projects()) files().append(project->files(Project::AllFiles)); qSort(files()); generateFileNames(); diff --git a/src/plugins/projectexplorer/allprojectsfind.cpp b/src/plugins/projectexplorer/allprojectsfind.cpp index 09099cf41d4..1a883c34c8c 100644 --- a/src/plugins/projectexplorer/allprojectsfind.cpp +++ b/src/plugins/projectexplorer/allprojectsfind.cpp @@ -73,7 +73,6 @@ QString AllProjectsFind::displayName() const bool AllProjectsFind::isEnabled() const { return BaseFileFind::isEnabled() - && m_plugin->session() != 0 && m_plugin->session()->projects().count() > 0; } @@ -81,7 +80,6 @@ Utils::FileIterator *AllProjectsFind::files(const QStringList &nameFilters, const QVariant &additionalParameters) const { Q_UNUSED(additionalParameters) - QTC_ASSERT(m_plugin->session(), return new Utils::FileIterator()); return filesForProjects(nameFilters, m_plugin->session()->projects()); } diff --git a/src/plugins/projectexplorer/currentprojectfind.cpp b/src/plugins/projectexplorer/currentprojectfind.cpp index 993219e22b0..62c7dbceb44 100644 --- a/src/plugins/projectexplorer/currentprojectfind.cpp +++ b/src/plugins/projectexplorer/currentprojectfind.cpp @@ -83,7 +83,6 @@ QVariant CurrentProjectFind::additionalParameters() const Utils::FileIterator *CurrentProjectFind::files(const QStringList &nameFilters, const QVariant &additionalParameters) const { - QTC_ASSERT(m_plugin->session(), return new Utils::FileIterator()); QTC_ASSERT(additionalParameters.isValid(), return new Utils::FileIterator()); QList allProjects = m_plugin->session()->projects(); QString projectFile = additionalParameters.toString(); diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp index 5dc59ae2a77..6c4367bbe3a 100644 --- a/src/plugins/qmljstools/qmljsmodelmanager.cpp +++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp @@ -155,10 +155,8 @@ void ModelManager::delayedInitialization() } ProjectExplorer::SessionManager *sessionManager = ProjectExplorer::ProjectExplorerPlugin::instance()->session(); - if (sessionManager) { - connect(sessionManager, SIGNAL(projectRemoved(ProjectExplorer::Project*)), - this, SLOT(removeProjectInfo(ProjectExplorer::Project*))); - } + connect(sessionManager, SIGNAL(projectRemoved(ProjectExplorer::Project*)), + this, SLOT(removeProjectInfo(ProjectExplorer::Project*))); } void ModelManager::loadQmlTypeDescriptions() @@ -807,8 +805,6 @@ ModelManager::CppDataHash ModelManager::cppData() const LibraryInfo ModelManager::builtins(const Document::Ptr &doc) const { ProjectExplorer::SessionManager *sessionManager = ProjectExplorer::ProjectExplorerPlugin::instance()->session(); - if (!sessionManager) - return LibraryInfo(); ProjectExplorer::Project *project = sessionManager->projectForFile(doc->fileName()); if (!project) return LibraryInfo();