Edwin,
I think we should rename a few local variables. In a year, people will
wonder why a ToolbarInfo object is called "tbb".
OK?
Michael
Index: src/frontends/LyXView.h
===================================================================
--- src/frontends/LyXView.h (Revision 17884)
+++ src/frontends/LyXView.h (Arbeitskopie)
@@ -112,7 +112,7 @@
/// show busy cursor
virtual void busy(bool) = 0;
- virtual Toolbars::ToolbarPtr makeToolbar(ToolbarInfo const & tbb, bool newline) = 0;
+ virtual Toolbars::ToolbarPtr makeToolbar(ToolbarInfo const & info, bool newline) = 0;
//@{ generic accessor functions
Index: src/frontends/Toolbars.C
===================================================================
--- src/frontends/Toolbars.C (Revision 17884)
+++ src/frontends/Toolbars.C (Arbeitskopie)
@@ -40,11 +40,11 @@
#define TurnOnFlag(x) flags |= ToolbarInfo::x
#define TurnOffFlag(x) flags &= ~ToolbarInfo::x
-void Toolbars::initFlags(ToolbarInfo & tbb)
+void Toolbars::initFlags(ToolbarInfo & tbi)
{
- ToolbarSection::ToolbarInfo & info = LyX::ref().session().toolbars().load(tbb.name);
+ ToolbarSection::ToolbarInfo & info = LyX::ref().session().toolbars().load(tbi.name);
- unsigned int flags = static_cast<unsigned int>(tbb.flags);
+ unsigned int flags = static_cast<unsigned int>(tbi.flags);
// Remove default.ui positions. Only when a valid postion is stored
// in the session file the default.ui value will be overwritten
@@ -55,7 +55,7 @@
TurnOffFlag(LEFT);
bool valid_location = true;
- // init tbb.flags with saved location
+ // init tbi.flags with saved location
if (info.location == ToolbarSection::ToolbarInfo::TOP)
TurnOnFlag(TOP);
else if (info.location == ToolbarSection::ToolbarInfo::BOTTOM)
@@ -73,7 +73,7 @@
// invalid location is for a new toolbar that has no saved information,
// so info.visible is not used for this case.
if (valid_location) {
- // init tbb.flags with saved visibility,
+ // init tbi.flags with saved visibility,
TurnOffFlag(ON);
TurnOffFlag(OFF);
TurnOffFlag(AUTO);
@@ -99,7 +99,7 @@
<< std::endl;
*/
// now set the flags
- tbb.flags = static_cast<lyx::ToolbarInfo::Flags>(flags);
+ tbi.flags = static_cast<lyx::ToolbarInfo::Flags>(flags);
}
@@ -316,12 +316,12 @@
}
-void Toolbars::add(ToolbarInfo const & tbb, bool newline)
+void Toolbars::add(ToolbarInfo const & info, bool newline)
{
- ToolbarPtr tb_ptr = owner_.makeToolbar(tbb, newline);
- toolbars_[tbb.name] = tb_ptr;
+ ToolbarPtr tb_ptr = owner_.makeToolbar(info, newline);
+ toolbars_[info.name] = tb_ptr;
- if (tbb.flags & ToolbarInfo::ON)
+ if (info.flags & ToolbarInfo::ON)
tb_ptr->show(false);
else
tb_ptr->hide(false);
@@ -331,10 +331,10 @@
}
-void Toolbars::displayToolbar(ToolbarInfo const & tbb,
+void Toolbars::displayToolbar(ToolbarInfo const & info,
bool show_it)
{
- ToolbarsMap::iterator it = toolbars_.find(tbb.name);
+ ToolbarsMap::iterator it = toolbars_.find(info.name);
BOOST_ASSERT(it != toolbars_.end());
if (show_it)
Index: src/frontends/qt4/GuiView.h
===================================================================
--- src/frontends/qt4/GuiView.h (Revision 17884)
+++ src/frontends/qt4/GuiView.h (Arbeitskopie)
@@ -67,7 +67,7 @@
virtual void saveGeometry();
virtual void busy(bool);
/// add toolbar, if newline==true, add a toolbar break before the toolbar
- Toolbars::ToolbarPtr makeToolbar(ToolbarInfo const & tbb, bool newline);
+ Toolbars::ToolbarPtr makeToolbar(ToolbarInfo const & info, bool newline);
virtual void updateStatusBar();
virtual void message(lyx::docstring const & str);
virtual void clearMessage();
Index: src/frontends/qt4/QLToolbar.C
===================================================================
--- src/frontends/qt4/QLToolbar.C (Revision 17884)
+++ src/frontends/qt4/QLToolbar.C (Arbeitskopie)
@@ -161,8 +161,8 @@
}
-QLToolbar::QLToolbar(ToolbarInfo const & tbb, GuiView & owner)
- : QToolBar(qt_(tbb.gui_name), &owner), owner_(owner)
+QLToolbar::QLToolbar(ToolbarInfo const & info, GuiView & owner)
+ : QToolBar(qt_(info.gui_name), &owner), owner_(owner)
{
// give visual separation between adjacent toolbars
addSeparator();
@@ -170,8 +170,8 @@
// TODO: save toolbar position
setMovable(true);
- ToolbarInfo::item_iterator it = tbb.items.begin();
- ToolbarInfo::item_iterator end = tbb.items.end();
+ ToolbarInfo::item_iterator it = info.items.begin();
+ ToolbarInfo::item_iterator end = info.items.end();
for (; it != end; ++it)
add(*it);
}
@@ -215,9 +215,9 @@
IconPalette * panel = new IconPalette(tb);
connect(this, SIGNAL(updated()), panel, SLOT(updateParent()));
- ToolbarInfo const & tbb = toolbarbackend.getToolbar(item.name_);
- ToolbarInfo::item_iterator it = tbb.items.begin();
- ToolbarInfo::item_iterator const end = tbb.items.end();
+ ToolbarInfo const & info = toolbarbackend.getToolbar(item.name_);
+ ToolbarInfo::item_iterator it = info.items.begin();
+ ToolbarInfo::item_iterator const end = info.items.end();
for (; it != end; ++it)
if (!lyx::getStatus(it->func_).unknown()) {
Action * action = new Action(owner_,
@@ -228,7 +228,7 @@
panel->addButton(action);
ActionVector.push_back(action);
// use the icon of first action for the toolbar button
- if (it == tbb.items.begin())
+ if (it == info.items.begin())
tb->setIcon(QPixmap(getIcon(it->func_).c_str()));
}
connect(tb, SIGNAL(clicked(bool)), panel, SLOT(setVisible(bool)));
@@ -249,9 +249,9 @@
ButtonMenu * m = new ButtonMenu(toqstr(item.label_), tb);
connect(this, SIGNAL(updated()), m, SLOT(updateParent()));
- ToolbarInfo const & tbb = toolbarbackend.getToolbar(item.name_);
- ToolbarInfo::item_iterator it = tbb.items.begin();
- ToolbarInfo::item_iterator const end = tbb.items.end();
+ ToolbarInfo const & info = toolbarbackend.getToolbar(item.name_);
+ ToolbarInfo::item_iterator it = info.items.begin();
+ ToolbarInfo::item_iterator const end = info.items.end();
for (; it != end; ++it)
if (!lyx::getStatus(it->func_).unknown()) {
Action * action = new Action(owner_,
Index: src/frontends/qt4/GuiView.C
===================================================================
--- src/frontends/qt4/GuiView.C (Revision 17884)
+++ src/frontends/qt4/GuiView.C (Arbeitskopie)
@@ -695,17 +695,17 @@
}
-Toolbars::ToolbarPtr GuiView::makeToolbar(ToolbarInfo const & tbb, bool newline)
+Toolbars::ToolbarPtr GuiView::makeToolbar(ToolbarInfo const & info, bool newline)
{
- QLToolbar * Tb = new QLToolbar(tbb, *this);
+ QLToolbar * Tb = new QLToolbar(info, *this);
- if (tbb.flags & ToolbarInfo::TOP) {
+ if (info.flags & ToolbarInfo::TOP) {
if (newline)
addToolBarBreak(Qt::TopToolBarArea);
addToolBar(Qt::TopToolBarArea, Tb);
}
- if (tbb.flags & ToolbarInfo::BOTTOM) {
+ if (info.flags & ToolbarInfo::BOTTOM) {
// Qt < 4.2.2 cannot handle ToolBarBreak on non-TOP dock.
#if (QT_VERSION >= 0x040202)
if (newline)
@@ -714,7 +714,7 @@
addToolBar(Qt::BottomToolBarArea, Tb);
}
- if (tbb.flags & ToolbarInfo::LEFT) {
+ if (info.flags & ToolbarInfo::LEFT) {
// Qt < 4.2.2 cannot handle ToolBarBreak on non-TOP dock.
#if (QT_VERSION >= 0x040202)
if (newline)
@@ -723,7 +723,7 @@
addToolBar(Qt::LeftToolBarArea, Tb);
}
- if (tbb.flags & ToolbarInfo::RIGHT) {
+ if (info.flags & ToolbarInfo::RIGHT) {
// Qt < 4.2.2 cannot handle ToolBarBreak on non-TOP dock.
#if (QT_VERSION >= 0x040202)
if (newline)
@@ -732,10 +732,10 @@
addToolBar(Qt::RightToolBarArea, Tb);
}
- // The following does not work so I can not restore to exact toolbar location
+ // The following does not work so I cannot restore to exact toolbar location
/*
- ToolbarSection::ToolbarInfo & info = LyX::ref().session().toolbars().load(tbb.name);
- Tb->move(info.posx, info.posy);
+ ToolbarSection::ToolbarInfo & tbi = LyX::ref().session().toolbars().load(info.name);
+ Tb->move(tbi.posx, tbi.posy);
*/
return Toolbars::ToolbarPtr(Tb);
Index: src/frontends/Toolbars.h
===================================================================
--- src/frontends/Toolbars.h (Revision 17884)
+++ src/frontends/Toolbars.h (Arbeitskopie)
@@ -118,9 +118,9 @@
private:
/// Add a new toolbar. if newline==true, start from a new line
- void add(ToolbarInfo const & tb, bool newline);
+ void add(ToolbarInfo const & info, bool newline);
/// Show or hide a toolbar.
- void displayToolbar(ToolbarInfo const & tb, bool show);
+ void displayToolbar(ToolbarInfo const & info, bool show);
/// Update the state of the icons
void update();
@@ -144,7 +144,7 @@
int last_textclass_;
// load flags with saved values
- void initFlags(ToolbarInfo & tbb);
+ void initFlags(ToolbarInfo & info);
};
/// Set the layout in the kernel when an entry has been selected
Index: src/ToolbarBackend.C
===================================================================
--- src/ToolbarBackend.C (Revision 17884)
+++ src/ToolbarBackend.C (Arbeitskopie)
@@ -42,9 +42,9 @@
public:
ToolbarNamesEqual(string const & name)
: name_(name) {}
- bool operator()(ToolbarInfo const & tb) const
+ bool operator()(ToolbarInfo const & info) const
{
- return tb.name == name_;
+ return info.name == name_;
}
private:
string name_;
@@ -236,9 +236,9 @@
while (lex.isOK() && !quit) {
switch (lex.lex()) {
case TO_TOOLBAR: {
- ToolbarInfo tb;
- tb.read(lex);
- toolbars.push_back(tb);
+ ToolbarInfo info;
+ info.read(lex);
+ toolbars.push_back(info);
break;
}
case TO_ENDTOOLBARSET:
