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 747091260562f7e89395e02db0106ff392b2b6e1..bde5fbb48b2f6c2a2d966ae3ea11062e4e255f35 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -54,7 +54,6 @@ using support::compare_ascii_no_case;
 using support::contains;
 using support::makeDisplayPath;
 using support::token;
-using support::uppercase;
 
 using boost::bind;
 
@@ -145,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;
@@ -788,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)));