Merge branch 'timoore/ptrfix'

[flightgear.git] / src / Systems / electrical.hxx

diff --git a/src/Systems/electrical.hxx b/src/Systems/electrical.hxx
index 7959785fbbc6730010338e1069511ff632bed6d1..f6f21a4534a653f958f86dd73ab6ae1de2d8af43 100644 (file)
--- a/src/Systems/electrical.hxx
+++ b/src/Systems/electrical.hxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -32,11 +32,11 @@
 #  include <config.h>
 #endif
 
-#include STL_STRING
+#include <string>
 #include <vector>
 
-SG_USING_STD(string);
-SG_USING_STD(vector);
+using std::string;
+using std::vector;
 
 #include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
@@ -193,7 +193,7 @@ class FGElectricalSwitch {
 
 private:
 
-    SGPropertyNode *switch_node;
+    SGPropertyNode_ptr switch_node;
     float rating_amps;
     bool circuit_breaker;
 
@@ -251,7 +251,7 @@ public:
     virtual void unbind ();
     virtual void update (double dt);
 
-    bool build ();
+    bool build (SGPropertyNode* config_props);
     float propagate( FGElectricalComponent *node, double dt,
                      float input_volts, float input_amps,
                      string s = "" );
@@ -266,7 +266,6 @@ private:
     string name;
     int num;
     string path;
-    SGPropertyNode *config_props;
 
     bool enabled;
 
@@ -275,8 +274,8 @@ private:
     comp_list outputs;
     comp_list connectors;
 
-    SGPropertyNode *_volts_out;
-    SGPropertyNode *_amps_out;
+    SGPropertyNode_ptr _volts_out;
+    SGPropertyNode_ptr _amps_out;
 };