- added SGPropertyNode::Type

- changed return type of SGPropertyNode::getType methods from
  SGValue::Type to SGPropertyNode::Type
- made SGPropertyNode::getValue and SGPropertyNode::hasValue private
  so that applications cannot get at SGValue instances (SGValue is
  slated for removal)

diff --git a/simgear/misc/props.hxx b/simgear/misc/props.hxx
index b95c52968562200b9bb204c38cb96e41b214e5c7..9254e9102d840fa8a838653de4e3047c082e5f36 100644 (file)
--- a/simgear/misc/props.hxx
+++ b/simgear/misc/props.hxx
@@ -565,6 +565,22 @@ class SGPropertyNode
 
 public:
 
+  /**
+   * Property value types.
+   *
+   * Right now, this duplicates SGValue::Type, but SGValue will be
+   * disappearing soon.
+   */
+  enum Type {
+    BOOL,
+    INT,
+    LONG,
+    FLOAT,
+    DOUBLE,
+    STRING,
+    UNKNOWN
+  };
+
   SGPropertyNode ();
    virtual ~SGPropertyNode ();
 
@@ -607,7 +623,7 @@ public:
   const SGPropertyNode * getNode (const string &relative_path) const;
 
                                // Value-related stuff.
-  SGValue::Type getType () const;
+  Type getType () const;
   
   bool getBoolValue () const;
   int getIntValue () const;
@@ -636,11 +652,7 @@ public:
   bool untie ();
 
                                // Values from paths.
-  bool hasValue (const string &relative_path) const;
-  SGValue * getValue (const string &relative_path, bool create = false);
-  const SGValue * getValue (const string &relative_path) const;
-
-  SGValue::Type getType (const string &relative_path) const;
+  Type getType (const string &relative_path) const;
   
   bool getBoolValue (const string &relative_path,
                     bool defaultValue = false) const;
@@ -686,6 +698,10 @@ protected:
 
 private:
 
+  bool hasValue (const string &relative_path) const;
+  SGValue * getValue (const string &relative_path, bool create = false);
+  const SGValue * getValue (const string &relative_path) const;
+
   SGPropertyNode (const SGPropertyNode &node) {}
 
   SGValue * _value;