From 2ff1fe69a8426b55fa332da870de665f43b24cdf Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Thu, 29 Oct 2015 17:01:48 +0100
Subject: [PATCH] AutoTools: Simplify projectNode

Change-Id: I15c42a16b076cdb8ae78d54a665a4b7746a994e4
Reviewed-by: hjk <hjk@theqtcompany.com>
---
 .../autotoolsprojectmanager/autotoolsproject.cpp       |  2 +-
 .../autotoolsprojectmanager/autotoolsprojectnode.cpp   |  9 +++------
 .../autotoolsprojectmanager/autotoolsprojectnode.h     | 10 +---------
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
index 03969c9427..f4dadab682 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
@@ -76,7 +76,7 @@ AutotoolsProject::AutotoolsProject(AutotoolsManager *manager, const QString &fil
     m_fileName(fileName),
     m_files(),
     m_file(new AutotoolsProjectFile(this, m_fileName)),
-    m_rootNode(new AutotoolsProjectNode(this, m_file)),
+    m_rootNode(new AutotoolsProjectNode(m_file->filePath())),
     m_fileWatcher(new Utils::FileSystemWatcher(this)),
     m_watchedFiles(),
     m_makefileParserThread(0)
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.cpp b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.cpp
index f663dac116..ee8b42cd9c 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.cpp
@@ -39,12 +39,9 @@ using namespace AutotoolsProjectManager;
 using namespace AutotoolsProjectManager::Internal;
 using namespace ProjectExplorer;
 
-AutotoolsProjectNode::AutotoolsProjectNode(AutotoolsProject *project, Core::IDocument *projectFile) :
-    ProjectNode(projectFile->filePath()),
-    m_project(project),
-    m_projectFile(projectFile)
-{
-}
+AutotoolsProjectNode::AutotoolsProjectNode(const Utils::FileName &projectFilePath) :
+    ProjectNode(projectFilePath)
+{ }
 
 bool AutotoolsProjectNode::showInSimpleTree() const
 {
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h
index b801df8901..fda874282d 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h
+++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h
@@ -54,18 +54,10 @@ class AutotoolsProject;
 class AutotoolsProjectNode : public ProjectExplorer::ProjectNode
 {
 public:
-    AutotoolsProjectNode(AutotoolsProject *project, Core::IDocument *projectFile);
+    AutotoolsProjectNode(const Utils::FileName &projectFilePath);
 
     bool showInSimpleTree() const override;
     QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const override;
-
-private:
-    AutotoolsProject *m_project;
-    Core::IDocument *m_projectFile;
-
-    // TODO: AutotoolsProject calls the protected function addFileNodes() from AutotoolsProjectNode.
-    // Instead of this friend declaration, a public interface might be preferable.
-    friend class AutotoolsProject;
 };
 
 } // namespace Internal
-- 
GitLab