zlib stuff

[lyx.git] / src / MenuBackend.C

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index 9eb756c7f8527726690294299aa85fa1cf8cea57..52e557a8ee90b6f9cade2600aae6a19ef1c9040e 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -325,7 +325,7 @@ Menu & Menu::read(LyXLex & lex)
 void Menu::checkShortcuts() const
 {
        // This is a quadratic algorithm, but we do not care because
-       // it is used for debugging only.
+       // menus are short enough
        for (const_iterator it1 = begin(); it1 != end(); ++it1) {
                string shortcut = it1->shortcut();
                if (shortcut.empty())
@@ -334,7 +334,7 @@ void Menu::checkShortcuts() const
                        lyxerr << "Menu warning: menu entry \""
                               << it1->label()
                               << "\" does not contain shortcut `"
-                              << shortcut << '\'' << endl;
+                              << shortcut << "'." << endl;
                for (const_iterator it2 = begin(); it2 != it1 ; ++it2) {
                        if (!compare_ascii_no_case(it2->shortcut(), shortcut)) {
                                lyxerr << "Menu warning: menu entries "
@@ -521,12 +521,14 @@ void expandFloatInsert(Menu & tomenu, LyXView const * view)
 
 Menu::size_type const max_number_of_items = 25;
 
-void expandToc2(Menu & tomenu, toc::Toc const & toc_list,
-               toc::Toc::size_type from, toc::Toc::size_type to, int depth)
+void expandToc2(Menu & tomenu,
+               lyx::toc::Toc const & toc_list,
+               lyx::toc::Toc::size_type from,
+               lyx::toc::Toc::size_type to, int depth)
 {
        int shortcut_count = 0;
        if (to - from <= max_number_of_items) {
-               for (toc::Toc::size_type i = from; i < to; ++i) {
+               for (lyx::toc::Toc::size_type i = from; i < to; ++i) {
                        int const action = toc_list[i].action();
                        string label(4 * max(0, toc_list[i].depth - depth),' ');
                        label += limit_string_length(toc_list[i].str);
@@ -537,9 +539,9 @@ void expandToc2(Menu & tomenu, toc::Toc const & toc_list,
                        tomenu.add(MenuItem(MenuItem::Command, label, action));
                }
        } else {
-               toc::Toc::size_type pos = from;
+               lyx::toc::Toc::size_type pos = from;
                while (pos < to) {
-                       toc::Toc::size_type new_pos = pos + 1;
+                       lyx::toc::Toc::size_type new_pos = pos + 1;
                        while (new_pos < to &&
                               toc_list[new_pos].depth > depth)
                                ++new_pos;
@@ -581,9 +583,9 @@ void expandToc(Menu & tomenu, LyXView const * view)
                return;
        }
 
-       toc::TocList toc_list = toc::getTocList(view->buffer());
-       toc::TocList::const_iterator cit = toc_list.begin();
-       toc::TocList::const_iterator end = toc_list.end();
+       lyx::toc::TocList toc_list = lyx::toc::getTocList(view->buffer());
+       lyx::toc::TocList::const_iterator cit = toc_list.begin();
+       lyx::toc::TocList::const_iterator end = toc_list.end();
        for (; cit != end; ++cit) {
                // Handle this later
                if (cit->first == "TOC")
@@ -591,8 +593,8 @@ void expandToc(Menu & tomenu, LyXView const * view)
 
                // All the rest is for floats
                Menu * menu = new Menu;
-               toc::Toc::const_iterator ccit = cit->second.begin();
-               toc::Toc::const_iterator eend = cit->second.end();
+               lyx::toc::Toc::const_iterator ccit = cit->second.begin();
+               lyx::toc::Toc::const_iterator eend = cit->second.end();
                for (; ccit != eend; ++ccit) {
                        string const label = limit_string_length(ccit->str);
                        menu->add(MenuItem(MenuItem::Command,
@@ -693,8 +695,7 @@ void MenuBackend::expand(Menu const & frommenu, Menu & tomenu,
                tomenu.items_.pop_back();
 
        // Check whether the shortcuts are unique
-       if (lyxerr.debugging(Debug::GUI))
-               tomenu.checkShortcuts();
+       tomenu.checkShortcuts();
 }