do what the FIXME suggested

[lyx.git] / src / frontends / qt4 / GuiPopupMenu.h

diff --git a/src/frontends/qt4/GuiPopupMenu.h b/src/frontends/qt4/GuiPopupMenu.h
index 903e3c4628e6762b152ebc916c606ea5a3bc9348..646fbdabac28cbbbd2d671592b406586c4759cff 100644 (file)
--- a/src/frontends/qt4/GuiPopupMenu.h
+++ b/src/frontends/qt4/GuiPopupMenu.h
@@ -9,8 +9,8 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef QLPOPUPMENU_H
-#define QLPOPUPMENU_H
+#ifndef GUIPOPUPMENU_H
+#define GUIPOPUPMENU_H
 
 #include <QMenu>
 
@@ -20,14 +20,16 @@
 namespace lyx {
 namespace frontend {
 
-class GuiMenubar;
+class GuiView;
 
 /// a submenu
-class GuiPopupMenu : public QMenu {
+class GuiPopupMenu : public QMenu
+{
        Q_OBJECT
 public:
-
-       GuiPopupMenu(GuiMenubar * owner, MenuItem const & mi, bool topLevelMenu=false);
+       ///
+       GuiPopupMenu(GuiView * owner, MenuItem const & mi,
+               bool topLevelMenu = false);
 
        /// populates the menu or one of its submenu
        /// This is used as a recursive function
@@ -35,23 +37,16 @@ public:
 
 public Q_SLOTS:
        /// populate the toplevel menu and all children
-       void update();
-
-private:
-
-       /// our owning menubar
-       GuiMenubar * owner_;
-
-       /// the name of this menu
-       docstring name_;
+       void updateView();
 
 private:
        /// Get a Menu item label from the menu backend
        docstring const getLabel(MenuItem const & mi);
 
-       /// add binding keys a the menu item label.
-       void addBinding(docstring & label, MenuItem const & mi);
-
+       /// our owning view
+       GuiView * owner_;
+       /// the name of this menu
+       docstring name_;
        /// Top Level Menu
        Menu topLevelMenu_;
 };
@@ -59,4 +54,4 @@ private:
 } // namespace frontend
 } // namespace lyx
 
-#endif // QLPOPUPMENU_H
+#endif // GUIPOPUPMENU_H