use auto_ptr instead

[simgear.git] / simgear / props / props.hxx

diff --git a/simgear/props/props.hxx b/simgear/props/props.hxx
index 8e3647eeb71e45ace7328d5a9bacb35d4507f05a..dc9871343b176c8f8d309b68c0b13aa1a837cf42 100644 (file)
--- a/simgear/props/props.hxx
+++ b/simgear/props/props.hxx
@@ -312,7 +312,10 @@ public:
    * may need different kinds of default values (such as epoch for a
    * date type).  The default value is used when creating new values.
    */
-  static const T DefaultValue; // Default for this kind of raw value.
+  static T DefaultValue()
+  {
+    return T();
+  }
 
 
   /**
@@ -368,14 +371,15 @@ public:
 // Default values for every type.
 ////////////////////////////////////////////////////////////////////////
 
-template<> const bool SGRawValue<bool>::DefaultValue;
-template<> const int SGRawValue<int>::DefaultValue;
-template<> const long SGRawValue<long>::DefaultValue;
-template<> const float SGRawValue<float>::DefaultValue;
-template<> const double SGRawValue<double>::DefaultValue;
-template<> const char * const SGRawValue<const char *>::DefaultValue;
-template<> const SGVec3d SGRawValue<SGVec3d>::DefaultValue;
-template<> const SGVec4d SGRawValue<SGVec4d>::DefaultValue;
+template<> inline bool SGRawValue<bool>::DefaultValue()
+{
+  return false;
+}
+
+template<> inline const char * SGRawValue<const char *>::DefaultValue()
+{
+  return "";
+}
 
 /**
  * A raw value bound to a pointer.
@@ -486,7 +490,7 @@ public:
    */
   virtual T getValue () const {
     if (_getter) return (*_getter)();
-    else return SGRawValue<T>::DefaultValue;
+    else return SGRawValue<T>::DefaultValue();
   }
 
   /**
@@ -535,7 +539,7 @@ public:
   virtual ~SGRawValueFunctionsIndexed () {}
   virtual T getValue () const {
     if (_getter) return (*_getter)(_index);
-    else return SGRawValue<T>::DefaultValue;
+    else return SGRawValue<T>::DefaultValue();
   }
   virtual bool setValue (T value) {
     if (_setter) { (*_setter)(_index, value); return true; }
@@ -568,7 +572,7 @@ public:
   virtual ~SGRawValueMethods () {}
   virtual T getValue () const {
     if (_getter) { return (_obj.*_getter)(); }
-    else { return SGRawValue<T>::DefaultValue; }
+    else { return SGRawValue<T>::DefaultValue(); }
   }
   virtual bool setValue (T value) {
     if (_setter) { (_obj.*_setter)(value); return true; }
@@ -602,7 +606,7 @@ public:
   virtual ~SGRawValueMethodsIndexed () {}
   virtual T getValue () const {
     if (_getter) { return (_obj.*_getter)(_index); }
-    else { return SGRawValue<T>::DefaultValue; }
+    else { return SGRawValue<T>::DefaultValue(); }
   }
   virtual bool setValue (T value) {
     if (_setter) { (_obj.*_setter)(_index, value); return true; }
@@ -697,6 +701,11 @@ class SGPropertyNode;
 typedef SGSharedPtr<SGPropertyNode> SGPropertyNode_ptr;
 typedef SGSharedPtr<const SGPropertyNode> SGConstPropertyNode_ptr;
 
+namespace simgear
+{
+typedef std::vector<SGPropertyNode_ptr> PropertyList;
+}
+
 \f
 /**
  * The property change listener interface.
@@ -795,11 +804,10 @@ public:
    */
   const char * getName () const { return _name.c_str(); }
 
-
   /**
    * Get the node's pretty display name, with subscript when needed.
    */
-  const char * getDisplayName (bool simplify = false) const;
+    std::string getDisplayName (bool simplify = false) const;
 
 
   /**
@@ -828,7 +836,7 @@ public:
   /**
    * Get the number of child nodes.
    */
-  int nChildren () const { return _children.size(); }
+  int nChildren () const { return (int)_children.size(); }
 
 
   /**
@@ -893,12 +901,12 @@ public:
   /**
    * Get a vector of all children with the specified name.
    */
