commit 37f8efe9f744dc732039b50d0de90acb3384de2d
Author: Richard Heck <[email protected]>
Date: Sat Dec 16 00:55:45 2017 -0500
Fix #10891 compiler warnings.
---
src/frontends/qt4/Toolbars.cpp | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/frontends/qt4/Toolbars.cpp b/src/frontends/qt4/Toolbars.cpp
index 2c0d2ab..35bf16e 100644
--- a/src/frontends/qt4/Toolbars.cpp
+++ b/src/frontends/qt4/Toolbars.cpp
@@ -148,28 +148,28 @@ ToolbarInfo & ToolbarInfo::read(Lexer & lex)
case TO_POPUPMENU:
if (lex.next(true)) {
- string const name = lex.getString();
+ string const pname = lex.getString();
lex.next(true);
docstring const label = lex.getDocString();
- add(ToolbarItem(ToolbarItem::POPUPMENU, name,
label));
+ add(ToolbarItem(ToolbarItem::POPUPMENU, pname,
label));
}
break;
case TO_STICKYPOPUPMENU:
if (lex.next(true)) {
- string const name = lex.getString();
+ string const pname = lex.getString();
lex.next(true);
docstring const label = lex.getDocString();
- add(ToolbarItem(ToolbarItem::STICKYPOPUPMENU,
name, label));
+ add(ToolbarItem(ToolbarItem::STICKYPOPUPMENU,
pname, label));
}
break;
case TO_ICONPALETTE:
if (lex.next(true)) {
- string const name = lex.getString();
+ string const pname = lex.getString();
lex.next(true);
docstring const label = lex.getDocString();
- add(ToolbarItem(ToolbarItem::ICONPALETTE, name,
label));
+ add(ToolbarItem(ToolbarItem::ICONPALETTE,
pname, label));
}
break;