Patch from Andy Ross:

[flightgear.git] / src / Navaids / mkrbeacons.hxx

diff --git a/src/Navaids/mkrbeacons.hxx b/src/Navaids/mkrbeacons.hxx
index fc8b62b1b9ce176a13d595332327ff5a6c67740a..619f88cea071081415389c618dac6784960a47a5 100644 (file)
--- a/src/Navaids/mkrbeacons.hxx
+++ b/src/Navaids/mkrbeacons.hxx
@@ -25,19 +25,23 @@
 #define _FG_MKRBEACON_HXX
 
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <simgear/compiler.h>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include <map>
 #include <vector>
 
 #include "nav.hxx"
 
-FG_USING_STD(map);
-FG_USING_STD(vector);
+SG_USING_STD(map);
+SG_USING_STD(vector);
 
 
-class FGBeacon {
+class FGMkrBeacon {
 
 public:
 
@@ -59,9 +63,9 @@ private:
 
 public:
 
-    FGBeacon();
-    FGBeacon( double _lon, double _lat, double _elev, fgMkrBeacType _type );
-    ~FGBeacon();
+    FGMkrBeacon();
+    FGMkrBeacon( double _lon, double _lat, double _elev, fgMkrBeacType _type );
+    ~FGMkrBeacon();
 
     inline double get_elev() const { return elev; }
     inline fgMkrBeacType get_type() const { return type; }
@@ -75,7 +79,7 @@ public:
 class FGMarkerBeacons {
 
     // convenience types
-    typedef vector < FGBeacon > beacon_list_type;
+    typedef vector < FGMkrBeacon > beacon_list_type;
     typedef beacon_list_type::iterator beacon_list_iterator;
     typedef beacon_list_type::const_iterator beacon_list_const_iterator;
 
@@ -86,7 +90,7 @@ class FGMarkerBeacons {
     beacon_map_type beacon_map;
 
     // real add a marker beacon
-    bool FGMarkerBeacons::real_add( const int master_index, const FGBeacon& b );
+    bool real_add( const int master_index, const FGMkrBeacon& b );
 
 public:
 
@@ -98,11 +102,11 @@ public:
 
     // add a marker beacon
     bool add( double lon, double lat, double elev,
-             FGBeacon::fgMkrBeacType type );
+             FGMkrBeacon::fgMkrBeacType type );
 
     // returns marker beacon type if we are over a marker beacon, NOBEACON
     // otherwise
-    FGBeacon::fgMkrBeacType query( double lon, double lat, double elev );
+    FGMkrBeacon::fgMkrBeacType query( double lon, double lat, double elev );
 };