fly/flightgear
1
0
Fork 0
Code Activity

Go back to the simpler arrangement syntax of a map of vectors.

Browse source
This commit is contained in:
david 2003-01-19 23:03:31 +00:00
parent 35935cb23a
commit c1d6741fd5
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/GUI/menubar.cxx
View file

@ -282,12 +282,11 @@ FGMenuBar::~FGMenuBar ()
delete _menuBar; // FIXME: check if PUI owns the pointer
// Delete all those bindings
map<string,vector<FGBinding *>*>::iterator it;
map<string,vector<FGBinding *> >::iterator it;
it = _bindings.begin();
while (it != _bindings.end()) {
for (int i = 0; i < it->second->size(); i++)
delete (*it->second)[i];
delete it->second;
for (int i = 0; i < it->second.size(); i++)
delete it->second[i];
}
}
@ -329,10 +328,10 @@ void
FGMenuBar::fireItem (puObject * item)
{
const char * name = item->getLegend();
vector<FGBinding *> * bindings = _bindings[name];
vector<FGBinding *> &bindings = _bindings[name];
for (int i = 0; i < bindings->size(); i++)
(*bindings)[i]->fire();
for (int i = 0; i < bindings.size(); i++)
bindings[i]->fire();
}
void
@ -358,10 +357,8 @@ FGMenuBar::make_menu (SGPropertyNode_ptr node)
vector<SGPropertyNode_ptr> binding_nodes =
item_nodes[i]->getChildren("binding");
if (_bindings[items[j]] == 0)
_bindings[items[j]] = new vector<FGBinding *>;
for (int k = 0; k < binding_nodes.size(); k++)
_bindings[items[j]]->push_back(new FGBinding(binding_nodes[k]));
_bindings[items[j]].push_back(new FGBinding(binding_nodes[k]));
}
items[item_nodes.size()] = 0;

2
src/GUI/menubar.hxx
View file

@ -82,7 +82,7 @@ private:
bool _visible;
puMenuBar * _menuBar;
map<string,vector<FGBinding *>*> _bindings;
map<string,vector<FGBinding *> > _bindings;
};
#endif // __MENUBAR_HXX