[Patch] Small QLPopupMenu cleanup

[Abdelrazak Younes]

Index: D:/msys/home/yns/lyx/trunk/src/frontends/qt4/ChangeLog
===================================================================
--- D:/msys/home/yns/lyx/trunk/src/frontends/qt4/ChangeLog      (revision 13371)
+++ D:/msys/home/yns/lyx/trunk/src/frontends/qt4/ChangeLog      (working copy)
@@ -1,3 +1,11 @@
+2006-03-15  Abdelrazak Younes  <[EMAIL PROTECTED]>
+
+       * QLPopupMenu.[Ch]: renamed topLevelMenu to topLevelMenu_
+
+2006-03-15  Abdelrazak Younes  <[EMAIL PROTECTED]>
+
+       * QLMenubar.C: MACX menubar initialisation crash fix
+
 2006-03-14  Abdelrazak Younes  <[EMAIL PROTECTED]>
 
        * QWorkArea.[Ch]: Wheel one-liner mouse fix
Index: D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QLPopupMenu.C
===================================================================
--- D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QLPopupMenu.C  (revision 13371)
+++ D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QLPopupMenu.C  (working copy)
@@ -52,7 +52,7 @@
 
 QLPopupMenu::QLPopupMenu(QLMenubar * owner, 
                                                 MenuItem const & mi, bool 
topLevelMenu)
-       : owner_(owner), topLevelMenu_(topLevelMenu)
+       : owner_(owner)
 {
        name_ = mi.submenuname();
 
@@ -70,18 +70,18 @@
        lyxerr[Debug::GUI] << "\tTriggered menu: " << name_ << endl;
 
        clear();
-       topLevelMenu.clear();
+       topLevelMenu_.clear();
 
        if (name_.empty())
                return;
 
        Menu const & fromLyxMenu = owner_->backend().getMenu(name_);
-       owner_->backend().expand(fromLyxMenu, topLevelMenu, owner_->view());
+       owner_->backend().expand(fromLyxMenu, topLevelMenu_, owner_->view());
        
-       if (!owner_->backend().hasMenu(topLevelMenu.name())) {
-               lyxerr[Debug::GUI] << "\tWARNING: menu seems empty" << 
topLevelMenu.name() << endl;
+       if (!owner_->backend().hasMenu(topLevelMenu_.name())) {
+               lyxerr[Debug::GUI] << "\tWARNING: menu seems empty" << 
topLevelMenu_.name() << endl;
        }
-       populate(this, &topLevelMenu);
+       populate(this, &topLevelMenu_);
 
        specialMacXmenuHack();
 }
Index: D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QLPopupMenu.h
===================================================================
--- D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QLPopupMenu.h  (revision 13369)
+++ D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QLPopupMenu.h  (working copy)
@@ -56,14 +56,12 @@
        /// \todo Mac specific binding handling.
        void addBinding(std::string & label, MenuItem const & mi);
 
-       bool topLevelMenu_;
-
-       /// Mac specific menu hack
-       /// \todo Fix it
-       void specialMacXmenuHack();
-
        /// Top Level Menu
-       Menu topLevelMenu;
+       Menu topLevelMenu_;
+
+       /// Mac specific menu hack
+       /// \todo Fix it
+       void specialMacXmenuHack();
 };
 
 } // namespace frontend