Merge branch 'maint' into next

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

diff --git a/src/Navaids/markerbeacon.hxx b/src/Navaids/markerbeacon.hxx
index 198959c5970a363b29777f3cc4303c9400aaa6c9..c1c458ce4eb5146b24a48d8706045859ded5445e 100644 (file)
--- a/src/Navaids/markerbeacon.hxx
+++ b/src/Navaids/markerbeacon.hxx
@@ -31,13 +31,13 @@
 // forward decls
 class FGRunway;
 
-class FGMarkerBeacon : public FGPositioned
+class FGMarkerBeaconRecord : public FGPositioned
 {
 public:
-  static FGMarkerBeacon* create(int aTy, const std::string& aName, const SGGeod& aPos);
+  static FGMarkerBeaconRecord* create(int aTy, const std::string& aName, const SGGeod& aPos);
 
 private:
-  FGMarkerBeacon(Type aTy, FGRunway* aRunway, const SGGeod& aPos);
+  FGMarkerBeaconRecord(Type aTy, FGRunway* aRunway, const SGGeod& aPos);
   
   FGRunway* _runway; // should this be ref-ptr?