X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FGUI%2Fmenubar.hxx;h=eab4b7ff8c6d939b700fe5d1a71e6615fb45d100;hb=5cad5aa7da2476ca8323a61f81dea59676dca085;hp=f50222b4ff15fc282b89a3653d7985ad78eaba3e;hpb=688bcb579fceb155b79a0b24596bebbcdf629e2e;p=flightgear.git diff --git a/src/GUI/menubar.hxx b/src/GUI/menubar.hxx index f50222b4f..eab4b7ff8 100644 --- a/src/GUI/menubar.hxx +++ b/src/GUI/menubar.hxx @@ -8,19 +8,20 @@ #endif #include // for SG_USING_STD +#include
#include #include -SG_USING_STD(map); +using std::map; #include -SG_USING_STD(vector); +using std::vector; class puMenuBar; class puObject; -class FGBinding; +class SGBinding; /** @@ -111,7 +112,7 @@ private: void make_menubar (); // Create a property-path -> puObject map for menu node - void make_map(SGPropertyNode * node); + void make_object_map(SGPropertyNode * node); // Add listener that enables/disables menu entries. void add_enabled_listener(SGPropertyNode * node); @@ -123,7 +124,7 @@ private: puMenuBar * _menuBar; // A map of bindings for the menubar. - map > _bindings; + map > _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,