-  std::vector<SGPropertyNode_ptr> getChildren (const char * name) const;
+  simgear::PropertyList getChildren (const char * name) const;
 
   /**
    * Get a vector of all children with the specified name.
    */
-  std::vector<SGPropertyNode_ptr> getChildren (const std::string& name) const
+  simgear::PropertyList getChildren (const std::string& name) const
   { return getChildren(name.c_str()); }
 
   /**
@@ -923,15 +931,13 @@ public:
   /**
    * Remove all children with the specified name.
    */
-  std::vector<SGPropertyNode_ptr> removeChildren (const char * name,
-                                             bool keep = true);
-
+  simgear::PropertyList removeChildren (const char * name, bool keep = true);
 
   /**
    * Remove all children with the specified name.
    */
-  std::vector<SGPropertyNode_ptr> removeChildren (const std::string& name,
-                                             bool keep = true)
+  simgear::PropertyList removeChildren (const std::string& name,
+                                        bool keep = true)
   { return removeChildren(name.c_str(), keep); }
 
   //
@@ -1420,12 +1426,17 @@ public:
    */
   bool setStringValue (const char * relative_path, const char * value);
 
+  bool setStringValue(const char * relative_path, const std::string& value)
+  { return setStringValue(relative_path, value.c_str()); }
   /**
    * Set another node's value as a string.
    */
   bool setStringValue (const std::string& relative_path, const char * value)
   { return setStringValue(relative_path.c_str(), value); }
 
+  bool setStringValue (const std::string& relative_path,
+                       const std::string& value)
+  { return setStringValue(relative_path.c_str(), value.c_str()); }
 
   /**
    * Set another node's value with no specified type.
@@ -1557,7 +1568,7 @@ public:
   /**
    * Get the number of listeners.
    */
-  int nListeners () const { return _listeners ? _listeners->size() : 0; }
+  int nListeners () const { return _listeners ? (int)_listeners->size() : 0; }
 
 
   /**
@@ -1642,12 +1653,11 @@ private:
 
   int _index;
   std::string _name;
-  mutable std::string _display_name;
   /// To avoid cyclic reference counting loops this shall not be a reference
   /// counted pointer
   SGPropertyNode * _parent;
-  std::vector<SGPropertyNode_ptr> _children;
-  std::vector<SGPropertyNode_ptr> _removedChildren;
+  simgear::PropertyList _children;
+  simgear::PropertyList _removedChildren;
   std::vector<hash_table *> _linkedNodes;
   mutable std::string _path;
   mutable std::string _buffer;
@@ -1810,7 +1820,7 @@ bool SGPropertyNode::tie(const SGRawValue<T> &rawValue, bool useDefault)
         return false;
 
     useDefault = useDefault && hasValue();
-    T old_val = SGRawValue<T>::DefaultValue;
+    T old_val = SGRawValue<T>::DefaultValue();
     if (useDefault)
         old_val = getValue<T>(this);
     clearValue();
@@ -1841,7 +1851,7 @@ T SGPropertyNode::getValue(typename boost::disable_if_c<simgear::props
     if (getAttribute(TRACE_READ))
         trace_read();
     if (!getAttribute(READ))
-        return SGRawValue<T>::DefaultValue;
+      return SGRawValue<T>::DefaultValue();
     switch (_type) {
     case EXTENDED:
         if (_value.val->getType() == PropertyTraits<T>::type_tag)
@@ -1851,8 +1861,10 @@ T SGPropertyNode::getValue(typename boost::disable_if_c<simgear::props
     case UNSPECIFIED:
         return simgear::parseString<T>(make_string());
         break;
+    default: // avoid compiler warning
+        break;
     }
-    return SGRawValue<T>::DefaultValue;
+    return SGRawValue<T>::DefaultValue();
 }
 
 template<typename T>
@@ -1898,6 +1910,15 @@ inline bool SGPropertyNode::setValue(const T& val,
 {
   return ::setValue(this, val);
 }
+
+/**
+ * Utility function for creation of a child property node
+ */
+inline SGPropertyNode* makeChild(SGPropertyNode* parent, const char* name,
+                                 int index = 0)
+{
+    return parent->getChild(name, index, true);
+}
 #endif // __PROPS_HXX
 
 // end of props.hxx