[Liblas-commits] hg-main-tree: rename, to avoid confusion with the -real- PTree r...

[liblas-commits at liblas.org]

details:   http://hg.libpc.orghg-main-tree/rev/bb46ee778754
changeset: 1145:bb46ee778754
user:      Michael P. Gerlek <mpg at flaxen.com>
date:      Thu Aug 18 17:52:28 2011 -0700
description:
rename, to avoid confusion with the -real- PTree routines

diffstat:

 include/pdal/Filter.hpp      |  2 +-
 include/pdal/MultiFilter.hpp |  2 +-
 include/pdal/Reader.hpp      |  2 +-
 include/pdal/StageBase.hpp   |  2 +-
 include/pdal/Writer.hpp      |  2 +-
 src/Filter.cpp               |  4 ++--
 src/MultiFilter.cpp          |  4 ++--
 src/PipelineWriter.cpp       |  2 +-
 src/Reader.cpp               |  2 +-
 src/Writer.cpp               |  4 ++--
 10 files changed, 13 insertions(+), 13 deletions(-)

diffs (147 lines):

diff -r a5c850699fc4 -r bb46ee778754 include/pdal/Filter.hpp
--- a/include/pdal/Filter.hpp	Thu Aug 18 17:44:29 2011 -0700
+++ b/include/pdal/Filter.hpp	Thu Aug 18 17:52:28 2011 -0700
@@ -52,7 +52,7 @@
     const Stage& getPrevStage() const;
 
     // for xml serializion of pipelines
-    virtual boost::property_tree::ptree generatePTree() const;
+    virtual boost::property_tree::ptree serializePipeline() const;
 
     // for dumping
     virtual boost::property_tree::ptree toPTree() const;
diff -r a5c850699fc4 -r bb46ee778754 include/pdal/MultiFilter.hpp
--- a/include/pdal/MultiFilter.hpp	Thu Aug 18 17:44:29 2011 -0700
+++ b/include/pdal/MultiFilter.hpp	Thu Aug 18 17:52:28 2011 -0700
@@ -54,7 +54,7 @@
     const std::vector<const Stage*> getPrevStages() const;
 
     // for xml serializion of pipelines
-    virtual boost::property_tree::ptree generatePTree() const;
+    virtual boost::property_tree::ptree serializePipeline() const;
 
     // for dumping
     virtual boost::property_tree::ptree toPTree() const;
diff -r a5c850699fc4 -r bb46ee778754 include/pdal/Reader.hpp
--- a/include/pdal/Reader.hpp	Thu Aug 18 17:44:29 2011 -0700
+++ b/include/pdal/Reader.hpp	Thu Aug 18 17:52:28 2011 -0700
@@ -55,7 +55,7 @@
     virtual void initialize();
 
     // for xml serializion of pipelines
-    virtual boost::property_tree::ptree generatePTree() const;
+    virtual boost::property_tree::ptree serializePipeline() const;
     
     // for dumping
     virtual boost::property_tree::ptree toPTree() const;
diff -r a5c850699fc4 -r bb46ee778754 include/pdal/StageBase.hpp
--- a/include/pdal/StageBase.hpp	Thu Aug 18 17:44:29 2011 -0700
+++ b/include/pdal/StageBase.hpp	Thu Aug 18 17:52:28 2011 -0700
@@ -66,7 +66,7 @@
 
     // This is used to generate pipeline xml files.  It will
     // recursively visit all child stages to populate the tree.
-    virtual boost::property_tree::ptree generatePTree() const = 0;
+    virtual boost::property_tree::ptree serializePipeline() const = 0;
 
     // This is set by the "debug" option, which is a boolean.
     // 
diff -r a5c850699fc4 -r bb46ee778754 include/pdal/Writer.hpp
--- a/include/pdal/Writer.hpp	Thu Aug 18 17:44:29 2011 -0700
+++ b/include/pdal/Writer.hpp	Thu Aug 18 17:52:28 2011 -0700
@@ -66,7 +66,7 @@
     boost::uint64_t write(boost::uint64_t targetNumPointsToWrite=0);
 
     // for xml serializion of pipelines
-    virtual boost::property_tree::ptree generatePTree() const;
+    virtual boost::property_tree::ptree serializePipeline() const;
 
     const Stage& getPrevStage() const;
 
diff -r a5c850699fc4 -r bb46ee778754 src/Filter.cpp
--- a/src/Filter.cpp	Thu Aug 18 17:44:29 2011 -0700
+++ b/src/Filter.cpp	Thu Aug 18 17:52:28 2011 -0700
@@ -72,7 +72,7 @@
 }
 
 
-boost::property_tree::ptree Filter::generatePTree() const
+boost::property_tree::ptree Filter::serializePipeline() const
 {
     boost::property_tree::ptree tree;
 
@@ -82,7 +82,7 @@
     tree.add_child(optiontree.begin()->first, optiontree.begin()->second);
 
     const Stage& stage = getPrevStage();
-    boost::property_tree::ptree subtree = stage.generatePTree();
+    boost::property_tree::ptree subtree = stage.serializePipeline();
 
     tree.add_child(subtree.begin()->first, subtree.begin()->second);
     
diff -r a5c850699fc4 -r bb46ee778754 src/MultiFilter.cpp
--- a/src/MultiFilter.cpp	Thu Aug 18 17:44:29 2011 -0700
+++ b/src/MultiFilter.cpp	Thu Aug 18 17:52:28 2011 -0700
@@ -84,7 +84,7 @@
 }
 
 
-boost::property_tree::ptree MultiFilter::generatePTree() const
+boost::property_tree::ptree MultiFilter::serializePipeline() const
 {
     boost::property_tree::ptree tree;
 
@@ -95,7 +95,7 @@
 
     BOOST_FOREACH(const Stage* stage, getPrevStages())
     {
-        boost::property_tree::ptree subtree = stage->generatePTree();
+        boost::property_tree::ptree subtree = stage->serializePipeline();
 
         tree.add_child(subtree.begin()->first, subtree.begin()->second);
     }
diff -r a5c850699fc4 -r bb46ee778754 src/PipelineWriter.cpp
--- a/src/PipelineWriter.cpp	Thu Aug 18 17:44:29 2011 -0700
+++ b/src/PipelineWriter.cpp	Thu Aug 18 17:52:28 2011 -0700
@@ -62,7 +62,7 @@
 
 static boost::property_tree::ptree generateTreeFromWriter(const Writer& writer)
 {
-    boost::property_tree::ptree subtree = writer.generatePTree();
+    boost::property_tree::ptree subtree = writer.serializePipeline();
 
     boost::property_tree::ptree tree;
 
diff -r a5c850699fc4 -r bb46ee778754 src/Reader.cpp
--- a/src/Reader.cpp	Thu Aug 18 17:44:29 2011 -0700
+++ b/src/Reader.cpp	Thu Aug 18 17:52:28 2011 -0700
@@ -58,7 +58,7 @@
 }
 
 
-boost::property_tree::ptree Reader::generatePTree() const
+boost::property_tree::ptree Reader::serializePipeline() const
 {
     boost::property_tree::ptree tree;
 
diff -r a5c850699fc4 -r bb46ee778754 src/Writer.cpp
--- a/src/Writer.cpp	Thu Aug 18 17:44:29 2011 -0700
+++ b/src/Writer.cpp	Thu Aug 18 17:52:28 2011 -0700
@@ -191,7 +191,7 @@
 }
 
 
-boost::property_tree::ptree Writer::generatePTree() const
+boost::property_tree::ptree Writer::serializePipeline() const
 {
     boost::property_tree::ptree tree;
 
@@ -201,7 +201,7 @@
     tree.add_child(optiontree.begin()->first, optiontree.begin()->second);
 
     const Stage& stage = getPrevStage();
-    boost::property_tree::ptree subtree = stage.generatePTree();
+    boost::property_tree::ptree subtree = stage.serializePipeline();
 
     tree.add_child(subtree.begin()->first, subtree.begin()->second);