From 9d3c5c6ff5ba059f036efae5fd9572fe454b5d84 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Mon, 4 Dec 2017 13:02:15 +0100
Subject: [PATCH] Session: Remove projectContainsFile

Use Project::isKnownFile instead.

Change-Id: If69e413e4603fe6d7dc359ecd55d6233d9a3a642
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/autotest/testcodeparser.cpp | 2 +-
 src/plugins/projectexplorer/session.cpp | 9 ++-------
 src/plugins/projectexplorer/session.h   | 1 -
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/plugins/autotest/testcodeparser.cpp b/src/plugins/autotest/testcodeparser.cpp
index 01b50a7e1e..f4076153d5 100644
--- a/src/plugins/autotest/testcodeparser.cpp
+++ b/src/plugins/autotest/testcodeparser.cpp
@@ -208,7 +208,7 @@ void TestCodeParser::onDocumentUpdated(const QString &fileName, bool isQmlFile)
     if (!project)
         return;
     // Quick tests: qml files aren't necessarily listed inside project files
-    if (!isQmlFile && !SessionManager::projectContainsFile(project, Utils::FileName::fromString(fileName)))
+    if (!isQmlFile && !project->isKnownFile(Utils::FileName::fromString(fileName)))
         return;
 
     scanForTests(QStringList(fileName));
diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp
index 74c530d7b9..35608f9155 100644
--- a/src/plugins/projectexplorer/session.cpp
+++ b/src/plugins/projectexplorer/session.cpp
@@ -666,18 +666,13 @@ Project *SessionManager::projectForFile(const Utils::FileName &fileName)
 {
     const QList<Project *> &projectList = projects();
     foreach (Project *p, projectList) {
-        if (projectContainsFile(p, fileName))
+        if (p->isKnownFile(fileName))
             return p;
     }
 
     return nullptr;
 }
 
-bool SessionManager::projectContainsFile(Project *p, const Utils::FileName &fileName)
-{
-    return p && p->isKnownFile(fileName);
-}
-
 void SessionManager::configureEditor(IEditor *editor, const QString &fileName)
 {
     if (auto textEditor = qobject_cast<TextEditor::BaseTextEditor*>(editor)) {
@@ -691,7 +686,7 @@ void SessionManager::configureEditor(IEditor *editor, const QString &fileName)
 void SessionManager::configureEditors(Project *project)
 {
     foreach (IDocument *document, DocumentModel::openedDocuments()) {
-        if (projectContainsFile(project, document->filePath())) {
+        if (project->isKnownFile(document->filePath())) {
             foreach (IEditor *editor, DocumentModel::editorsForDocument(document)) {
                 if (auto textEditor = qobject_cast<TextEditor::BaseTextEditor*>(editor)) {
                         project->editorConfiguration()->configureEditor(textEditor);
diff --git a/src/plugins/projectexplorer/session.h b/src/plugins/projectexplorer/session.h
index c54bc6d9ee..9558b6bbfb 100644
--- a/src/plugins/projectexplorer/session.h
+++ b/src/plugins/projectexplorer/session.h
@@ -115,7 +115,6 @@ public:
     static Project *projectForNode(Node *node);
     static Node *nodeForFile(const Utils::FileName &fileName);
     static Project *projectForFile(const Utils::FileName &fileName);
-    static bool projectContainsFile(Project *p, const Utils::FileName &fileName);
 
     static QStringList projectsForSessionName(const QString &session);
 
-- 
GitLab