Merge branch 'next' into durk-atc

[flightgear.git] / src / Environment / environment_ctrl.cxx

diff --git a/src/Environment/environment_ctrl.cxx b/src/Environment/environment_ctrl.cxx
index 48b71dfee7691307d18b872ce783fdcc445e05ac..c182f06250cf250e62993e3b77f726c02e9b3992 100644 (file)
--- a/src/Environment/environment_ctrl.cxx
+++ b/src/Environment/environment_ctrl.cxx
@@ -123,7 +123,7 @@ private:
     LayerTable _aloft_table;
 
     FGEnvironment _environment;
-    TiedPropertyList _tiedProperties;
+    simgear::TiedPropertyList _tiedProperties;
 };
 
 //////////////////////////////////////////////////////////////////////////////
@@ -193,9 +193,9 @@ void LayerTable::Bind()
     // tie all environments to ~/entry[n]/xxx
     // register this as a changelistener of ~/entry[n]/pressure-sea-level-inhg
     for( unsigned i = 0; i < size(); i++ ) {
-        SGPropertyNode_ptr baseNode = _rootNode->getChild("entry", i, true );\r
-        at(i)->environment.Tie( baseNode );\r
-        baseNode->getNode( "pressure-sea-level-inhg", true )->addChangeListener( this );\r
+        SGPropertyNode_ptr baseNode = _rootNode->getChild("entry", i, true );
+        at(i)->environment.Tie( baseNode );
+        baseNode->getNode( "pressure-sea-level-inhg", true )->addChangeListener( this );
     }
 }
 
@@ -204,9 +204,9 @@ void LayerTable::Unbind()
     // untie all environments to ~/entry[n]/xxx
     // deregister this as a changelistener of ~/entry[n]/pressure-sea-level-inhg
     for( unsigned i = 0; i < size(); i++ ) {
-        SGPropertyNode_ptr baseNode = _rootNode->getChild("entry", i, true );\r
+        SGPropertyNode_ptr baseNode = _rootNode->getChild("entry", i, true );
         at(i)->environment.Untie();
-        baseNode->getNode( "pressure-sea-level-inhg", true )->removeChangeListener( this );\r
+        baseNode->getNode( "pressure-sea-level-inhg", true )->removeChangeListener( this );
     }
 }