enable Font cache only for MacOSX and inline width() for other platform.

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

diff --git a/src/frontends/qt4/QLPopupMenu.h b/src/frontends/qt4/QLPopupMenu.h
index cf8b2193448b1617634f95c20f763ca81a82d47e..4c4fed5623678f56c4de1cd4497062408c7f86eb 100644 (file)
--- a/src/frontends/qt4/QLPopupMenu.h
+++ b/src/frontends/qt4/QLPopupMenu.h
@@ -17,9 +17,6 @@
 #include "funcrequest.h"
 #include "MenuBackend.h"
 
-#include <utility>
-#include <string>
-
 namespace lyx {
 namespace frontend {
 
@@ -31,12 +28,12 @@ class QLPopupMenu : public QMenu {
 public:
 
        QLPopupMenu(QLMenubar * owner, MenuItem const & mi, bool topLevelMenu=false);
- 
+
        /// populates the menu or one of its submenu
        /// This is used as a recursive function
        void populate(QMenu* qMenu, Menu * menu);
 
-public slots:
+public Q_SLOTS:
        /// populate the toplevel menu and all children
        void update();
 
@@ -46,22 +43,22 @@ private:
        QLMenubar * owner_;
 
        /// the name of this menu
-       std::string name_;
+       lyx::docstring name_;
 
-private:       
+private:
        /// Get a Menu item label from the menu backend
-       std::string const getLabel(MenuItem const & mi);
+       lyx::docstring const getLabel(MenuItem const & mi);
 
        /// add binding keys a the menu item label.
        /// \todo Mac specific binding handling.
-       void addBinding(std::string & label, MenuItem const & mi);
+       void addBinding(lyx::docstring & label, MenuItem const & mi);
 
        /// Top Level Menu
        Menu topLevelMenu_;
-\r
-       /// Mac specific menu hack\r
-       /// \todo Fix it\r
-       void specialMacXmenuHack();\r
+
+       /// Mac specific menu hack
+       /// \todo Fix it
+       void specialMacXmenuHack();
 };
 
 } // namespace frontend