itdominator
/
pavucontrol
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mainwindow: Compact iterator decls

This commit is contained in:
Colin Guthrie 2010-04-21 00:44:01 +01:00
parent 9fe20201f2
commit 95e48d5c9e
1 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/mainwindow.cc
View File

@ -917,31 +917,18 @@ void MainWindow::removeClient(uint32_t index) {
} }
void MainWindow::removeAllWidgets() { void MainWindow::removeAllWidgets() {
{ for (std::map<uint32_t, SinkInputWidget*>::iterator it = sinkInputWidgets.begin(); it != sinkInputWidgets.end(); ++it)
std::map<uint32_t, SinkInputWidget*>::iterator it; removeSinkInput(it->first);
for (it = sinkInputWidgets.begin(); it != sinkInputWidgets.end(); ++it) for (std::map<uint32_t, SourceOutputWidget*>::iterator it = sourceOutputWidgets.begin(); it != sourceOutputWidgets.end(); ++it)
removeSinkInput(it->first); removeSourceOutput(it->first);
}{ for (std::map<uint32_t, SinkWidget*>::iterator it = sinkWidgets.begin(); it != sinkWidgets.end(); ++it)
std::map<uint32_t, SourceOutputWidget*>::iterator it; removeSink(it->first);
for (it = sourceOutputWidgets.begin(); it != sourceOutputWidgets.end(); ++it) for (std::map<uint32_t, SourceWidget*>::iterator it = sourceWidgets.begin(); it != sourceWidgets.end(); ++it)
removeSourceOutput(it->first); removeSource(it->first);
}{ for (std::map<uint32_t, CardWidget*>::iterator it = cardWidgets.begin(); it != cardWidgets.end(); ++it)
std::map<uint32_t, SinkWidget*>::iterator it; removeCard(it->first);
for (it = sinkWidgets.begin(); it != sinkWidgets.end(); ++it) for (std::map<uint32_t, char*>::iterator it = clientNames.begin(); it != clientNames.end(); ++it)
removeSink(it->first); removeSourceOutput(it->first);
}{
std::map<uint32_t, SourceWidget*>::iterator it;
for (it = sourceWidgets.begin(); it != sourceWidgets.end(); ++it)
removeSource(it->first);
}{
std::map<uint32_t, CardWidget*>::iterator it;
for (it = cardWidgets.begin(); it != cardWidgets.end(); ++it)
removeCard(it->first);
}{
std::map<uint32_t, char*>::iterator it;
for (it = clientNames.begin(); it != clientNames.end(); ++it)
removeSourceOutput(it->first);
}
deleteEventRoleWidget(); deleteEventRoleWidget();
} }