]> git.mxchange.org Git - flightgear.git/commitdiff
accomodate changed getDisplayName interface in yasim::Hitch
authortimoore <timoore>
Wed, 15 Jul 2009 23:16:05 +0000 (23:16 +0000)
committerTim Moore <timoore@redhat.com>
Thu, 16 Jul 2009 10:10:47 +0000 (12:10 +0200)
src/FDM/YASim/Hitch.cpp
src/FDM/YASim/Hitch.hpp

index de39c4382bca056899e075a898f2aaffa9ca766f..df8b1f7cc0f7e55fd1ffdd3a1ee6df3dacc30183 100755 (executable)
@@ -224,12 +224,12 @@ void Hitch::setForceIsCalculatedByOther(bool b)
     _forceIsCalculatedByMaster=b;
 }
 
-const char *Hitch::getConnectedPropertyNode() const
+std::string Hitch::getConnectedPropertyNode() const
 {
     if (_towEndNode)
         return _towEndNode->getDisplayName();
     else
-        return 0;
+        return std::string("");
 }
 
 void Hitch::setConnectedPropertyNode(const char *nodename)
index d97fa9ae9be0761cb2b78d47bf03a55df7025057..45e9e7b840ec438ce847bcdf3d05be3aca46c1a2 100755 (executable)
@@ -1,6 +1,8 @@
 #ifndef _HITCH_HPP
 #define _HITCH_HPP
 
+#include <string>
+
 #include <Main/fg_props.hxx>
 
 namespace yasim {
@@ -48,7 +50,7 @@ public:
 
     void integrate (float dt);
 
-    const char *getConnectedPropertyNode() const;
+    std::string getConnectedPropertyNode() const;
     void setConnectedPropertyNode(const char *nodename);
 
 private: