From 94e968e72eebe0e26c00d3a7713f8b6e9e26106a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Fri, 28 Sep 2007 21:41:56 +0000 Subject: [PATCH] cosmetics git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20570 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiToolbar.cpp | 10 +++++----- src/frontends/qt4/GuiToolbar.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp index 42e850f8ef..10311b6f20 100644 --- a/src/frontends/qt4/GuiToolbar.cpp +++ b/src/frontends/qt4/GuiToolbar.cpp @@ -229,7 +229,7 @@ void GuiToolbar::add(ToolbarItem const & item) it->func_, it->label_); panel->addButton(action); - ActionVector.push_back(action); + actions_.push_back(action); // use the icon of first action for the toolbar button if (it == tbinfo->items.begin()) tb->setIcon(QPixmap(getIcon(it->func_).c_str())); @@ -270,7 +270,7 @@ void GuiToolbar::add(ToolbarItem const & item) it->func_, it->label_); m->add(action); - ActionVector.push_back(action); + actions_.push_back(action); } tb->setMenu(m); addWidget(tb); @@ -286,7 +286,7 @@ void GuiToolbar::add(ToolbarItem const & item) item.func_, item.label_); addAction(action); - ActionVector.push_back(action); + actions_.push_back(action); break; } default: @@ -348,8 +348,8 @@ void GuiToolbar::update() { // This is a speed bottleneck because this is called on every keypress // and update calls getStatus, which copies the cursor at least two times - for (size_t i = 0; i < ActionVector.size(); ++i) - ActionVector[i]->update(); + for (size_t i = 0; i < actions_.size(); ++i) + actions_[i]->update(); // emit signal updated(); diff --git a/src/frontends/qt4/GuiToolbar.h b/src/frontends/qt4/GuiToolbar.h index 0d903a8065..7c6eafa9a0 100644 --- a/src/frontends/qt4/GuiToolbar.h +++ b/src/frontends/qt4/GuiToolbar.h @@ -45,7 +45,7 @@ class GuiLayoutBox : public QObject, public LayoutBox public: GuiLayoutBox(QToolBar *, GuiViewBase &); - /// select the right layout in the combox. + /// select the right layout in the combobox. void set(docstring const & layout); /// Populate the layout combox. void update(); @@ -89,7 +89,7 @@ Q_SIGNALS: private: GuiCommandBuffer * command_buffer_; - std::vector ActionVector; + std::vector actions_; GuiViewBase & owner_; boost::scoped_ptr layout_; -- 2.39.5