Cleanup, no functional change

[flightgear.git] / src / Autopilot / digitalcomponent.hxx

diff --git a/src/Autopilot/digitalcomponent.hxx b/src/Autopilot/digitalcomponent.hxx
index 606dd5f8b1db6444db94e18a7f11019bafbd4fd1..ade691635e82bea8d3070e44985087751b19a6eb 100644 (file)
--- a/src/Autopilot/digitalcomponent.hxx
+++ b/src/Autopilot/digitalcomponent.hxx
@@ -25,6 +25,9 @@
 
 #include "component.hxx"
 
+#include <simgear/props/props.hxx>
+#include <simgear/props/condition.hxx>
+
 namespace FGXMLAutopilot {
 
 /**
@@ -59,7 +62,8 @@ inline DigitalOutput::DigitalOutput() : _inverted(false)
 
 inline void DigitalOutput::setProperty( SGPropertyNode_ptr node ) 
 { 
-  _node->setBoolValue( (_node = node)->getBoolValue() );
+  _node = node;
+  _node->setBoolValue( node->getBoolValue() );
 }
 
 inline bool DigitalOutput::getValue() const 
@@ -118,11 +122,14 @@ protected:
     /**
      * @brief Over-rideable hook method to allow derived classes to refine top-level
      * node parsing. 
-     * @param aName
-     * @param aNode
+     * @param cfg_node
+     * @param cfg_name
+     * @param prop_root
      * @return true if the node was handled, false otherwise.
      */
-    virtual bool configure( const std::string & nodeName, SGPropertyNode_ptr configNode );
+    virtual bool configure( SGPropertyNode& cfg_node,
+                            const std::string& cfg_name,
+                            SGPropertyNode& prop_root );
 };
 
 }