Replace LString.h with support/std_string.h,

[features.git] / src / frontends / qt2 / QLPopupMenu.h

diff --git a/src/frontends/qt2/QLPopupMenu.h b/src/frontends/qt2/QLPopupMenu.h
index 3a0726f95731dc20128d5d4cd1d40fee649b9267..3438992bb29949fb2dff079d249136a31a664842 100644 (file)
--- a/src/frontends/qt2/QLPopupMenu.h
+++ b/src/frontends/qt2/QLPopupMenu.h
@@ -6,51 +6,46 @@
  *
  * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef QLPOPUPMENU_H
 #define QLPOPUPMENU_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "Menubar_pimpl.h"
 
 #include <qpopupmenu.h>
 
-#include "LString.h"
+#include "support/std_string.h"
+
+#include <map>
 
 class MenuBackend;
 class MenuItem;
 class Menu;
 class QMenuData;
+class QLMenubar;
 class QLPopupMenu;
 
 /// create a sub-menu
 std::pair<int, QLPopupMenu *>
-       createMenu(QMenuData * parent, MenuItem const * item, Menubar::Pimpl * owner, bool is_toplevel = false);
+createMenu(QMenuData * parent, MenuItem const * item,
+          QLMenubar * owner, bool is_toplevel = false);
 
 /// a submenu
 class QLPopupMenu : public QPopupMenu {
        Q_OBJECT
 public:
-       QLPopupMenu(Menubar::Pimpl * owner, string const & name, bool toplevel);
+       QLPopupMenu(QLMenubar * owner,
+                   string const & name, bool toplevel);
 
        /// populate the menu
        void populate(Menu * menu);
-
 public slots:
        /// populate the toplevel menu and all children
        void showing();
-
 private:
-       /// return true if the given submenu is disabled
-       bool disabled(Menu * menu);
-
        /// our owning menubar
-       Menubar::Pimpl * owner_;
+       QLMenubar * owner_;
 
        /// the name of this menu
        string name_;