GuiToolbar::GuiToolbar(ToolbarInfo const & tbinfo, GuiView & owner)
- : QToolBar(qt_(tbinfo.gui_name), &owner), visibility_(0),
+ : QToolBar(toqstr(tbinfo.gui_name), &owner), visibility_(0),
allowauto_(false), owner_(owner), layout_(0), command_buffer_(0),
tbinfo_(tbinfo), filled_(false)
{
Toolbars::Infos::const_iterator cit = guiApp->toolbars().begin();
Toolbars::Infos::const_iterator end = guiApp->toolbars().end();
for (; cit != end; ++cit) {
- MenuItem const item(MenuItem::Command, qt_(cit->gui_name),
+ MenuItem const item(MenuItem::Command, toqstr(cit->gui_name),
FuncRequest(LFUN_TOOLBAR_TOGGLE, cit->name));
if (guiApp->toolbars().isMainToolbar(cit->name))
add(item);
name = lex.getString();
lex.next(true);
- gui_name = fromqstr(qt_(lex.getString()));
+ gui_name = _(lex.getString());
// FIXME what to do here?
if (!lex) {
if (visibility >= MATH) {
if (ToolbarInfo const * ti = info(name))
const_cast<ToolbarInfo *>(ti)->gui_name +=
- fromqstr(" (" + qt_("auto") + ")");
+ " (" + _("auto") + ")";
}
}
}
/// toolbar name
std::string name;
/// toolbar GUI name
- std::string gui_name;
+ docstring gui_name;
/// toolbar contents
Items items;