From 661f436e71ca0e65e906349827b930133af8f9f5 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Thu, 29 Oct 2015 17:18:23 +0100
Subject: [PATCH] QmlProject: Simplify project node

Change-Id: I370fdb2e6bda67fb4ee5c77d736971460a28a68c
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
---
 src/plugins/qmlprojectmanager/qmlproject.cpp      |  2 +-
 src/plugins/qmlprojectmanager/qmlprojectnodes.cpp | 15 ++++-----------
 src/plugins/qmlprojectmanager/qmlprojectnodes.h   |  6 +-----
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index 3da348e4f40..3f7f4c9650f 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -72,7 +72,7 @@ QmlProject::QmlProject(Internal::Manager *manager, const Utils::FileName &fileNa
     m_projectName = fileInfo.completeBaseName();
 
     m_file = new Internal::QmlProjectFile(this, fileName);
-    m_rootNode = new Internal::QmlProjectNode(this, m_file);
+    m_rootNode = new Internal::QmlProjectNode(this);
 
     DocumentManager::addDocument(m_file, true);
 
diff --git a/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp b/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp
index 0b254b2c430..42bd48b12d3 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp
@@ -41,12 +41,11 @@
 namespace QmlProjectManager {
 namespace Internal {
 
-QmlProjectNode::QmlProjectNode(QmlProject *project, Core::IDocument *projectFile)
-    : ProjectExplorer::ProjectNode(projectFile->filePath()),
-      m_project(project),
-      m_projectFile(projectFile)
+QmlProjectNode::QmlProjectNode(QmlProject *project)
+    : ProjectExplorer::ProjectNode(project->projectFilePath()),
+      m_project(project)
 {
-    setDisplayName(projectFile->filePath().toFileInfo().completeBaseName());
+    setDisplayName(project->projectFilePath().toFileInfo().completeBaseName());
     // make overlay
     const QSize desiredSize = QSize(16, 16);
     const QIcon projectBaseIcon(QLatin1String(":/qmlproject/images/qmlfolder.png"));
@@ -59,12 +58,6 @@ QmlProjectNode::QmlProjectNode(QmlProject *project, Core::IDocument *projectFile
 QmlProjectNode::~QmlProjectNode()
 { }
 
-Core::IDocument *QmlProjectNode::projectFile() const
-{ return m_projectFile; }
-
-QString QmlProjectNode::projectFilePath() const
-{ return m_projectFile->filePath().toString(); }
-
 void QmlProjectNode::refresh()
 {
     using namespace ProjectExplorer;
diff --git a/src/plugins/qmlprojectmanager/qmlprojectnodes.h b/src/plugins/qmlprojectmanager/qmlprojectnodes.h
index 7a62d655950..b4b0f9eb55e 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectnodes.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectnodes.h
@@ -47,12 +47,9 @@ namespace Internal {
 class QmlProjectNode : public ProjectExplorer::ProjectNode
 {
 public:
-    QmlProjectNode(QmlProject *project, Core::IDocument *projectFile);
+    QmlProjectNode(QmlProject *project);
     ~QmlProjectNode() override;
 
-    Core::IDocument *projectFile() const;
-    QString projectFilePath() const;
-
     virtual bool showInSimpleTree() const override;
 
     virtual QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const override;
@@ -69,7 +66,6 @@ private:
 
 private:
     QmlProject *m_project;
-    Core::IDocument *m_projectFile;
     QHash<QString, FolderNode *> m_folderByName;
 };