From f735c8da45d9589018b608aee458a3693145fa22 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Thu, 29 Oct 2015 17:10:09 +0100
Subject: [PATCH] GenericProject: Simplify project node

Change-Id: I74b0ab29457f384b63b396aec81655246b0e5e7b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
---
 .../genericprojectmanager/genericproject.cpp    |  2 +-
 .../genericprojectnodes.cpp                     | 17 +++--------------
 .../genericprojectmanager/genericprojectnodes.h |  6 +-----
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index aad57fd874..d9c561a54f 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -93,7 +93,7 @@ GenericProject::GenericProject(Manager *manager, const QString &fileName)
     DocumentManager::addDocument(m_includesIDocument);
     DocumentManager::addDocument(m_configIDocument);
 
-    m_rootNode = new GenericProjectNode(this, m_creatorIDocument);
+    m_rootNode = new GenericProjectNode(this);
 
     FileNode *projectFilesNode = new FileNode(Utils::FileName::fromString(m_filesFileName),
                                               ProjectFileType,
diff --git a/src/plugins/genericprojectmanager/genericprojectnodes.cpp b/src/plugins/genericprojectmanager/genericprojectnodes.cpp
index b95f2d16a2..a8a2919fcf 100644
--- a/src/plugins/genericprojectmanager/genericprojectnodes.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectnodes.cpp
@@ -42,22 +42,11 @@ using namespace ProjectExplorer;
 namespace GenericProjectManager {
 namespace Internal {
 
-GenericProjectNode::GenericProjectNode(GenericProject *project, Core::IDocument *projectFile)
-    : ProjectNode(projectFile->filePath())
+GenericProjectNode::GenericProjectNode(GenericProject *project)
+    : ProjectNode(project->projectFilePath())
     , m_project(project)
-    , m_projectFile(projectFile)
 {
-    setDisplayName(projectFile->filePath().toFileInfo().completeBaseName());
-}
-
-Core::IDocument *GenericProjectNode::projectFile() const
-{
-    return m_projectFile;
-}
-
-QString GenericProjectNode::projectFilePath() const
-{
-    return m_projectFile->filePath().toString();
+    setDisplayName(project->projectFilePath().toFileInfo().completeBaseName());
 }
 
 QHash<QString, QStringList> sortFilesIntoPaths(const QString &base, const QSet<QString> &files)
diff --git a/src/plugins/genericprojectmanager/genericprojectnodes.h b/src/plugins/genericprojectmanager/genericprojectnodes.h
index b8ebe161fa..a9857f8f3d 100644
--- a/src/plugins/genericprojectmanager/genericprojectnodes.h
+++ b/src/plugins/genericprojectmanager/genericprojectnodes.h
@@ -47,10 +47,7 @@ class GenericProject;
 class GenericProjectNode : public ProjectExplorer::ProjectNode
 {
 public:
-    GenericProjectNode(GenericProject *project, Core::IDocument *projectFile);
-
-    Core::IDocument *projectFile() const;
-    QString projectFilePath() const;
+    GenericProjectNode(GenericProject *project);
 
     bool showInSimpleTree() const override;
 
@@ -70,7 +67,6 @@ private:
 
 private:
     GenericProject *m_project;
-    Core::IDocument *m_projectFile;
 };
 
 } // namespace Internal
-- 
GitLab