CVS: source/src/Autopilot xmlauto.cxx, 1.55, 1.56 xmlauto.hxx, 1.32, 1.33

Update of /var/cvs/FlightGear-0.9/source/src/Autopilot
In directory baron.flightgear.org:/tmp/cvs-serv23629/Autopilot

Modified Files:
	xmlauto.cxx xmlauto.hxx 
Log Message:
use simgear::PropertyList instead of std::vector<SGPropertyNode_ptr>

Index: xmlauto.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/source/src/Autopilot/xmlauto.cxx,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- xmlauto.cxx	19 Mar 2010 20:35:47 -0000	1.55
+++ xmlauto.cxx	15 Apr 2010 12:31:12 -0000	1.56
@@ -1003,13 +1003,13 @@
 
 void FGXMLAutopilotGroup::init()
 {
-    vector<SGPropertyNode_ptr> autopilotNodes = fgGetNode( "/sim/systems", true )->getChildren("autopilot");
+    PropertyList autopilotNodes = fgGetNode( "/sim/systems", true )->getChildren("autopilot");
     if( autopilotNodes.size() == 0 ) {
         SG_LOG( SG_ALL, SG_WARN, "No autopilot configuration specified for this model!");
         return;
     }
 
-    for( vector<SGPropertyNode_ptr>::size_type i = 0; i < autopilotNodes.size(); i++ ) {
+    for( PropertyList::size_type i = 0; i < autopilotNodes.size(); i++ ) {
         SGPropertyNode_ptr pathNode = autopilotNodes[i]->getNode( "path" );
         if( pathNode == NULL ) {
             SG_LOG( SG_ALL, SG_WARN, "No autopilot configuration file specified for this autopilot!");

Index: xmlauto.hxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/source/src/Autopilot/xmlauto.hxx,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xmlauto.hxx	24 Feb 2010 22:15:49 -0000	1.32
+++ xmlauto.hxx	15 Apr 2010 12:31:14 -0000	1.33
@@ -49,6 +49,8 @@
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/props/condition.hxx>
 
+using simgear::PropertyList;
+
 typedef SGSharedPtr<class FGXMLAutoInput> FGXMLAutoInput_ptr;
 typedef SGSharedPtr<class FGPeriodicalValue> FGPeriodicalValue_ptr;
 
@@ -122,7 +124,7 @@
 class FGXMLAutoComponent : public SGReferenced {
 
 private:
-    std::vector <SGPropertyNode_ptr> output_list;
+    PropertyList output_list;
 
     SGSharedPtr<const SGCondition> _condition;
     SGPropertyNode_ptr enable_prop;
@@ -201,7 +203,7 @@
         // helpful for things like flight directors which position
         // their vbars from the autopilot computations.
         if ( honor_passive && passive_mode->getBoolValue() ) return;
-        for( std::vector <SGPropertyNode_ptr>::iterator it = output_list.begin(); it != output_list.end(); ++it)
+        for( PropertyList::iterator it = output_list.begin(); it != output_list.end(); ++it)
           (*it)->setDoubleValue( clamp( value ) );
     }
 
@@ -212,7 +214,7 @@
         // helpful for things like flight directors which position
         // their vbars from the autopilot computations.
         if ( honor_passive && passive_mode->getBoolValue() ) return;
-        for( std::vector <SGPropertyNode_ptr>::iterator it = output_list.begin(); it != output_list.end(); ++it)
+        for( PropertyList::iterator it = output_list.begin(); it != output_list.end(); ++it)
           (*it)->setBoolValue( value ); // don't use clamp here, bool is clamped anyway
     }
 


------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev