Cleanup: remove trailing underscores

These ToobarItem members are public, not private.

diff --git a/src/frontends/qt/GuiToolbar.cpp b/src/frontends/qt/GuiToolbar.cpp
index fbd24b4176e6d4057273c1122ab56937303308af..4b3ebf47489560dbca5fc77d8cbe4fde8bf30fa6 100644 (file)
--- a/src/frontends/qt/GuiToolbar.cpp
+++ b/src/frontends/qt/GuiToolbar.cpp
@@ -121,17 +121,17 @@ void GuiToolbar::setVisibility(int visibility)
 
 Action * GuiToolbar::addItem(ToolbarItem const & item)
 {
-       QString text = toqstr(item.label_);
+       QString text = toqstr(item.label);
        // Get the keys bound to this action, but keep only the
        // first one later
-       KeyMap::Bindings bindings = theTopLevelKeymap().findBindings(*item.func_);
+       KeyMap::Bindings bindings = theTopLevelKeymap().findBindings(*item.func);
        if (!bindings.empty())
                text += " [" + toqstr(bindings.begin()->print(KeySequence::ForGui)) + "]";
 
-       Action * act = new Action(item.func_, getIcon(*item.func_, false), text,
+       Action * act = new Action(item.func, getIcon(*item.func, false), text,
                                                          text, this);
-       if (item.type_ == ToolbarItem::BIDICOMMAND)
-               act->setRtlIcon(getIcon(*item.func_, false, true));
+       if (item.type == ToolbarItem::BIDICOMMAND)
+               act->setRtlIcon(getIcon(*item.func, false, true));
 
        actions_.append(act);
        return act;
@@ -149,17 +149,17 @@ public:
        PaletteButton(GuiToolbar * bar, ToolbarItem const & item)
                : QToolButton(bar), bar_(bar), tbitem_(item), initialized_(false)
        {
-               QString const label = qt_(to_ascii(tbitem_.label_));
+               QString const label = qt_(to_ascii(tbitem_.label));
                setToolTip(label);
                setStatusTip(label);
                setText(label);
                connect(bar_, SIGNAL(iconSizeChanged(QSize)),
                        this, SLOT(setIconSize(QSize)));
                setCheckable(true);
-               ToolbarInfo const * tbinfo = guiApp->toolbars().info(tbitem_.name_);
+               ToolbarInfo const * tbinfo = guiApp->toolbars().info(tbitem_.name);
                if (tbinfo)
                        // use the icon of first action for the toolbar button
-                       setIcon(getIcon(*tbinfo->items.begin()->func_, true));
+                       setIcon(getIcon(*tbinfo->items.begin()->func, true));
        }
 
        void mousePressEvent(QMouseEvent * e)
@@ -171,20 +171,20 @@ public:
 
                initialized_ = true;
 
-               ToolbarInfo const * tbinfo = guiApp->toolbars().info(tbitem_.name_);
+               ToolbarInfo const * tbinfo = guiApp->toolbars().info(tbitem_.name);
                if (!tbinfo) {
-                       LYXERR0("Unknown toolbar " << tbitem_.name_);
+                       LYXERR0("Unknown toolbar " << tbitem_.name);
                        return;
                }
                IconPalette * panel = new IconPalette(this);
-               QString const label = qt_(to_ascii(tbitem_.label_));
+               QString const label = qt_(to_ascii(tbitem_.label));
                panel->setWindowTitle(label);
                connect(this, SIGNAL(clicked(bool)), panel, SLOT(setVisible(bool)));
                connect(panel, SIGNAL(visible(bool)), this, SLOT(setChecked(bool)));
                ToolbarInfo::item_iterator it = tbinfo->items.begin();
                ToolbarInfo::item_iterator const end = tbinfo->items.end();
                for (; it != end; ++it)
-                       if (!getStatus(*it->func_).unknown())
+                       if (!getStatus(*it->func).unknown())
                                panel->addButton(bar_->addItem(*it));
 
                QToolButton::mousePressEvent(e);
@@ -198,11 +198,11 @@ MenuButtonBase::MenuButtonBase(GuiToolbar * bar, ToolbarItem const & item)
        : QToolButton(bar), bar_(bar), tbitem_(item)
 {
        setPopupMode(QToolButton::InstantPopup);
-       QString const label = qt_(to_ascii(tbitem_.label_));
+       QString const label = qt_(to_ascii(tbitem_.label));
        setToolTip(label);
        setStatusTip(label);
        setText(label);
-       QString const name = toqstr(tbitem_.name_);
+       QString const name = toqstr(tbitem_.name);
        QStringList imagedirs;
        imagedirs << "images/math/" << "images/";
        for (int i = 0; i < imagedirs.size(); ++i) {
@@ -239,21 +239,21 @@ StaticMenuButton::StaticMenuButton(
 
 void StaticMenuButton::initialize()
 {
-       QString const label = qt_(to_ascii(tbitem_.label_));
+       QString const label = qt_(to_ascii(tbitem_.label));
        ButtonMenu * m = new ButtonMenu(label, this);
        m->setWindowTitle(label);
        m->setTearOffEnabled(true);
        connect(bar_, SIGNAL(updated()), m, SLOT(updateParent()));
        connect(bar_, SIGNAL(updated()), this, SLOT(updateTriggered()));
-       ToolbarInfo const * tbinfo = guiApp->toolbars().info(tbitem_.name_);
+       ToolbarInfo const * tbinfo = guiApp->toolbars().info(tbitem_.name);
        if (!tbinfo) {
-               LYXERR0("Unknown toolbar " << tbitem_.name_);
+               LYXERR0("Unknown toolbar " << tbitem_.name);
                return;
        }
        ToolbarInfo::item_iterator it = tbinfo->items.begin();
        ToolbarInfo::item_iterator const end = tbinfo->items.end();
        for (; it != end; ++it)
-               if (!getStatus(*it->func_).unknown())
+               if (!getStatus(*it->func).unknown())
                        m->add(bar_->addItem(*it));
        setMenu(m);
 }
@@ -310,7 +310,7 @@ DynamicMenuButton::~DynamicMenuButton()
 
 void DynamicMenuButton::initialize()
 {
-       QString const label = qt_(to_ascii(tbitem_.label_));
+       QString const label = qt_(to_ascii(tbitem_.label));
        ButtonMenu * m = new ButtonMenu(label, this);
        m->setWindowTitle(label);
        m->setTearOffEnabled(true);
@@ -340,7 +340,7 @@ void DynamicMenuButton::updateTriggered()
        GuiView const & owner = bar_->owner();
        BufferView const * bv = owner.currentBufferView();
 
-       string const & menutype = tbitem_.name_;
+       string const & menutype = tbitem_.name;
        if (menutype == "dynamic-custom-insets" || menutype == "dynamic-char-styles") {
                if (!bv) {
                        m->clear();
@@ -437,7 +437,7 @@ void DynamicMenuButton::loadFlexInsets()
 {
        QMenu * m = menu();
        m->clear();
-       string const & menutype = tbitem_.name_;
+       string const & menutype = tbitem_.name;
        InsetLayout::InsetLyXType ftype;
        if (menutype == "dynamic-custom-insets")
                ftype = InsetLayout::CUSTOM;
@@ -469,7 +469,7 @@ void DynamicMenuButton::loadFlexInsets()
 
 void GuiToolbar::add(ToolbarItem const & item)
 {
-       switch (item.type_) {
+       switch (item.type) {
        case ToolbarItem::SEPARATOR:
                addSeparator();
                break;
@@ -491,7 +491,7 @@ void GuiToolbar::add(ToolbarItem const & item)
                QToolButton * tb = new QToolButton;
                tb->setCheckable(true);
                tb->setIcon(getIcon(FuncRequest(LFUN_TABULAR_INSERT), true));
-               QString const label = qt_(to_ascii(item.label_));
+               QString const label = qt_(to_ascii(item.label));
                tb->setToolTip(label);
                tb->setStatusTip(label);
                tb->setText(label);
@@ -515,19 +515,19 @@ void GuiToolbar::add(ToolbarItem const & item)
                }
        case ToolbarItem::DYNAMICMENU: {
                // we only handle certain things
-               if (DynamicMenuButton::isMenuType(item.name_))
+               if (DynamicMenuButton::isMenuType(item.name))
                        addWidget(new DynamicMenuButton(this, item));
                else
-                       LYXERR0("Unknown dynamic menu type: " << item.name_);
+                       LYXERR0("Unknown dynamic menu type: " << item.name);
                break;
        }
        case ToolbarItem::BIDICOMMAND: {
-               if (!getStatus(*item.func_).unknown())
+               if (!getStatus(*item.func).unknown())
                        addAction(addItem(item));
                break;
                }
        case ToolbarItem::COMMAND: {
-               if (!getStatus(*item.func_).unknown())
+               if (!getStatus(*item.func).unknown())
                        addAction(addItem(item));
                break;
                }

diff --git a/src/frontends/qt/Toolbars.cpp b/src/frontends/qt/Toolbars.cpp
index 5455f86765313ca9494eda383b211b25235f4182..d7a28b8025aff20cd06874073df30bdfd82088f3 100644 (file)
--- a/src/frontends/qt/Toolbars.cpp
+++ b/src/frontends/qt/Toolbars.cpp
@@ -38,16 +38,16 @@ namespace frontend {
 //
 /////////////////////////////////////////////////////////////////////////
 
-ToolbarItem::ToolbarItem(Type type, FuncRequest const & func,
-                         docstring const & label)
-       : type_(type), func_(make_shared<FuncRequest>(func)), label_(label)
+ToolbarItem::ToolbarItem(Type t, FuncRequest const & f,
+                         docstring const & l)
+       : type(t), func(make_shared<FuncRequest>(f)), label(l)
 {
 }
 
 
 ToolbarItem::ToolbarItem(Type type, string const & name,
                          docstring const & label)
-       : type_(type), func_(make_shared<FuncRequest>()), label_(label), name_(name)
+       : type(type), func(make_shared<FuncRequest>()), label(label), name(name)
 {
 }
 
@@ -55,7 +55,7 @@ ToolbarItem::ToolbarItem(Type type, string const & name,
 void ToolbarInfo::add(ToolbarItem const & item)
 {
        items.push_back(item);
-       items.back().func_->setOrigin(FuncRequest::TOOLBAR);
+       items.back().func->setOrigin(FuncRequest::TOOLBAR);
 }
 
 

diff --git a/src/frontends/qt/Toolbars.h b/src/frontends/qt/Toolbars.h
index 4a0a64fdd0f58f3d0203cea91f79090e5ab96071..0083658a64cbf1269d59d23129e1006805bc0585 100644 (file)
--- a/src/frontends/qt/Toolbars.h
+++ b/src/frontends/qt/Toolbars.h
@@ -60,13 +60,13 @@ public:
                 docstring const & label = docstring());
 
        /// item type
-       Type type_;
+       Type type;
        /// action
-       std::shared_ptr<FuncRequest> func_; // non-null
+       std::shared_ptr<FuncRequest> func; // non-null
        /// label/tooltip
-       docstring label_;
+       docstring label;
        /// name
-       std::string name_;
+       std::string name;
 };