rename LFUN enum values according to their command (as used in th minibuffer/bind...

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

diff --git a/src/frontends/qt4/QLMenubar.h b/src/frontends/qt4/QLMenubar.h
index 5c978aff0fa8ffd5f394ff4a4c08e93b5da20646..4841c644aaf51ba821f4a671667095c655fd9b04 100644 (file)
--- a/src/frontends/qt4/QLMenubar.h
+++ b/src/frontends/qt4/QLMenubar.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file qt2/QLMenubar.h
+ * \file qt4/QLMenubar.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -16,11 +16,13 @@
 #include "frontends/Menubar.h"
 
 #include <map>
+#include <boost/scoped_ptr.hpp>
 
 #include <QObject>
+#include <QMenuBar>
+
+#include "QLPopupMenu.h"
 
-class QMenuBar;
-class QMenu;
 class LyXView;
 class MenuBackend;
 class Menu;
@@ -59,7 +61,7 @@ public slots:
 
 private:
        /// Initialize specific MACOS X menubar
-       void QLMenubar::macxMenuBarInit();
+       void macxMenuBarInit();
 
        /// owning view
        QtView * owner_;
@@ -67,14 +69,13 @@ private:
        /// menu controller
        MenuBackend & menubackend_;
 
-       typedef std::map<std::string, QMenu *> NameMap;
+       typedef std::map<std::string, QLPopupMenu *> NameMap;
 
        /// name to menu for openByName
        NameMap name_map_;
 
-#ifdef Q_WS_MACX
-       boost::scoped_ptr<QMenuBar> menubar_;
-#endif
+       /// MACOS X special menubar.
+       boost::scoped_ptr<QMenuBar> mac_menubar_;
 };
 
 } // namespace frontend