Fix bug 2474; partial fix for 1777. Added last_reference_ member to QRef class and...

[lyx.git] / src / MenuBackend.C

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index 5419f6d8b718fb8ffa923724cd6e2073d18e3481..bde5fbb48b2f6c2a2d966ae3ea11062e4e255f35 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -50,12 +50,10 @@
 
 namespace lyx {
 
-using support::compare_no_case;
 using support::compare_ascii_no_case;
 using support::contains;
 using support::makeDisplayPath;
 using support::token;
-using support::uppercase;
 
 using boost::bind;
 
@@ -146,7 +144,7 @@ docstring const MenuItem::binding(bool forgui) const
        if (bindings.size()) {
                return bindings.begin()->print(forgui);
        } else {
-               lyxerr[Debug::KBMAP]
+               LYXERR(Debug::KBMAP)
                        << "No binding for "
                        << lyxaction.getActionName(func_.action)
                        << '(' << to_utf8(func_.argument()) << ')' << endl;
@@ -401,7 +399,7 @@ void Menu::checkShortcuts() const
                               << "\" does not contain shortcut `"
                               << to_utf8(shortcut) << "'." << endl;
                for (const_iterator it2 = begin(); it2 != it1 ; ++it2) {
-                       if (!compare_no_case(it2->shortcut(), shortcut)) {
+                       if (!compare_ascii_no_case(it2->shortcut(), shortcut)) {
                                lyxerr << "Menu warning: menu entries "
                                       << '"' << to_utf8(it1->fulllabel())
                                       << "\" and \"" << to_utf8(it2->fulllabel())
@@ -789,7 +787,7 @@ void expandToolbars(Menu & tomenu)
                // and 
                //              review (auto)
                // in the case of auto.
-               if (cit->flags & ToolbarBackend::AUTO)
+               if (cit->flags & ToolbarInfo::AUTO)
                        label += _(" (auto)");
                tomenu.add(MenuItem(MenuItem::Command, label,
                                    FuncRequest(LFUN_TOOLBAR_TOGGLE_STATE, cit->name)));