rename OBJECT_TAXI_SIGN to OBJECT_SIGN. This isn't about taxi signs any

more, but all sorts of signs. Now is the best time to get rid of a
misleading name.

diff --git a/simgear/scene/tgdb/apt_signs.cxx b/simgear/scene/tgdb/apt_signs.cxx
index ebd626d43d3ac8b9b385979159f1d371aafcb3a8..089369fb315b33b8b21ed0b7039135fad5939a2d 100644 (file)
--- a/simgear/scene/tgdb/apt_signs.cxx
+++ b/simgear/scene/tgdb/apt_signs.cxx
@@ -32,7 +32,7 @@
 
 #include "apt_signs.hxx"
 
-#define TAXI "OBJECT_TAXI_SIGN: "
+#define TAXI "OBJECT_SIGN: "
 #define RWY "OBJECT_RUNWAY_SIGN: "
 
 
@@ -87,8 +87,7 @@ struct pair {
 //
 // Example: {l}E|{L}[T]|{Y,ur}L|E{r}
 //
-ssgBranch *sgMakeTaxiSign( SGMaterialLib *matlib,
-                           const string path, const string content )
+ssgBranch *sgMakeSign(SGMaterialLib *matlib, const string path, const string content)
 {
     double sign_height = 1.0;  // meter
     bool lighted = true;

diff --git a/simgear/scene/tgdb/apt_signs.hxx b/simgear/scene/tgdb/apt_signs.hxx
index 743d7765462bf0737c4c60ecf83f9ff9b21fb06e..ba96d1609db83511e62f0332fe3f6578288cd2db 100644 (file)
--- a/simgear/scene/tgdb/apt_signs.hxx
+++ b/simgear/scene/tgdb/apt_signs.hxx
@@ -41,9 +41,9 @@ class SGMaterialLib;            // forward declaration
 SG_USING_STD(string);
 
 
-// Generate a taxi sign
-ssgBranch *sgMakeTaxiSign( SGMaterialLib *matlib,
-                           const string path, const string content );
+// Generate a generic sign
+ssgBranch *sgMakeSign( SGMaterialLib *matlib,
+                       const string path, const string content );
 
 
 // Generate a runway sign