ProjectExplorer: Consolidate some Session::active* accesses

Change-Id: I47b0f6c2c60b2f7c86b6ffd1ad3df393d1321c8b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-11-21 16:32:50 +01:00
parent ea88ded352
commit c8137bdcf9
16 changed files with 55 additions and 68 deletions

View File

@@ -65,16 +65,17 @@ static void addProjectPanelWidget()
ProjectExplorer::ProjectPanelFactory::registerFactory(panelFactory);
}
void ClangCodeModelPlugin::generateCompilationDB() {
void ClangCodeModelPlugin::generateCompilationDB()
{
using namespace CppTools;
ProjectExplorer::Project *project = ProjectExplorer::SessionManager::startupProject();
if (!project || !project->activeTarget())
ProjectExplorer::Target *target = ProjectExplorer::SessionManager::startupTarget();
if (!target)
return;
QFuture<Utils::GenerateCompilationDbResult> task
= QtConcurrent::run(&Utils::generateCompilationDB,
CppModelManager::instance()->projectInfo(project));
CppModelManager::instance()->projectInfo(target->project()));
Core::ProgressManager::addTask(task, tr("Generating Compilation DB"), "generate compilation db");
m_generatorWatcher.setFuture(task);
}