From cf1233a0eab7cec757d2929cc7373f94ba4fa8a8 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Sat, 23 May 2015 08:02:54 +0200
Subject: cmState: Rename GetParent method.

Leave the namespace open for other Parent types.
---
 Source/cmLocalGenerator.cxx | 2 +-
 Source/cmMakefile.cxx       | 3 ++-
 Source/cmState.cxx          | 6 +++---
 Source/cmState.h            | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index eb6b871..a16fc55 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -73,7 +73,7 @@ cmLocalGenerator::~cmLocalGenerator()
 
 bool cmLocalGenerator::IsRootMakefile() const
 {
-  return !this->StateSnapshot.GetParent().IsValid();
+  return !this->StateSnapshot.GetBuildsystemDirectoryParent().IsValid();
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 60498ef..00627bf 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4038,7 +4038,8 @@ const char *cmMakefile::GetProperty(const std::string& prop,
   output = "";
   if (prop == "PARENT_DIRECTORY")
     {
-    cmState::Snapshot parent = this->StateSnapshot.GetParent();
+    cmState::Snapshot parent =
+        this->StateSnapshot.GetBuildsystemDirectoryParent();
     if(parent.IsValid())
       {
       return parent.GetCurrentSourceDirectory();
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index 87892b4..c6fb299 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -590,7 +590,7 @@ void cmState::Snapshot::ComputeRelativePathTopSource()
   snapshots.push_back(snapshot);
   while (true)
     {
-    snapshot = snapshot.GetParent();
+    snapshot = snapshot.GetBuildsystemDirectoryParent();
     if (snapshot.IsValid())
       {
       snapshots.push_back(snapshot);
@@ -622,7 +622,7 @@ void cmState::Snapshot::ComputeRelativePathTopBinary()
   snapshots.push_back(snapshot);
   while (true)
     {
-    snapshot = snapshot.GetParent();
+    snapshot = snapshot.GetBuildsystemDirectoryParent();
     if (snapshot.IsValid())
       {
       snapshots.push_back(snapshot);
@@ -775,7 +775,7 @@ bool cmState::Snapshot::IsValid() const
   return this->State ? true : false;
 }
 
-cmState::Snapshot cmState::Snapshot::GetParent() const
+cmState::Snapshot cmState::Snapshot::GetBuildsystemDirectoryParent() const
 {
   Snapshot snapshot;
   if (!this->State || this->Position == 0)
diff --git a/Source/cmState.h b/Source/cmState.h
index 24e0f7b..60b024f 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -45,7 +45,7 @@ public:
     void SetRelativePathTopBinary(const char* dir);
 
     bool IsValid() const;
-    Snapshot GetParent() const;
+    Snapshot GetBuildsystemDirectoryParent() const;
 
   private:
     void ComputeRelativePathTopSource();
-- 
cgit v0.12