Autopilot: clean up the helpers code (which drives the various /internal/) properties...

[flightgear.git] / src / GUI / menubar.hxx

diff --git a/src/GUI/menubar.hxx b/src/GUI/menubar.hxx
index 4d21903a580a778d9bdfb748f9c1ee298679c494..eab4b7ff8c6d939b700fe5d1a71e6615fb45d100 100644 (file)
--- a/src/GUI/menubar.hxx
+++ b/src/GUI/menubar.hxx
@@ -8,19 +8,20 @@
 #endif
 
 #include <simgear/compiler.h>  // for SG_USING_STD
+#include <Main/fg_props.hxx>
 
 #include <plib/pu.h>
 
 #include <map>
-SG_USING_STD(map);
+using std::map;
 
 #include <vector>
-SG_USING_STD(vector);
+using std::vector;
 
 
 class puMenuBar;
 class puObject;
-class FGBinding;
+class SGBinding;
 
 
 /**
@@ -123,7 +124,7 @@ private:
     puMenuBar * _menuBar;
 
     // A map of bindings for the menubar.
-    map<string,vector<FGBinding *> > _bindings;
+    map<string,vector<SGBinding *> > _bindings;
 
     // These are hoops that we have to jump through because PUI doesn't
     // do memory management for lists.  We have to allocate the arrays,