Browse Source

cmState: Rename GetParent method.

Leave the namespace open for other Parent types.
Stephen Kelly 10 years ago
parent
commit
cf1233a0ea
4 changed files with 7 additions and 6 deletions
  1. 1 1
      Source/cmLocalGenerator.cxx
  2. 2 1
      Source/cmMakefile.cxx
  3. 3 3
      Source/cmState.cxx
  4. 1 1
      Source/cmState.h

+ 1 - 1
Source/cmLocalGenerator.cxx

@@ -73,7 +73,7 @@ cmLocalGenerator::~cmLocalGenerator()
 
 bool cmLocalGenerator::IsRootMakefile() const
 {
-  return !this->StateSnapshot.GetParent().IsValid();
+  return !this->StateSnapshot.GetBuildsystemDirectoryParent().IsValid();
 }
 
 //----------------------------------------------------------------------------

+ 2 - 1
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();

+ 3 - 3
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)

+ 1 - 1
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();