Use a typedef for vector<Format const *>, which is what gets used

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

diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp
index 11ea996a26c7fba842f8f01e6162f21f50b58518..53a845563fdb3f62c80a3231ed2243b4a0df2136 100644 (file)
--- a/src/frontends/qt4/Menus.cpp
+++ b/src/frontends/qt4/Menus.cpp
@@ -319,8 +319,6 @@ public:
        ///
        size_t size() const { return items_.size(); }
        ///
-       MenuItem const & operator[](size_t) const;
-       ///
        const_iterator begin() const { return items_.begin(); }
        ///
        const_iterator end() const { return items_.end(); }
@@ -682,12 +680,6 @@ void MenuDefinition::read(Lexer & lex)
 }
 
 
-MenuItem const & MenuDefinition::operator[](size_type i) const
-{
-       return items_[i];
-}
-
-
 bool MenuDefinition::hasFunc(FuncRequest const & func) const
 {
        for (const_iterator it = begin(), et = end(); it != et; ++it)
@@ -1034,8 +1026,7 @@ void MenuDefinition::expandFormats(MenuItem::Kind const kind, Buffer const * buf
        if (!buf && kind != MenuItem::ImportFormats)
                return;
 
-       typedef vector<Format const *> Formats;
-       Formats formats;
+       FormatList formats;
        FuncCode action = LFUN_NOACTION;
 
        switch (kind) {
@@ -1059,7 +1050,6 @@ void MenuDefinition::expandFormats(MenuItem::Kind const kind, Buffer const * buf
                LATTEST(false);
                return;
        }
-       sort(formats.begin(), formats.end(), Format::formatSorter);
 
        bool const view_update = (kind == MenuItem::ViewFormats
                        || kind == MenuItem::UpdateFormats);
@@ -1959,6 +1949,7 @@ void Menus::Impl::macxMenuBarInit(QMenuBar * qmb)
                                             QString(), qMenu);
                action->setMenuRole(entries[i].role);
                qMenu->addAction(action);
+               ++i;
        }
 }