Use SGPropertyNode_ptr wherever possible

diff --git a/src/AIModel/AIEscort.cxx b/src/AIModel/AIEscort.cxx
index 760378e78e6155206f830bb425877e4bb385e5e1..c9901ca24630d7e5c2ba6373c909376c7c453e48 100644 (file)
--- a/src/AIModel/AIEscort.cxx
+++ b/src/AIModel/AIEscort.cxx
@@ -235,10 +235,10 @@ bool FGAIEscort::getGroundElev(SGGeod inpos) {
 
 void FGAIEscort::setParent() {
 
-    const SGPropertyNode *ai = fgGetNode("/ai/models", true);
+    const SGPropertyNode_ptr ai = fgGetNode("/ai/models", true);
 
     for (int i = ai->nChildren() - 1; i >= -1; i--) {
-        const SGPropertyNode *model;
+        SGPropertyNode_ptr model;
 
         if (i < 0) { // last iteration: selected model
             model = _selected_ac;

diff --git a/src/AIModel/AIEscort.hxx b/src/AIModel/AIEscort.hxx
index ebc4424751ab6260148bb9066b7fbda856b4c5be..d5adff5d53693c90096f8d91aa5cd5c1817c6655 100644 (file)
--- a/src/AIModel/AIEscort.hxx
+++ b/src/AIModel/AIEscort.hxx
@@ -95,7 +95,7 @@ private:
     double _max_speed;
 
     const SGMaterial* _material;
-    const SGPropertyNode *_selected_ac;
+    SGPropertyNode_ptr _selected_ac;
 
     bool _MPControl, _patrol, _stn_deg_true;
 

diff --git a/src/AIModel/AIGroundVehicle.cxx b/src/AIModel/AIGroundVehicle.cxx
index f7a6a1d9ff02f7533ac85ecc3c119d5bac7981eb..bde684941ef443f1f0e90851e96bcbc8fe14a911 100644 (file)
--- a/src/AIModel/AIGroundVehicle.cxx
+++ b/src/AIModel/AIGroundVehicle.cxx
@@ -349,10 +349,10 @@ bool FGAIGroundVehicle::getPitch() {
 
 void FGAIGroundVehicle::setParent() {
 
-    const SGPropertyNode *ai = fgGetNode("/ai/models", true);
+    const SGPropertyNode_ptr ai = fgGetNode("/ai/models", true);
 
     for (int i = ai->nChildren() - 1; i >= -1; i--) {
-        const SGPropertyNode *model;
+        SGPropertyNode_ptr model;
 
         if (i < 0) { // last iteration: selected model
             model = _selected_ac;

diff --git a/src/AIModel/AIGroundVehicle.hxx b/src/AIModel/AIGroundVehicle.hxx
index f1f4085a9ef19e7df956285beb3ecc150e89bfc0..721ebf3032e4d15604e28424b0f42aae043e1716 100644 (file)
--- a/src/AIModel/AIGroundVehicle.hxx
+++ b/src/AIModel/AIGroundVehicle.hxx
@@ -96,7 +96,7 @@ private:
     double _dt_count, _next_run, _break_count;
 
     const SGMaterial* _material;
-    const SGPropertyNode *_selected_ac;
+    SGPropertyNode_ptr _selected_ac;
 
     string _parent;
 

diff --git a/src/Autopilot/autobrake.hxx b/src/Autopilot/autobrake.hxx
index 4dbf7555dff2cc2287975e305e2b2c10c7ea3890..2a6845c6621f464b1f517f87015955c88014eb79 100644 (file)
--- a/src/Autopilot/autobrake.hxx
+++ b/src/Autopilot/autobrake.hxx
@@ -92,7 +92,7 @@ private:
   double _rightBrakeOutput;
     
   SGPropertyNode_ptr _root;
-  SGPropertyNode* _brakeInputs[4];
+  SGPropertyNode_ptr _brakeInputs[4];
   SGPropertyNode_ptr _weightOnWheelsNode;
   SGPropertyNode_ptr _engineControlsNode;
   SGPropertyNode_ptr _groundspeedNode;

diff --git a/src/Instrumentation/gps.hxx b/src/Instrumentation/gps.hxx
index 76596773a7a5eb4e769e75c24c9be6d8f8da617d..d20c74e4814eeb6ec3012c531df2e735b874b9f0 100644 (file)
--- a/src/Instrumentation/gps.hxx
+++ b/src/Instrumentation/gps.hxx
@@ -419,7 +419,7 @@ private:
   SGPropertyNode_ptr _apTargetAltitudeFt;
   SGPropertyNode_ptr _apAltitudeLock;
   
-  std::vector<SGPropertyNode*> _tiedNodes;
+  std::vector<SGPropertyNode_ptr> _tiedNodes;
 };
 
 

diff --git a/src/Instrumentation/instrument_mgr.hxx b/src/Instrumentation/instrument_mgr.hxx
index 00b6ddfd1add5d5c3e09c0865c558fe05a1a412b..8224e85f58a134f4061b53e05710771291d84352 100644 (file)
--- a/src/Instrumentation/instrument_mgr.hxx
+++ b/src/Instrumentation/instrument_mgr.hxx
@@ -34,7 +34,7 @@ public:
     bool build ();
 
 private:
-    SGPropertyNode *config_props;
+    SGPropertyNode_ptr config_props;
     bool _explicitGps;
 };
 

diff --git a/src/Instrumentation/navradio.hxx b/src/Instrumentation/navradio.hxx
index 0337bf219d34e0fd9e7380dba5325eb0f6077ee1..41d662ff06f7ad6ddd540032c7ecacac7a713466 100644 (file)
--- a/src/Instrumentation/navradio.hxx
+++ b/src/Instrumentation/navradio.hxx
@@ -168,7 +168,7 @@ class FGNavRadio : public SGSubsystem
     double _gsNeedleDeflectionNorm;
     
     SGSharedPtr<SGSampleGroup> _sgr;
-    std::vector<SGPropertyNode*> _tiedNodes;
+    std::vector<SGPropertyNode_ptr> _tiedNodes;
     
     bool updateWithPower(double aDt);
 
@@ -208,7 +208,7 @@ class FGNavRadio : public SGSubsystem
     template <typename T>
     void tie(const char* aRelPath, const SGRawValue<T>& aRawValue)
     {
-      SGPropertyNode* nd = _radio_node->getNode(aRelPath, true);
+      SGPropertyNode_ptr nd = _radio_node->getNode(aRelPath, true);
       _tiedNodes.push_back(nd);
       nd->tie(aRawValue);
     }

diff --git a/src/Systems/electrical.hxx b/src/Systems/electrical.hxx
index a9e85039bd5682ae18f22191ac2261c9fc0d115a..c63b8c35f564a24e58bafe0037feb807ae1f3bfc 100644 (file)
--- a/src/Systems/electrical.hxx
+++ b/src/Systems/electrical.hxx
@@ -266,7 +266,7 @@ private:
     string name;
     int num;
     string path;
-    SGPropertyNode *config_props;
+    SGPropertyNode_ptr config_props;
 
     bool enabled;
 

diff --git a/src/Systems/system_mgr.hxx b/src/Systems/system_mgr.hxx
index e783532e22741083cb7cabab1aa679c460ba22fe..a5403580fe3ca08716831d5b03d8626843fc3da2 100644 (file)
--- a/src/Systems/system_mgr.hxx
+++ b/src/Systems/system_mgr.hxx
@@ -34,7 +34,7 @@ public:
     bool build ();
 
 private:
-    SGPropertyNode *config_props;
+    SGPropertyNode_ptr config_props;
     bool enabled;
 
 };