From 43258f91e80936b6762fa7215afdc95e8b34e0a9 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Fri, 11 Nov 2016 10:09:29 +0100
Subject: [PATCH] ProjectExplorer: Nodes: Rename member holding
 parentFolderNode pointer

Change-Id: I8c2abc5a3b258f1ec0b9d2b9582e0f4b41e11568
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 src/plugins/projectexplorer/projectnodes.cpp | 4 ++--
 src/plugins/projectexplorer/projectnodes.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/projectexplorer/projectnodes.cpp b/src/plugins/projectexplorer/projectnodes.cpp
index f1caf09fc0..1819e0903b 100644
--- a/src/plugins/projectexplorer/projectnodes.cpp
+++ b/src/plugins/projectexplorer/projectnodes.cpp
@@ -106,7 +106,7 @@ ProjectNode *Node::parentProjectNode() const
   */
 FolderNode *Node::parentFolderNode() const
 {
-    return m_folderNode;
+    return m_parentFolderNode;
 }
 
 /*!
@@ -178,7 +178,7 @@ bool Node::sortByPath(Node *a, Node *b)
 
 void Node::setParentFolderNode(FolderNode *parentFolder)
 {
-    m_folderNode = parentFolder;
+    m_parentFolderNode = parentFolder;
 }
 
 /*!
diff --git a/src/plugins/projectexplorer/projectnodes.h b/src/plugins/projectexplorer/projectnodes.h
index 2934e9edb1..907d3c1793 100644
--- a/src/plugins/projectexplorer/projectnodes.h
+++ b/src/plugins/projectexplorer/projectnodes.h
@@ -148,7 +148,7 @@ protected:
 
 private:
     ProjectNode *m_projectNode = nullptr;
-    FolderNode *m_folderNode = nullptr;
+    FolderNode *m_parentFolderNode = nullptr;
     Utils::FileName m_filePath;
     int m_line;
     const NodeType m_nodeType;
-- 
GitLab