diff --git a/MainWindow.cpp b/MainWindow.cpp index 8591f11..91eff3f 100644 --- a/MainWindow.cpp +++ b/MainWindow.cpp @@ -331,7 +331,7 @@ void MainWindow::closeEvent(QCloseEvent *event) // Save settings writeSettings(); // Close all top level widgets - foreach (QWidget *widget, QApplication::topLevelWidgets()) { + for (QWidget *widget: QApplication::topLevelWidgets()) { if (widget != this) { // Avoid recursion widget->close(); } @@ -514,7 +514,7 @@ void MainWindow::openCameraDevice() QStringList devicesList; QMap devices; - foreach (const QCameraInfo &cameraInfo, cameras) + for (const QCameraInfo &cameraInfo: cameras) { devicesList << cameraInfo.description(); devices.insert(cameraInfo.description(), cameraInfo.deviceName()); @@ -2373,7 +2373,7 @@ void MainWindow:: updateScreenActions() { if (QApplication::screens().count() > 1) { // Add new action for each screen - foreach (QScreen *screen, QApplication::screens()) { + for (QScreen *screen: QApplication::screens()) { QString actionLabel = tr("%1 - %2x%3") .arg(screen->name()) .arg(QString::number(screen->size().width())) @@ -2388,7 +2388,7 @@ void MainWindow:: updateScreenActions() // Configure actions screenActionGroup = new QActionGroup(this); int preferredScreen = outputWindow->getPreferredScreen(); - foreach (QAction *action, screenActions) { + for (QAction *action: screenActions) { action->setCheckable(true); if (action == screenActions.at(preferredScreen)) action->setChecked(true); diff --git a/MapperGLCanvasToolbar.cpp b/MapperGLCanvasToolbar.cpp index 7b8e229..9ea2821 100644 --- a/MapperGLCanvasToolbar.cpp +++ b/MapperGLCanvasToolbar.cpp @@ -119,7 +119,7 @@ void MapperGLCanvasToolbar::showZoomToolBar(bool visible) void MapperGLCanvasToolbar::enableZoomToolBar(bool enabled) { - foreach (QPushButton *button, findChildren()) { + for (QPushButton *button: findChildren()) { button->setEnabled(enabled); } _dropdownMenu->setEnabled(enabled); diff --git a/MappingListModel.cpp b/MappingListModel.cpp index 385749e..11c833c 100644 --- a/MappingListModel.cpp +++ b/MappingListModel.cpp @@ -111,7 +111,7 @@ QMimeData *MappingListModel::mimeData(const QModelIndexList &indexes) const QByteArray encodeData; QDataStream stream(&encodeData, QIODevice::WriteOnly); - foreach (QModelIndex index, indexes) { + for (QModelIndex index: indexes) { if (index.isValid()) { if (index.column() == MM::HideColumn) { int id = data(index, Qt::UserRole).toInt(); diff --git a/MappingManager.h b/MappingManager.h index 4f320b8..a36215f 100644 --- a/MappingManager.h +++ b/MappingManager.h @@ -129,7 +129,7 @@ private: template QSharedPointer _getElementByName(const QVector >& vector, QString name) { - foreach (QSharedPointer it, vector) + for (QSharedPointer it: vector) { if (it->getName() == name) { @@ -145,7 +145,7 @@ private: { QVector > matchedElems; QRegExp regExp(namePattern, Qt::CaseSensitive, QRegExp::Wildcard); - foreach (QSharedPointer it, vector) + for (QSharedPointer it: vector) { if (regExp.exactMatch(it->getName())) { diff --git a/OscInterface.cpp b/OscInterface.cpp index 2b69471..65b51bb 100644 --- a/OscInterface.cpp +++ b/OscInterface.cpp @@ -203,7 +203,7 @@ void OscInterface::applyOscCommand(MainWindow &main_window, QVariantList & comma } // Process all paints. iterator = next(iterator.second); - foreach (Paint::ptr elem, paints) + for (Paint::ptr elem: paints) { if (iterator.first == OSC_REWIND) elem->rewind(); @@ -224,7 +224,7 @@ void OscInterface::applyOscCommand(MainWindow &main_window, QVariantList & comma } // Process all mappings. iterator = next(iterator.second); - foreach (Mapping::ptr elem, mappings) + for (Mapping::ptr elem: mappings) { pathIsValid |= setElementProperty(elem, iterator.first, command.at(3)); } diff --git a/PreferenceDialog.cpp b/PreferenceDialog.cpp index 374b791..093731b 100644 --- a/PreferenceDialog.cpp +++ b/PreferenceDialog.cpp @@ -132,7 +132,7 @@ void PreferenceDialog::applySettings() // Show screen resolution on output settings.setValue("showResolution", _showResolutionBox->isChecked()); // Set preferred test signal pattern - foreach (QRadioButton *radio, _radioGroup) { + for (QRadioButton *radio: _radioGroup) { if (radio->isChecked()) { settings.setValue("signalTestCard", _radioGroup.indexOf(radio)); break; @@ -146,7 +146,7 @@ void PreferenceDialog::applySettings() void PreferenceDialog::refreshCurrentIP() { - foreach (const QHostAddress &address, QNetworkInterface::allAddresses()) { + for (const QHostAddress &address: QNetworkInterface::allAddresses()) { if (address.protocol() == QAbstractSocket::IPv4Protocol && address != QHostAddress(QHostAddress::LocalHost)) { _machineAddressLabel->setText(address.toString()); diff --git a/ShapeGraphicsItem.cpp b/ShapeGraphicsItem.cpp index 5826c65..6bfeeee 100644 --- a/ShapeGraphicsItem.cpp +++ b/ShapeGraphicsItem.cpp @@ -415,7 +415,7 @@ void MeshTextureGraphicsItem::_doDrawOutput(QPainter* painter) } // Draw all the cached items. - foreach (CacheQuadMapping m, item.subQuads) + for (CacheQuadMapping m: item.subQuads) { glBegin(GL_QUADS); for (int i = 0; i < outputQuad->nVertices(); i++)