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 e591b8bd372bc210cbfea5db769c1018cf65264d..1a91ca82a1c1abb2323166b661c122859be9cc7a 100644 (file)
--- a/src/frontends/qt4/Menus.cpp
+++ b/src/frontends/qt4/Menus.cpp
@@ -202,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]; }
@@ -914,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");
@@ -1130,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;
@@ -1189,7 +1187,7 @@ struct Menus::Impl {
        ///
        MenuDefinition menubar_;
 
-       typedef QMap<GuiView *, QHash<QString, boost::shared_ptr<Menu> > > NameMap;
+       typedef QMap<GuiView *, QHash<QString, Menu*> > NameMap;
 
        /// name to menu for \c menu() method.
        NameMap name_map_;
@@ -1519,7 +1517,7 @@ void Menus::fillMenuBar(QMenuBar * qmb, GuiView * view, bool initial)
                menu->setTitle(label(*m));
                qmb->addMenu(menu);
 
-               d->name_map_[view][name] = boost::shared_ptr<Menu>(menu);
+               d->name_map_[view][name] = menu;
        }
 }
 
@@ -1554,14 +1552,14 @@ void Menus::updateMenu(Menu * qmenu)
 Menu * Menus::menu(QString const & name, GuiView & view)
 {
        LYXERR(Debug::GUI, "Context menu requested: " << fromqstr(name));
-       Menu * menu = d->name_map_[&view].value(name, boost::shared_ptr<Menu>()).get();
+       Menu * menu = d->name_map_[&view].value(name, 0);
        if (!menu && !name.startsWith("context-")) {
                LYXERR0("requested context menu not found: " << fromqstr(name));
                return 0;
        }
 
        menu = new Menu(&view, name, true);
-       d->name_map_[&view][name] = boost::shared_ptr<Menu>(menu);
+       d->name_map_[&view][name] = menu;
        return menu;
 }