final cosmetics (s/_entries/_objects/ and comments)

diff --git a/src/GUI/menubar.cxx b/src/GUI/menubar.cxx
index 6b229b5101259c88166e152d04293d0db40577ca..285fc5eb4d3200d436013253a13fd77207dc5ed9 100644 (file)
--- a/src/GUI/menubar.cxx
+++ b/src/GUI/menubar.cxx
@@ -351,27 +351,6 @@ FGMenuBar::destroy_menubar ()
     SG_LOG(SG_GENERAL, SG_INFO, "Done.");
 }
 
-struct EnabledListener : SGPropertyChangeListener {
-    void valueChanged(SGPropertyNode* node) {
-        NewGUI * gui = (NewGUI *)globals->get_subsystem("gui");
-        if (!gui)
-            return;
-        FGMenuBar *menubar = gui->getMenuBar();
-        if (menubar)
-            menubar->enable_item(node->getParent(), node->getBoolValue());
-    }
-};
-
-void
-FGMenuBar::add_enabled_listener(SGPropertyNode * node)
-{
-    if (!node->hasValue("enabled"))
-        node->setBoolValue("enabled", true);
-
-    enable_item(node, node->getBoolValue("enabled"));
-    node->getNode("enabled")->addChangeListener(new EnabledListener());
-}
-
 void
 FGMenuBar::make_map(SGPropertyNode * node)
 {
@@ -391,7 +370,7 @@ FGMenuBar::make_map(SGPropertyNode * node)
             continue;
         }
 
-        _entries[menu->getPath()] = obj;
+        _objects[menu->getPath()] = obj;
         add_enabled_listener(menu);
 
         puGroup *popup = (puGroup *)obj->getUserData();
@@ -399,7 +378,7 @@ FGMenuBar::make_map(SGPropertyNode * node)
             continue;
 
         // the entries are for some reason reversed (last first), and we
-        // don't know yet how many will be usable; so we collect first
+        // don't know yet how many there will be; so we collect first
         vector<puObject *> e;
         for (puObject *me = popup->getFirstChild(); me; me = me->getNextObject())
             e.push_back(me);
@@ -411,22 +390,43 @@ FGMenuBar::make_map(SGPropertyNode * node)
                         << menu->getPath() << "/item[" << i << ']');
                 continue;
             }
-            _entries[item->getPath()] = e[i];
+            _objects[item->getPath()] = e[i];
             add_enabled_listener(item);
         }
         menu_index++;
     }
 }
 
+struct EnabledListener : SGPropertyChangeListener {
+    void valueChanged(SGPropertyNode *node) {
+        NewGUI * gui = (NewGUI *)globals->get_subsystem("gui");
+        if (!gui)
+            return;
+        FGMenuBar *menubar = gui->getMenuBar();
+        if (menubar)
+            menubar->enable_item(node->getParent(), node->getBoolValue());
+    }
+};
+
+void
+FGMenuBar::add_enabled_listener(SGPropertyNode * node)
+{
+    if (!node->hasValue("enabled"))
+        node->setBoolValue("enabled", true);
+
+    enable_item(node, node->getBoolValue("enabled"));
+    node->getNode("enabled")->addChangeListener(new EnabledListener());
+}
+
 bool
 FGMenuBar::enable_item(const SGPropertyNode * node, bool state)
 {
-    if (!node || _entries.find(node->getPath()) == _entries.end()) {
+    if (!node || _objects.find(node->getPath()) == _objects.end()) {
         SG_LOG(SG_GENERAL, SG_WARN, "Trying to enable/disable "
             "non-existent menu item");
         return false;
     }
-    puObject *object = _entries[node->getPath()];
+    puObject *object = _objects[node->getPath()];
     if (state)
         object->activate();
     else

diff --git a/src/GUI/menubar.hxx b/src/GUI/menubar.hxx
index a22a77f58433fc91b44840b40581c8ffae24046b..f50222b4ff15fc282b89a3653d7985ad78eaba3e 100644 (file)
--- a/src/GUI/menubar.hxx
+++ b/src/GUI/menubar.hxx
@@ -95,6 +95,7 @@ public:
      */
     void destroy_menubar ();
 
+
     /**
      * Disable/enable menu titles and entries
      */
@@ -133,7 +134,8 @@ private:
     vector<char **> _char_arrays;
     vector<puCallback *> _callback_arrays;
 
-    map<string, puObject *> _entries;
+    // A map for {menu node path}->puObject translation.
+    map<string, puObject *> _objects;
 };
 
 #endif // __MENUBAR_HXX