Interim windows build fix

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

diff --git a/src/Autopilot/component.hxx b/src/Autopilot/component.hxx
index 795f104a08f9e211144e1cd2e043673c6f2b0e6a..1a92f58b368403c43ac2bea94525285bcdb0d713 100644 (file)
--- a/src/Autopilot/component.hxx
+++ b/src/Autopilot/component.hxx
@@ -27,9 +27,8 @@
 #  include <config.h>
 #endif
 
-#include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
-#include <simgear/props/condition.hxx>
+#include <simgear/props/propsfwd.hxx>
 
 namespace FGXMLAutopilot {
 
@@ -48,9 +47,10 @@ private:
 
 protected:
 
-    virtual bool configure( const std::string & nodeName, SGPropertyNode_ptr configNode );
+    virtual bool configure( SGPropertyNode& cfg_node,
+                            const std::string& cfg_name,
+                            SGPropertyNode& prop_root );
 
-    
    /**
     * @brief the implementation of the update() method of the SGSubsystem
     */
@@ -58,7 +58,7 @@ protected:
 
    /** 
     * @brief pure virtual function to be implemented by the derived classes. Gets called from
-    * the update method if it's not disabled with the firstTime parameter set to true it this
+    * the update method if it's not disabled with the firstTime parameter set to true if this
     * is the first call after being enabled 
     * @param firstTime set to true if this is the first update call since this component has
              been enabled. Set to false for every subsequent call.
@@ -98,11 +98,15 @@ public:
     virtual ~Component();
 
     /**
-     * @brief configure this component from a property node. Iterates through all nodes found
-     *        as childs under configNode and calls configure of the derived class for each child.
-     * @param configNode the property node containing the configuration 
+     * @brief configure this component from a property node. Iterates through
+     *        all nodes found as children under configNode and calls configure
+     *        of the derived class for each child.
+     *
+     * @param prop_root Property root for all relative paths
+     * @param cfg       Property node containing the configuration
      */
-    bool configure( SGPropertyNode_ptr configNode );
+    virtual bool configure( SGPropertyNode& prop_root,
+                            SGPropertyNode& cfg );
 
     /**
      * @brief getter for the name property