ProjectExplorer: Consolidate some Session::active* accesses

Change-Id: I47b0f6c2c60b2f7c86b6ffd1ad3df393d1321c8b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

3 files changed, 13 insertions, 21 deletions

diff --git a/src/plugins/perfprofiler/perfloaddialog.cpp b/src/plugins/perfprofiler/perfloaddialog.cpp
index b0602ed725..964f9422ca 100644
--- a/src/plugins/perfprofiler/perfloaddialog.cpp
+++ b/src/plugins/perfprofiler/perfloaddialog.cpp
@@ -96,11 +96,7 @@ void PerfLoadDialog::on_browseExecutableDirButton_pressed()
 
 void PerfLoadDialog::chooseDefaults()
 {
-    ProjectExplorer::Project *project = ProjectExplorer::SessionManager::startupProject();
-    if (!project)
-        return;
-
-    ProjectExplorer::Target *target = project->activeTarget();
+    ProjectExplorer::Target *target = ProjectExplorer::SessionManager::startupTarget();
     if (!target)
         return;
 
diff --git a/src/plugins/perfprofiler/perfprofilertool.cpp b/src/plugins/perfprofiler/perfprofilertool.cpp
index 3cb39f968e..1eb34495f2 100644
--- a/src/plugins/perfprofiler/perfprofilertool.cpp
+++ b/src/plugins/perfprofiler/perfprofilertool.cpp
@@ -231,12 +231,10 @@ void PerfProfilerTool::createViews()
     connect(recordMenu, &QMenu::aboutToShow, recordMenu, [recordMenu] {
         recordMenu->hide();
         PerfSettings *settings = nullptr;
-        Target *target = nullptr;
-        if (auto project = ProjectExplorer::SessionManager::startupProject()) {
-            if ((target = project->activeTarget())) {
-                if (auto runConfig = target->activeRunConfiguration())
-                    settings = runConfig->currentSettings<PerfSettings>(Constants::PerfSettingsId);
-            }
+        Target *target = SessionManager::startupTarget();
+        if (target) {
+            if (auto runConfig = target->activeRunConfiguration())
+                settings = runConfig->currentSettings<PerfSettings>(Constants::PerfSettingsId);
         }
 
         PerfConfigWidget *widget = new PerfConfigWidget(
diff --git a/src/plugins/perfprofiler/perftracepointdialog.cpp b/src/plugins/perfprofiler/perftracepointdialog.cpp
index 2dd6e35162..c6ca317d91 100644
--- a/src/plugins/perfprofiler/perftracepointdialog.cpp
+++ b/src/plugins/perfprofiler/perftracepointdialog.cpp
@@ -51,16 +51,14 @@ PerfTracePointDialog::PerfTracePointDialog() :
 {
     m_ui->setupUi(this);
 
-    if (Project *currentProject = SessionManager::startupProject()) {
-        if (const Target *target = currentProject->activeTarget()) {
-            const Kit *kit = target->kit();
-            QTC_ASSERT(kit, return);
-
-            m_device = DeviceKitAspect::device(kit);
-            if (!m_device) {
-                m_ui->textEdit->setPlainText(tr("Error: No device available for active target."));
-                return;
-            }
+    if (const Target *target = SessionManager::startupTarget()) {
+        const Kit *kit = target->kit();
+        QTC_ASSERT(kit, return);
+
+        m_device = DeviceKitAspect::device(kit);
+        if (!m_device) {
+            m_ui->textEdit->setPlainText(tr("Error: No device available for active target."));
+            return;
         }
     }