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

[lyx.git] / src / ToolbarBackend.C

diff --git a/src/ToolbarBackend.C b/src/ToolbarBackend.C
index 8df7619d4362a8bf86dd40650ead1e14f1bb0b0d..0c339c454737cd2df072b96fad348038aa86a5cc 100644 (file)
--- a/src/ToolbarBackend.C
+++ b/src/ToolbarBackend.C
@@ -42,9 +42,9 @@ class ToolbarNamesEqual : public std::unary_function<ToolbarInfo, bool> {
 public:
        ToolbarNamesEqual(string const & name)
                : name_(name) {}
-       bool operator()(ToolbarInfo const & tb) const
+       bool operator()(ToolbarInfo const & tbinfo) const
        {
-               return tb.name == name_;
+               return tbinfo.name == name_;
        }
 private:
        string name_;
@@ -236,9 +236,9 @@ void ToolbarBackend::readToolbars(LyXLex & lex)
        while (lex.isOK() && !quit) {
                switch (lex.lex()) {
                case TO_TOOLBAR: {
-                       ToolbarInfo tb;
-                       tb.read(lex);
-                       toolbars.push_back(tb);
+                       ToolbarInfo tbinfo;
+                       tbinfo.read(lex);
+                       toolbars.push_back(tbinfo);
                        break;
                        }
                case TO_ENDTOOLBARSET: