Adapt to upstream changes: Split of session and project manager

Change-Id: I3fb7b3c17d5116a405ff4fc93193b17c56ff3a7a
Reviewed-by: Kai Köhne <kai.koehne@qt.io>

3 files changed, 30 insertions, 22 deletions

diff --git a/src/datasources/buildsystemsource.cpp b/src/datasources/buildsystemsource.cpp
index 5b9e4bf..ddb4a50 100644
--- a/src/datasources/buildsystemsource.cpp
+++ b/src/datasources/buildsystemsource.cpp
@@ -28,6 +28,7 @@
 #include <QtCore/QCryptographicHash>
 
 #include <projectexplorer/project.h>
+#include <projectexplorer/projectmanager.h>
 #include <projectexplorer/session.h>
 
 #include <KUserFeedback/Provider>
@@ -66,9 +67,10 @@ static BuildSystemSource::BuildSystem extractBuildSystemType(const QString &name
 BuildSystemSource::BuildSystemSource()
     : AbstractDataSource(QStringLiteral("buildSystem"), Provider::DetailedUsageStatistics)
 {
-    connect(ProjectExplorer::SessionManager::instance(),
-            &ProjectExplorer::SessionManager::projectAdded,
-            this, &BuildSystemSource::updateProjects);
+    connect(ProjectExplorer::ProjectManager::instance(),
+            &ProjectExplorer::ProjectManager::projectAdded,
+            this,
+            &BuildSystemSource::updateProjects);
 
     connect(ProjectExplorer::SessionManager::instance(),
             &ProjectExplorer::SessionManager::sessionLoaded,
@@ -149,7 +151,7 @@ static QByteArray hashPath(const Utils::FilePath& name)
 
 void BuildSystemSource::updateProjects()
 {
-    for (auto project : ProjectExplorer::SessionManager::projects()) {
+    for (auto project : ProjectExplorer::ProjectManager::projects()) {
         if (project) {
             const auto projectName = QString::fromUtf8(project->id().name()).toLower();
             const auto projectPath = project->projectFilePath();
diff --git a/src/datasources/examplesdatasource.cpp b/src/datasources/examplesdatasource.cpp
index 0682e7b..1073555 100644
--- a/src/datasources/examplesdatasource.cpp
+++ b/src/datasources/examplesdatasource.cpp
@@ -28,6 +28,7 @@
 #include <QtCore/QRegularExpression>
 
 #include <projectexplorer/project.h>
+#include <projectexplorer/projectmanager.h>
 #include <projectexplorer/session.h>
 
 #include <common/scopedsettingsgroupsetter.h>
@@ -40,17 +41,20 @@ using namespace KUserFeedback;
 ExamplesDataSource::ExamplesDataSource()
     : AbstractDataSource(QStringLiteral("examplesData"), Provider::DetailedUsageStatistics)
 {
-    connect(ProjectExplorer::SessionManager::instance(),
-            &ProjectExplorer::SessionManager::startupProjectChanged,
-            this, &ExamplesDataSource::updateOpenedExamples);
+    connect(ProjectExplorer::ProjectManager::instance(),
+            &ProjectExplorer::ProjectManager::startupProjectChanged,
+            this,
+            &ExamplesDataSource::updateOpenedExamples);
 
-    connect(ProjectExplorer::SessionManager::instance(),
-            &ProjectExplorer::SessionManager::projectAdded,
-            this, &ExamplesDataSource::updateOpenedExamples);
+    connect(ProjectExplorer::ProjectManager::instance(),
+            &ProjectExplorer::ProjectManager::projectAdded,
+            this,
+            &ExamplesDataSource::updateOpenedExamples);
 
     connect(ProjectExplorer::SessionManager::instance(),
             &ProjectExplorer::SessionManager::sessionLoaded,
-            this, &ExamplesDataSource::updateOpenedExamples);
+            this,
+            &ExamplesDataSource::updateOpenedExamples);
 }
 
 ExamplesDataSource::~ExamplesDataSource() = default;
@@ -102,7 +106,7 @@ static QString examplePattern()
 void ExamplesDataSource::updateOpenedExamples()
 {
     QRegularExpression re(examplePattern().arg(examplePathGroupName()));
-    for (auto project : ProjectExplorer::SessionManager::projects()) {
+    for (auto project : ProjectExplorer::ProjectManager::projects()) {
         if (project) {
             auto projectPath = QDir::fromNativeSeparators(project->projectFilePath().toString());
             const auto match = re.match(projectPath);
diff --git a/src/datasources/kitsource.cpp b/src/datasources/kitsource.cpp
index 6cf724e..7c01bfa 100644
--- a/src/datasources/kitsource.cpp
+++ b/src/datasources/kitsource.cpp
@@ -32,7 +32,7 @@
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/session.h>
+#include <projectexplorer/projectmanager.h>
 #include <projectexplorer/target.h>
 
 #include <qtsupport/qtkitinformation.h>
@@ -54,15 +54,17 @@ KitSource::KitSource()
     QObject::connect(ProjectExplorer::BuildManager::instance(),
                      &ProjectExplorer::BuildManager::buildQueueFinished,
                      [&](bool success) {
-        const Project *project = SessionManager::startupProject();
-        const Target *target = project ? project->activeTarget() : nullptr;
-        const Kit *kit = target ? target->kit() : nullptr;
-        const ToolChain *toolChain = ToolChainKitAspect::toolChain(kit, Constants::CXX_LANGUAGE_ID);
-        const Abi abi = toolChain ? toolChain->targetAbi() : Abi();
-        const QString abiName = abi.toString();
-        QVariantMap &bucket = success ? m_buildSuccessesForToolChain : m_buildFailsForToolChain;
-        bucket[abiName] = bucket.value(abiName, 0).toInt() + 1;
-    });
+                         const Project *project = ProjectManager::startupProject();
+                         const Target *target = project ? project->activeTarget() : nullptr;
+                         const Kit *kit = target ? target->kit() : nullptr;
+                         const ToolChain *toolChain = ToolChainKitAspect::toolChain(
+                             kit, Constants::CXX_LANGUAGE_ID);
+                         const Abi abi = toolChain ? toolChain->targetAbi() : Abi();
+                         const QString abiName = abi.toString();
+                         QVariantMap &bucket = success ? m_buildSuccessesForToolChain
+                                                       : m_buildFailsForToolChain;
+                         bucket[abiName] = bucket.value(abiName, 0).toInt() + 1;
+                     });
 }
 
 KitSource::~KitSource() = default;