Fixed a crash: the singleton needs to be instantiated the first time SGCommandMgr...

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

diff --git a/simgear/props/tiedpropertylist.hxx b/simgear/props/tiedpropertylist.hxx
index c825d1051e027890bcfd813c5f646da6f58c4d4f..39461afd5f836499478f4cd0a8d81cb0b32b3194 100644 (file)
--- a/simgear/props/tiedpropertylist.hxx
+++ b/simgear/props/tiedpropertylist.hxx
@@ -22,7 +22,6 @@
 #define  __TIEDPROPERTYLIST_HXX
 #include <simgear/props/props.hxx>
 #include <assert.h>
-using simgear::PropertyList;
 
 namespace simgear {
 
@@ -31,18 +30,18 @@ namespace simgear {
  * This helper class keeps track of tied properties and unties
  * each tied property when this class gets destructed.
 */
-class TiedPropertyList : PropertyList {
+class TiedPropertyList : simgear::PropertyList {
 public:
     TiedPropertyList() {}
     TiedPropertyList( SGPropertyNode_ptr root ) : _root(root) {}
     virtual ~TiedPropertyList()
     { 
         _root = 0;
-        if (size()>0)
+        if (! empty())
         {
             SG_LOG(SG_GENERAL, SG_ALERT, "Detected properties with dangling ties. Use 'Untie' before removing a TiedPropertyList.");
             // running debug mode: go, fix it!
-            assert(size() == 0);
+            assert(empty());
         }
     }
 
@@ -52,7 +51,7 @@ public:
     template<typename T> SGPropertyNode_ptr Tie( SGPropertyNode_ptr node, const SGRawValue<T> &rawValue, bool useDefault = true  ) {
         bool success = node->tie( rawValue, useDefault );
         if( success ) {
-            SG_LOG( SG_ALL, SG_INFO, "Tied " << node->getPath() );
+            SG_LOG( SG_GENERAL, SG_DEBUG, "Tied " << node->getPath() );
             push_back( node );
         } else {
 #if PROPS_STANDALONE
@@ -125,12 +124,18 @@ public:
     }
 
     void Untie() {
-        while( size() > 0 ) {
-            SG_LOG( SG_ALL, SG_INFO, "untie of " << back()->getPath() );
+        while( ! empty() ) {
+            SG_LOG( SG_GENERAL, SG_DEBUG, "untie of " << back()->getPath() );
             back()->untie();
             pop_back();
         }
     }
+
+    void setAttribute (SGPropertyNode::Attribute attr, bool state)
+    {
+        for (std::vector<SGPropertyNode_ptr>::iterator it=begin() ; it < end(); it++ )
+           (*it)->setAttribute(attr, state);
+    }
 private:
     SGPropertyNode_ptr _root;
 };