From 03aac3de8b82eb318b92d7c1674aedda28e4c838 Mon Sep 17 00:00:00 2001
From: Torsten Dreyer <Torsten@t3r.de>
Date: Mon, 14 Feb 2011 20:26:39 +0100
Subject: [PATCH] Refactor ridgelift: use simgear::TiedPropertyList

---
 src/Environment/ridge_lift.cxx | 34 ++++++----------------------------
 src/Environment/ridge_lift.hxx |  2 ++
 2 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/src/Environment/ridge_lift.cxx b/src/Environment/ridge_lift.cxx
index 9598f2bbb..5f0bd2639 100644
--- a/src/Environment/ridge_lift.cxx
+++ b/src/Environment/ridge_lift.cxx
@@ -103,42 +103,20 @@ void FGRidgeLift::init(void)
 void FGRidgeLift::bind() {
 	string prop;
 
+	_tiedProperties.setRoot( fgGetNode("/environment/ridge-lift",true));
 	for( int i = 0; i < 5; i++ ) {
-		prop = CreateIndexedPropertyName("/environment/ridge-lift/probe-elev-m", i );
-		fgTie( prop.c_str(), this, i, &FGRidgeLift::get_probe_elev_m); // read-only
-
-		prop = CreateIndexedPropertyName("/environment/ridge-lift/probe-lat-deg", i );
-		fgTie( prop.c_str(), this, i, &FGRidgeLift::get_probe_lat_deg); // read-only
-
-		prop = CreateIndexedPropertyName("/environment/ridge-lift/probe-lon-deg", i );
-		fgTie( prop.c_str(), this, i, &FGRidgeLift::get_probe_lon_deg); // read-only
+		_tiedProperties.Tie( "probe-elev-m", i, this, i, &FGRidgeLift::get_probe_elev_m );
+		_tiedProperties.Tie( "probe-lat-deg", i, this, i, &FGRidgeLift::get_probe_lat_deg );
+		_tiedProperties.Tie( "probe-lon-deg", i, this, i, &FGRidgeLift::get_probe_lon_deg );
 	}
 
 	for( int i = 0; i < 4; i++ ) {
-		prop = CreateIndexedPropertyName("/environment/ridge-lift/slope", i );
-		fgTie( prop.c_str(), this, i, &FGRidgeLift::get_slope); // read-only
+		_tiedProperties.Tie( "slope", i, this, i, &FGRidgeLift::get_slope );
 	}
 }
 
 void FGRidgeLift::unbind() {
-	string prop;
-
-	for( int i = 0; i < 5; i++ ) {
-
-		prop = CreateIndexedPropertyName("/environment/ridge-lift/probe-elev-m", i );
-		fgUntie( prop.c_str() );
-
-		prop = CreateIndexedPropertyName("/environment/ridge-lift/probe-lat-deg", i );
-		fgUntie( prop.c_str() );
-
-		prop = CreateIndexedPropertyName("/environment/ridge-lift/probe-lon-deg", i );
-		fgUntie( prop.c_str() );
-	}
-
-	for( int i = 0; i < 4; i++ ) {
-		prop = CreateIndexedPropertyName("/environment/ridge-lift/slope", i );
-		fgUntie( prop.c_str() );
-	}
+	_tiedProperties.Untie();
 }
 
 void FGRidgeLift::update(double dt) {
diff --git a/src/Environment/ridge_lift.hxx b/src/Environment/ridge_lift.hxx
index a5e97d620..642683c06 100644
--- a/src/Environment/ridge_lift.hxx
+++ b/src/Environment/ridge_lift.hxx
@@ -36,6 +36,7 @@
 #include <string>
 using std::string;
 
+#include <simgear/props/tiedpropertylist.hxx>
 
 class FGRidgeLift : public SGSubsystem {
 public:
@@ -80,6 +81,7 @@ private:
 	SGPropertyNode_ptr _user_latitude_node;
 	SGPropertyNode_ptr _ground_elev_node;
 
+	simgear::TiedPropertyList _tiedProperties;
 };
 
 #endif  // _FG_RidgeLift_HXX
-- 
2.39.5