Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

[lyx.git] / src / frontends / qt4 / Menus.cpp

diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp
index 982909068feb1ef54d8f5a06d100c2f7b27ba484..1a91ca82a1c1abb2323166b661c122859be9cc7a 100644 (file)
--- a/src/frontends/qt4/Menus.cpp
+++ b/src/frontends/qt4/Menus.cpp
@@ -58,6 +58,8 @@
 #include <QMenuBar>
 #include <QString>
 
+#include <boost/shared_ptr.hpp>
+
 #include <algorithm>
 #include <ostream>
 #include <vector>
@@ -200,7 +202,7 @@ public:
        /// set the description of the  submenu
        void submenuname(QString const & name) { submenuname_ = name; }
        ///
-       bool hasSubmenu() const { return submenu_.isEmpty(); }
+       bool hasSubmenu() const { return !submenu_.isEmpty(); }
        ///
        MenuDefinition const & submenu() const { return submenu_.at(0); }
        MenuDefinition & submenu() { return submenu_[0]; }
@@ -912,9 +914,7 @@ void MenuDefinition::expandToc(Buffer const * buf)
                else if (cit->first == "child") {
                        label = qt_("Child Documents");
                        in_other_list = false;
-               } else if (cit->first == "embedded")
-                       label = qt_("Embedded Files");
-               else if (cit->first == "graphics")
+               } else if (cit->first == "graphics")
                        label = qt_("List of Graphics");
                else if (cit->first == "equation")
                        label = qt_("List of Equations");
@@ -1128,7 +1128,7 @@ void Menu::Impl::populate(QMenu & qMenu, MenuDefinition const & menu)
 /////////////////////////////////////////////////////////////////////
 
 Menu::Menu(GuiView * gv, QString const & name, bool top_level)
-: d(new Menu::Impl)
+: QMenu(gv), d(new Menu::Impl)
 {
        d->top_level_menu = top_level? new MenuDefinition : 0;
        d->view = gv;
@@ -1187,7 +1187,7 @@ struct Menus::Impl {
        ///
        MenuDefinition menubar_;
 
-       typedef QMap<GuiView *, QHash<QString, Menu *> > NameMap;
+       typedef QMap<GuiView *, QHash<QString, Menu*> > NameMap;
 
        /// name to menu for \c menu() method.
        NameMap name_map_;
@@ -1400,6 +1400,10 @@ MenuDefinition & Menus::Impl::getMenu(QString const & name)
 
 Menus::Menus() : d(new Impl) {}
 
+Menus::~Menus()
+{
+  delete d;
+}
 
 void Menus::read(Lexer & lex)
 {