Use SGPropertyNode_ptr and add a private copy constructor, both for

safety's sake.

diff --git a/src/Input/input.cxx b/src/Input/input.cxx
index 66ae607f81c4c68957386b19c34eef58bd7131e3..f5ccdfa5a5415eae871614f91b8db941fb48e4a4 100644 (file)
--- a/src/Input/input.cxx
+++ b/src/Input/input.cxx
@@ -89,27 +89,21 @@ FGBinding::FGBinding ()
 }
 
 FGBinding::FGBinding (const SGPropertyNode * node)
-  : _command(0),
-    _arg(new SGPropertyNode),
-    _setting(0)
 {
+  FGBinding();
   read(node);
 }
 
 FGBinding::~FGBinding ()
 {
-//   delete _arg;                       // Delete the saved arguments
-//   delete _command_state;     // Delete the saved command state
 }
 
 void
 FGBinding::read (const SGPropertyNode * node)
 {
   const SGPropertyNode * conditionNode = node->getChild("condition");
-  if (conditionNode != 0) {
-    cerr << "Adding condition to binding" << endl;
+  if (conditionNode != 0)
     setCondition(fgReadCondition(conditionNode));
-  }
 
   _command_name = node->getStringValue("command", "");
   if (_command_name.empty()) {
@@ -125,10 +119,7 @@ FGBinding::read (const SGPropertyNode * node)
     return;
   }
 
-  delete _arg;
-  _arg = new SGPropertyNode;
-  _setting = 0;
-  copyProperties(node, _arg);  // FIXME: don't use whole node!!!
+  _arg = (SGPropertyNode *)node;
 }
 
 void

diff --git a/src/Input/input.hxx b/src/Input/input.hxx
index 007e70a9376c703e6605f39a9ea946531f30c47a..491c0a2ca4da41b7c68abb19b395f1202de9ee7a 100644 (file)
--- a/src/Input/input.hxx
+++ b/src/Input/input.hxx
@@ -139,10 +139,14 @@ public:
 
 
 private:
+                                // just to be safe.
+  FGBinding (const FGBinding &binding);
+
+
   string _command_name;
   SGCommandMgr::command_t _command;
-  mutable SGPropertyNode * _arg;
-  mutable SGPropertyNode * _setting;
+  mutable SGPropertyNode_ptr _arg;
+  mutable SGPropertyNode_ptr _setting;
 };