Merge branch 'jmt/ref_ptr-conv'

[simgear.git] / simgear / scene / tgdb / apt_signs.hxx

diff --git a/simgear/scene/tgdb/apt_signs.hxx b/simgear/scene/tgdb/apt_signs.hxx
index 743d7765462bf0737c4c60ecf83f9ff9b21fb06e..8e3718a4d04be23613b25596732e016bf7b7da5e 100644 (file)
--- a/simgear/scene/tgdb/apt_signs.hxx
+++ b/simgear/scene/tgdb/apt_signs.hxx
@@ -32,23 +32,23 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
-#include <plib/ssg.h>          // plib include
+#include <osg/Node>
 
 class SGMaterialLib;            // forward declaration
 
-SG_USING_STD(string);
+using std::string;
 
 
-// Generate a taxi sign
-ssgBranch *sgMakeTaxiSign( SGMaterialLib *matlib,
-                           const string path, const string content );
+// Generate a generic sign
+osg::Node* SGMakeSign( SGMaterialLib *matlib,
+                       const string& path, const string& content );
 
 
 // Generate a runway sign
-ssgBranch *sgMakeRunwaySign( SGMaterialLib *matlib,
-                             const string path, const string name );
+osg::Node* SGMakeRunwaySign( SGMaterialLib *matlib,
+                             const string& path, const string& name );
 
 
 #endif // _SG_APT_SIGNS_HXX