Remove unused json methods

diff --git a/rrts/incl/rrtext.hh b/rrts/incl/rrtext.hh
index 17962faa53143a70f4120b7ffd3d049b5b1f9ce4..2fa6958b264639735958569ae2cc82c18764c949 100644 (file)
--- a/rrts/incl/rrtext.hh
+++ b/rrts/incl/rrtext.hh
@@ -150,7 +150,6 @@ private:
 public:
        RRTExt13();
        Json::Value json() const;
-       void json(Json::Value jvi);
        void reset();
 };
 
@@ -213,7 +212,6 @@ private:
        bool collide_steered();
 public:
        RRTExt2();
-       Json::Value json() const;
        void json(Json::Value jvi);
        void reset();
 };

diff --git a/rrts/incl/rrts.hh b/rrts/incl/rrts.hh
index 97d03bbbed51a81170cdeea73b537ad18c4bf238..6bab6ae71f6fadd06e2bf63e36a34a9e57933da1 100644 (file)
--- a/rrts/incl/rrts.hh
+++ b/rrts/incl/rrts.hh
@@ -166,13 +166,13 @@ public:
 
        /*! Set eta. */
        void eta(double e);
-
+public:
        /*! Generate JSON output. */
-       Json::Value json() const;
+       virtual Json::Value json(void) const;
 
        /*! Load JSON input. */
-       void json(Json::Value jvi);
-public:
+       virtual void json(Json::Value jvi);
+
        /*! Run next RRT* iteration. Return True if should continue. */
        virtual bool next();
 

diff --git a/rrts/src/rrtext13.cc b/rrts/src/rrtext13.cc
index 147e26b5dbfb8ae2e5c107a5c92e19aa03ef2529..758f4d994b42b12941ec11e8ad779654c0387302 100644 (file)
--- a/rrts/src/rrtext13.cc
+++ b/rrts/src/rrtext13.cc
@@ -271,12 +271,6 @@ RRTExt13::json() const
        return jvo;
 }
 
-void
-RRTExt13::json(Json::Value jvi)
-{
-       RRTS::json(jvi);
-}
-
 void
 RRTExt13::reset()
 {

diff --git a/rrts/src/rrtext2.cc b/rrts/src/rrtext2.cc
index 3450735368a0249e26e0cb13b18239b8f45e8731..087e863f309063078f35f23f10c9dc95bd8cbc02 100644 (file)
--- a/rrts/src/rrtext2.cc
+++ b/rrts/src/rrtext2.cc
@@ -68,12 +68,6 @@ RRTExt2::reset()
        this->c2_bc_.verts[3].y = this->_bc.rfy();
 }
 
-Json::Value
-RRTExt2::json() const
-{
-       return RRTS::json();
-}
-
 void
 RRTExt2::json(Json::Value jvi)
 {

diff --git a/rrts/src/rrts.cc b/rrts/src/rrts.cc
index 4c016b2f1620c5bd6b653fb58029e8f09bb1d7c0..4f131145c63ae19c45cdf7cd5c38a7334b04ccc0 100644 (file)
--- a/rrts/src/rrts.cc
+++ b/rrts/src/rrts.cc
@@ -374,7 +374,7 @@ RRTS::eta(double e)
 }
 
 Json::Value
-RRTS::json() const
+RRTS::json(void) const
 {
        Json::Value jvo;
        unsigned int i = 0, j = 0;