Browse Source

ui: Change from foreach to c++11 for

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
QGC4.4
Patrick José Pereira 7 years ago
parent
commit
0b9292e243
  1. 8
      src/ui/MainWindow.cc
  2. 2
      src/ui/QGCMAVLinkInspector.cc

8
src/ui/MainWindow.cc

@ -347,7 +347,7 @@ bool MainWindow::_createInnerDockWidget(const QString& widgetName)
void MainWindow::_hideAllDockWidgets(void) void MainWindow::_hideAllDockWidgets(void)
{ {
foreach(QGCDockWidget* dockWidget, _mapName2DockWidget) { for(QGCDockWidget* dockWidget: _mapName2DockWidget) {
dockWidget->setVisible(false); dockWidget->setVisible(false);
} }
} }
@ -448,7 +448,7 @@ void MainWindow::_vehicleAdded(Vehicle* vehicle)
void MainWindow::_storeCurrentViewState(void) void MainWindow::_storeCurrentViewState(void)
{ {
#ifndef __mobile__ #ifndef __mobile__
foreach(QGCDockWidget* dockWidget, _mapName2DockWidget) { for(QGCDockWidget* dockWidget: _mapName2DockWidget) {
dockWidget->saveSettings(); dockWidget->saveSettings();
} }
#endif #endif
@ -482,7 +482,7 @@ void MainWindow::_loadVisibleWidgetsSettings(void)
if (!widgets.isEmpty()) { if (!widgets.isEmpty()) {
QStringList nameList = widgets.split(","); QStringList nameList = widgets.split(",");
foreach (const QString &name, nameList) { for (const QString &name: nameList) {
_showDockWidget(name, true); _showDockWidget(name, true);
} }
} }
@ -493,7 +493,7 @@ void MainWindow::_storeVisibleWidgetsSettings(void)
QString widgetNames; QString widgetNames;
bool firstWidget = true; bool firstWidget = true;
foreach (const QString &name, _mapName2DockWidget.keys()) { for (const QString &name: _mapName2DockWidget.keys()) {
if (_mapName2DockWidget[name]->isVisible()) { if (_mapName2DockWidget[name]->isVisible()) {
if (!firstWidget) { if (!firstWidget) {
widgetNames += ","; widgetNames += ",";

2
src/ui/QGCMAVLinkInspector.cc

@ -83,7 +83,7 @@ void QGCMAVLinkInspector::rebuildComponentList()
{ {
UASInterface* uas = vehicle->uas(); UASInterface* uas = vehicle->uas();
QMap<int, QString> components = uas->getComponents(); QMap<int, QString> components = uas->getComponents();
foreach (int id, components.keys()) for (int id: components.keys())
{ {
QString name = components.value(id); QString name = components.value(id);
ui->componentComboBox->addItem(name, id); ui->componentComboBox->addItem(name, id);

Loading…
Cancel
Save