From a2c7257c9b24103b1f6c05b96c8a2d67a8d1404a Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 19 Mar 2019 17:29:13 +0100
Subject: [PATCH] PerfProfiler: Simplify logic around
 PerfProfilerTool::populateFileFinder

It doesn't need a RunConfiguration, only uses a Target.

Change-Id: I96bac9ab26f7e261f1a170dec8bfbad8e4d63a72
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
---
 src/plugins/perfprofiler/perfprofilertool.cpp | 29 +++++++------------
 src/plugins/perfprofiler/perfprofilertool.h   |  3 +-
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/plugins/perfprofiler/perfprofilertool.cpp b/src/plugins/perfprofiler/perfprofilertool.cpp
index b7a67d832c2..1770dbbb4d2 100644
--- a/src/plugins/perfprofiler/perfprofilertool.cpp
+++ b/src/plugins/perfprofiler/perfprofilertool.cpp
@@ -439,7 +439,7 @@ void PerfProfilerTool::onReaderStarted()
 
 void PerfProfilerTool::onWorkerCreation(RunControl *runControl)
 {
-    populateFileFinder(runControl->runConfiguration());
+    populateFileFinder(runControl->project(), runControl->kit());
 }
 
 void PerfProfilerTool::updateRunActions()
@@ -617,7 +617,12 @@ void PerfProfilerTool::showLoadTraceDialog()
         return;
 
     startLoading();
-    populateFileFinder();
+
+    const Project *currentProject = SessionManager::startupProject();
+    const Target *target = currentProject ?  currentProject->activeTarget() : nullptr;
+    const Kit *kit = target ? target->kit() : nullptr;
+    populateFileFinder(currentProject, kit);
+
     m_traceManager->loadFromTraceFile(filename);
 }
 
@@ -673,24 +678,12 @@ void PerfProfilerTool::updateTime(qint64 duration, qint64 delay)
         m_delayLabel->clear();
 }
 
-void PerfProfilerTool::populateFileFinder(const RunConfiguration *rc)
+void PerfProfilerTool::populateFileFinder(const Project *project, const Kit *kit)
 {
-    const Project *currentProject = nullptr;
-    const Kit *kit = nullptr;
-    if (rc) {
-        if (const Target *target = rc->target()) {
-            kit = target->kit();
-            currentProject = target->project();
-        }
-    } else if ((currentProject = SessionManager::startupProject())) {
-        if (const Target *target = currentProject->activeTarget())
-            kit = target->kit();
-    }
+    m_fileFinder.setProjectFiles(sourceFiles(project));
 
-    m_fileFinder.setProjectFiles(sourceFiles(currentProject));
-
-    if (currentProject)
-        m_fileFinder.setProjectDirectory(currentProject->projectDirectory());
+    if (project)
+        m_fileFinder.setProjectDirectory(project->projectDirectory());
 
     if (kit) {
         m_fileFinder.setAdditionalSearchDirectories(collectQtIncludePaths(kit));
diff --git a/src/plugins/perfprofiler/perfprofilertool.h b/src/plugins/perfprofiler/perfprofilertool.h
index 03a31dc9013..8f36cfc7d00 100644
--- a/src/plugins/perfprofiler/perfprofilertool.h
+++ b/src/plugins/perfprofiler/perfprofilertool.h
@@ -88,7 +88,8 @@ private:
     void clear();
 
     friend class PerfProfilerRunner;
-    void populateFileFinder(const ProjectExplorer::RunConfiguration *rc = nullptr);
+    void populateFileFinder(const ProjectExplorer::Project *project,
+                            const ProjectExplorer::Kit *kit);
     void updateFilterMenu();
     void updateRunActions();
     void addLoadSaveActionsToMenu(QMenu *menu);