From 3cd173a37ff482de3382ac6b5c8b172235381721 Mon Sep 17 00:00:00 2001 From: Jaye Evins Date: Mon, 5 Jan 2026 15:24:00 -0500 Subject: [PATCH] Replaced all Qt foreach loops with modern C++ range-based loops. (#277) --- backends/barcode/Backends.cpp | 2 +- glabels/BarcodeMenu.cpp | 6 +- glabels/ColorPaletteDialog.cpp | 2 +- glabels/File.cpp | 2 +- glabels/LabelEditor.cpp | 2 +- glabels/PropertiesView.cpp | 2 +- glabels/SelectProductDialog.cpp | 2 +- glabels/TemplatePicker.cpp | 4 +- glabels/main.cpp | 2 +- model/DataCache.cpp | 2 +- model/Model.cpp | 109 ++++++++++++++++---------------- model/ModelTextObject.cpp | 8 +-- model/RawText.cpp | 2 +- model/XmlLabelCreator.cpp | 6 +- model/XmlLabelParser.cpp | 2 +- model/XmlLabelParser_3.cpp | 2 +- translations/XmlStrings.cpp | 6 +- 17 files changed, 79 insertions(+), 82 deletions(-) diff --git a/backends/barcode/Backends.cpp b/backends/barcode/Backends.cpp index fb89c34..0cb9db2 100644 --- a/backends/barcode/Backends.cpp +++ b/backends/barcode/Backends.cpp @@ -556,7 +556,7 @@ namespace glabels const Style& Backends::style( const QString& backendId, const QString& StyleId ) { - foreach ( const Style& bcStyle, mStyleList ) + for ( const Style& bcStyle : mStyleList ) { if ( (bcStyle.backendId() == backendId) && (bcStyle.id() == StyleId) ) { diff --git a/glabels/BarcodeMenu.cpp b/glabels/BarcodeMenu.cpp index 59752ee..36ac30e 100644 --- a/glabels/BarcodeMenu.cpp +++ b/glabels/BarcodeMenu.cpp @@ -35,7 +35,7 @@ namespace glabels /// BarcodeMenu::BarcodeMenu() { - foreach ( const barcode::Style& bcStyle, barcode::Backends::styleList() ) + for ( const barcode::Style& bcStyle : barcode::Backends::styleList() ) { if ( bcStyle.backendId() == "" ) { @@ -47,11 +47,11 @@ namespace glabels } } - foreach ( const QString& backendId, barcode::Backends::backendList() ) + for ( const QString& backendId : barcode::Backends::backendList() ) { QMenu* subMenu = addMenu( barcode::Backends::backendName( backendId ) ); - foreach ( const barcode::Style& bcStyle, barcode::Backends::styleList() ) + for ( const barcode::Style& bcStyle : barcode::Backends::styleList() ) { if ( bcStyle.backendId() == backendId ) { diff --git a/glabels/ColorPaletteDialog.cpp b/glabels/ColorPaletteDialog.cpp index ab414c8..3f30093 100644 --- a/glabels/ColorPaletteDialog.cpp +++ b/glabels/ColorPaletteDialog.cpp @@ -288,7 +288,7 @@ namespace glabels QList colorList = mColorHistory->getColors(); int id = 0; - foreach ( QColor color, colorList ) + for ( QColor color : colorList ) { mHistoryItem[id]->setColor( id, color, nameList[id] ); mHistoryItem[id]->setEnabled( true ); diff --git a/glabels/File.cpp b/glabels/File.cpp index b213eaf..9c920a0 100644 --- a/glabels/File.cpp +++ b/glabels/File.cpp @@ -289,7 +289,7 @@ namespace glabels /// void File::exit() { - foreach ( QWidget* qwidget, QApplication::topLevelWidgets() ) + for ( QWidget* qwidget : QApplication::topLevelWidgets() ) { if ( auto* window = qobject_cast(qwidget) ) { diff --git a/glabels/LabelEditor.cpp b/glabels/LabelEditor.cpp index 34e8ad1..f8e893a 100644 --- a/glabels/LabelEditor.cpp +++ b/glabels/LabelEditor.cpp @@ -1283,7 +1283,7 @@ namespace glabels { painter->save(); - foreach ( model::ModelObject* object, mModel->objectList() ) + for ( model::ModelObject* object : mModel->objectList() ) { if ( object->isSelected() ) { diff --git a/glabels/PropertiesView.cpp b/glabels/PropertiesView.cpp index 798cc25..b6c8abf 100644 --- a/glabels/PropertiesView.cpp +++ b/glabels/PropertiesView.cpp @@ -138,7 +138,7 @@ namespace glabels similarProductsNullBox->hide(); QString similarListString; - foreach ( QString name, list ) + for ( QString name : list ) { similarListString += name + "\n"; } diff --git a/glabels/SelectProductDialog.cpp b/glabels/SelectProductDialog.cpp index 200676c..44272be 100644 --- a/glabels/SelectProductDialog.cpp +++ b/glabels/SelectProductDialog.cpp @@ -298,7 +298,7 @@ namespace glabels { mCategoryIdList.clear(); - foreach( QCheckBox* check, mCheckList ) + for ( QCheckBox* check : mCheckList ) { if ( check->isChecked() ) { diff --git a/glabels/TemplatePicker.cpp b/glabels/TemplatePicker.cpp index b723e82..587fe67 100644 --- a/glabels/TemplatePicker.cpp +++ b/glabels/TemplatePicker.cpp @@ -211,7 +211,7 @@ namespace glabels else { categoryMask = false; - foreach ( QString id, categoryIds ) + for ( QString id : categoryIds ) { categoryMask = categoryMask || tItem->tmplate().hasCategory( id ); } @@ -248,7 +248,7 @@ namespace glabels if ( auto* tItem = dynamic_cast( mModel->item( i, 0 ) ) ) { bool match = false; - foreach ( QString name, names ) + for ( QString name : names ) { if ( tItem->tmplate().name() == name ) { diff --git a/glabels/main.cpp b/glabels/main.cpp index 4b1d12b..1909782 100644 --- a/glabels/main.cpp +++ b/glabels/main.cpp @@ -112,7 +112,7 @@ int main( int argc, char **argv ) // Open each file in its own main window // bool openedFiles = false; - foreach ( QString filename, parser.positionalArguments() ) + for ( QString filename : parser.positionalArguments() ) { glabels::model::Model *model = glabels::model::XmlLabelParser::readFile( filename ); if ( model ) diff --git a/model/DataCache.cpp b/model/DataCache.cpp index cf45dbf..8c59a8e 100644 --- a/model/DataCache.cpp +++ b/model/DataCache.cpp @@ -36,7 +36,7 @@ namespace glabels DataCache::DataCache( const QList& objects ) { - foreach( ModelObject* object, objects ) + for ( ModelObject* object : objects ) { if ( auto* imageObject = dynamic_cast(object) ) { diff --git a/model/Model.cpp b/model/Model.cpp index abd3e5a..58f68a2 100644 --- a/model/Model.cpp +++ b/model/Model.cpp @@ -95,10 +95,7 @@ namespace glabels void Model::restore( const Model *savedModel ) { // Clear current object list - foreach ( ModelObject* object, mObjectList ) - { - delete object; - } + qDeleteAll( mObjectList ); mObjectList.clear(); // Now copy state @@ -108,7 +105,7 @@ namespace glabels mTmplate = savedModel->mTmplate; mRotate = savedModel->mRotate; - foreach ( ModelObject* savedObject, savedModel->mObjectList ) + for ( ModelObject* savedObject : savedModel->mObjectList ) { ModelObject* object = savedObject->clone(); @@ -474,7 +471,7 @@ namespace glabels { static Handle nullHandle; - foreach( ModelObject* object, mObjectList ) + for( ModelObject* object : mObjectList ) { auto& handle = object->handleAt( scale, x, y ); if ( !handle.isNull() ) @@ -566,7 +563,7 @@ namespace glabels /// void Model::selectAll() { - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { object->select(); } @@ -580,7 +577,7 @@ namespace glabels /// void Model::unselectAll() { - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { object->unselect(); } @@ -599,7 +596,7 @@ namespace glabels Distance rX2 = max( region.x1(), region.x2() ); Distance rY2 = max( region.y1(), region.y2() ); - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { Region objectExtent = object->getExtent(); @@ -621,7 +618,7 @@ namespace glabels /// bool Model::isSelectionEmpty() { - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { if ( object->isSelected() ) { @@ -640,7 +637,7 @@ namespace glabels { int nSelected = 0; - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { if ( object->isSelected() ) { @@ -663,7 +660,7 @@ namespace glabels { QList selectedList; - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { if ( object->isSelected() ) { @@ -680,7 +677,7 @@ namespace glabels /// ModelObject* Model::getFirstSelectedObject() { - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { if ( object->isSelected() ) { @@ -697,7 +694,7 @@ namespace glabels /// bool Model::canSelectionText() { - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { if ( object->isSelected() && object->canText() ) { @@ -714,7 +711,7 @@ namespace glabels /// bool Model::canSelectionFill() { - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { if ( object->isSelected() && object->canFill() ) { @@ -731,7 +728,7 @@ namespace glabels /// bool Model::canSelectionLineColor() { - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { if ( object->isSelected() && object->canLineColor() ) { @@ -748,7 +745,7 @@ namespace glabels /// bool Model::canSelectionLineWidth() { - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { if ( object->isSelected() && object->canLineWidth() ) { @@ -767,7 +764,7 @@ namespace glabels { QList selectedList = getSelection(); - foreach ( ModelObject* object, selectedList ) + for ( ModelObject* object : selectedList ) { deleteObject( object ); } @@ -786,13 +783,13 @@ namespace glabels { QList selectedList = getSelection(); - foreach ( ModelObject* object, selectedList ) + for ( ModelObject* object : selectedList ) { mObjectList.removeOne( object ); } // Move to end of list, representing top most object. - foreach ( ModelObject* object, selectedList ) + for ( ModelObject* object : selectedList ) { mObjectList.push_back( object ); } @@ -810,13 +807,13 @@ namespace glabels { QList selectedList = getSelection(); - foreach ( ModelObject* object, selectedList ) + for ( ModelObject* object : selectedList ) { mObjectList.removeOne( object ); } // Move to front of list, representing bottom most object. - foreach ( ModelObject* object, selectedList ) + for ( ModelObject* object : selectedList ) { mObjectList.push_front( object ); } @@ -832,7 +829,7 @@ namespace glabels /// void Model::rotateSelection( double thetaDegs ) { - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { if ( object->isSelected() ) { @@ -869,7 +866,7 @@ namespace glabels /// void Model::flipSelectionHoriz() { - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { if ( object->isSelected() ) { @@ -888,7 +885,7 @@ namespace glabels /// void Model::flipSelectionVert() { - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { if ( object->isSelected() ) { @@ -916,14 +913,14 @@ namespace glabels // Find left-most edge. Distance x1_min = 7200; // Start with a very large value: 7200pts = 100in - foreach ( ModelObject* object, selectedList ) + for ( ModelObject* object : selectedList ) { Region r = object->getExtent(); if ( r.x1() < x1_min ) x1_min = r.x1(); } // Now adjust the object positions to line up the left edges at left-most edge. - foreach ( ModelObject* object, selectedList ) + for ( ModelObject* object : selectedList ) { Region r = object->getExtent(); Distance dx = x1_min - r.x1(); @@ -950,14 +947,14 @@ namespace glabels // Find right-most edge. Distance x1_max = -7200; // Start with a very large negative value: 7200pts = 100in - foreach ( ModelObject* object, selectedList ) + for ( ModelObject* object : selectedList ) { Region r = object->getExtent(); if ( r.x1() > x1_max ) x1_max = r.x1(); } // Now adjust the object positions to line up the right edges at right-most edge. - foreach ( ModelObject* object, selectedList ) + for ( ModelObject* object : selectedList ) { Region r = object->getExtent(); Distance dx = x1_max - r.x1(); @@ -985,7 +982,7 @@ namespace glabels // Find average center of objects. Distance xsum = 0; int n = 0; - foreach ( ModelObject* object, selectedList ) + for ( ModelObject* object : selectedList ) { Region r = object->getExtent(); xsum += (r.x1() + r.x2()) / 2.0; @@ -996,7 +993,7 @@ namespace glabels // Find object closest to average center of objects. Distance xcenter = 7200; // Start with very large value. Distance dxmin = fabs( xavg - xcenter ); - foreach ( ModelObject* object, selectedList ) + for ( ModelObject* object : selectedList ) { Region r = object->getExtent(); Distance dx = fabs( xavg - (r.x1() + r.x2())/2.0 ); @@ -1008,7 +1005,7 @@ namespace glabels } // Now adjust the object positions to line up with the center of this object. - foreach ( ModelObject* object, selectedList ) + for ( ModelObject* object : selectedList ) { Region r = object->getExtent(); Distance dx = xcenter - (r.x1() + r.x2())/2.0; @@ -1035,14 +1032,14 @@ namespace glabels // Find top-most edge. Distance y1_min = 7200; // Start with a very large value: 7200pts = 100in - foreach ( ModelObject* object, selectedList ) + for ( ModelObject* object : selectedList ) { Region r = object->getExtent(); if ( r.y1() < y1_min ) y1_min = r.y1(); } // Now adjust the object positions to line up the top edges at top-most edge. - foreach ( ModelObject* object, selectedList ) + for ( ModelObject* object : selectedList ) { Region r = object->getExtent(); Distance dy = y1_min - r.y1(); @@ -1069,14 +1066,14 @@ namespace glabels // Find bottom-most edge. Distance y1_max = -7200; // Start with a very large negative value: 7200pts = 100in - foreach ( ModelObject* object, selectedList ) + for ( ModelObject* object : selectedList ) { Region r = object->getExtent(); if ( r.y1() > y1_max ) y1_max = r.y1(); } // Now adjust the object positions to line up the bottom edges at bottom-most edge. - foreach ( ModelObject* object, selectedList ) + for ( ModelObject* object : selectedList ) { Region r = object->getExtent(); Distance dy = y1_max - r.y1(); @@ -1104,7 +1101,7 @@ namespace glabels // Find average center of objects. Distance ysum = 0; int n = 0; - foreach ( ModelObject* object, selectedList ) + for ( ModelObject* object : selectedList ) { Region r = object->getExtent(); ysum += (r.y1() + r.y2()) / 2.0; @@ -1115,7 +1112,7 @@ namespace glabels // Find object closest to average center of objects. Distance ycenter = 7200; // Start with very large value. Distance dymin = fabs( yavg - ycenter ); - foreach ( ModelObject* object, selectedList ) + for ( ModelObject* object : selectedList ) { Region r = object->getExtent(); Distance dy = fabs( yavg - (r.y1() + r.y2())/2.0 ); @@ -1127,7 +1124,7 @@ namespace glabels } // Now adjust the object positions to line up with the center of this object. - foreach ( ModelObject* object, selectedList ) + for ( ModelObject* object : selectedList ) { Region r = object->getExtent(); Distance dy = ycenter - (r.y1() + r.y2())/2.0; @@ -1147,7 +1144,7 @@ namespace glabels { Distance xLabelCenter = w() / 2.0; - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { if ( object->isSelected() ) { @@ -1172,7 +1169,7 @@ namespace glabels Distance xLabelCenter = w() / 2.0; Distance yLabelCenter = h() / 2.0; - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { if ( object->isSelected() ) { @@ -1198,7 +1195,7 @@ namespace glabels { Distance yLabelCenter = h() / 2.0; - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { if ( object->isSelected() ) { @@ -1220,7 +1217,7 @@ namespace glabels /// void Model::moveSelection( Distance dx, Distance dy ) { - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { if ( object->isSelected() ) { @@ -1239,7 +1236,7 @@ namespace glabels /// void Model::setSelectionFontFamily( const QString &fontFamily ) { - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { if ( object->isSelected() ) { @@ -1258,7 +1255,7 @@ namespace glabels /// void Model::setSelectionFontSize( double fontSize ) { - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { if ( object->isSelected() ) { @@ -1277,7 +1274,7 @@ namespace glabels /// void Model::setSelectionFontWeight( QFont::Weight fontWeight ) { - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { if ( object->isSelected() ) { @@ -1296,7 +1293,7 @@ namespace glabels /// void Model::setSelectionFontItalicFlag( bool fontItalicFlag ) { - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { if ( object->isSelected() ) { @@ -1315,7 +1312,7 @@ namespace glabels /// void Model::setSelectionTextHAlign( Qt::Alignment textHAlign ) { - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { if ( object->isSelected() ) { @@ -1334,7 +1331,7 @@ namespace glabels /// void Model::setSelectionTextVAlign( Qt::Alignment textVAlign ) { - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { if ( object->isSelected() ) { @@ -1353,7 +1350,7 @@ namespace glabels /// void Model::setSelectionTextLineSpacing( double textLineSpacing ) { - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { if ( object->isSelected() ) { @@ -1372,7 +1369,7 @@ namespace glabels /// void Model::setSelectionTextColorNode( ColorNode textColorNode ) { - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { if ( object->isSelected() ) { @@ -1391,7 +1388,7 @@ namespace glabels /// void Model::setSelectionLineWidth( Distance lineWidth ) { - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { if ( object->isSelected() ) { @@ -1410,7 +1407,7 @@ namespace glabels /// void Model::setSelectionLineColorNode( ColorNode lineColorNode ) { - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { if ( object->isSelected() ) { @@ -1429,7 +1426,7 @@ namespace glabels /// void Model::setSelectionFillColorNode( ColorNode fillColorNode ) { - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { if ( object->isSelected() ) { @@ -1523,7 +1520,7 @@ namespace glabels QList objects = XmlLabelParser::deserializeObjects( buffer, this ); unselectAll(); - foreach ( ModelObject* object, objects ) + for ( ModelObject* object : objects ) { object->setPositionRelative( p.x(), p.y() ); addObject( object ); @@ -1613,7 +1610,7 @@ namespace glabels const merge::Record& record, const Variables& variablesInstance ) const { - foreach ( ModelObject* object, mObjectList ) + for ( ModelObject* object : mObjectList ) { object->draw( painter, inEditor, record, variablesInstance ); } diff --git a/model/ModelTextObject.cpp b/model/ModelTextObject.cpp index 5b22f09..4d67f04 100644 --- a/model/ModelTextObject.cpp +++ b/model/ModelTextObject.cpp @@ -672,7 +672,7 @@ namespace glabels break; } QPainterPath hoverPath; // new empty hover path - foreach ( QTextLayout* layout, mEditorLayouts ) + for ( QTextLayout* layout : mEditorLayouts ) { for ( int j = 0; j < layout->lineCount(); j++ ) { @@ -708,7 +708,7 @@ namespace glabels painter->setPen( QPen( color ) ); } - foreach ( QTextLayout* layout, mEditorLayouts ) + for ( QTextLayout* layout : mEditorLayouts ) { layout->draw( painter, QPointF( 0, 0 ) ); } @@ -790,7 +790,7 @@ namespace glabels y = marginPts; break; } - foreach ( QTextLayout* layout, layouts ) + for ( QTextLayout* layout : layouts ) { for ( int j = 0; j < layout->lineCount(); j++ ) { @@ -802,7 +802,7 @@ namespace glabels // Draw layouts painter->setPen( QPen( color ) ); - foreach ( QTextLayout* layout, layouts ) + for ( QTextLayout* layout : layouts ) { layout->draw( painter, QPointF( 0, 0 ) ); } diff --git a/model/RawText.cpp b/model/RawText.cpp index 0cec7d2..21e71b9 100644 --- a/model/RawText.cpp +++ b/model/RawText.cpp @@ -75,7 +75,7 @@ namespace glabels { QString text; - foreach ( const Token& token, mTokens ) + for ( const Token& token : mTokens ) { if ( token.isField ) { diff --git a/model/XmlLabelCreator.cpp b/model/XmlLabelCreator.cpp index c9b2fe0..fdaae49 100644 --- a/model/XmlLabelCreator.cpp +++ b/model/XmlLabelCreator.cpp @@ -153,7 +153,7 @@ namespace glabels XmlUtil::setStringAttr( node, "id", "0" ); XmlUtil::setBoolAttr( node, "rotate", rotate ); - foreach ( ModelObject* object, objects ) + for ( ModelObject* object : objects ) { if ( auto* boxObject = dynamic_cast(object) ) { @@ -560,13 +560,13 @@ namespace glabels DataCache data( objects ); - foreach ( QString name, data.imageNames() ) + for ( QString name : data.imageNames() ) { QString fn = FileUtil::makeRelativeIfInDir( model->dir(), name ); createPngFileNode( node, fn, data.getImage( name ) ); } - foreach ( QString name, data.svgNames() ) + for ( QString name : data.svgNames() ) { QString fn = FileUtil::makeRelativeIfInDir( model->dir(), name ); createSvgFileNode( node, fn, data.getSvg( name ) ); diff --git a/model/XmlLabelParser.cpp b/model/XmlLabelParser.cpp index ea72a7b..60cd2dc 100644 --- a/model/XmlLabelParser.cpp +++ b/model/XmlLabelParser.cpp @@ -293,7 +293,7 @@ namespace glabels { model->setRotate( parseRotateAttr( child.toElement() ) ); auto list = parseObjectsNode( child.toElement(), model, data ); - foreach ( ModelObject* object, list ) + for ( ModelObject* object : list ) { model->addObject( object ); } diff --git a/model/XmlLabelParser_3.cpp b/model/XmlLabelParser_3.cpp index 075758b..9e6b51d 100644 --- a/model/XmlLabelParser_3.cpp +++ b/model/XmlLabelParser_3.cpp @@ -117,7 +117,7 @@ namespace glabels { label->setRotate( parseRotateAttr( childElement ) ); QList list = parseObjectsNode( childElement, data ); - foreach ( ModelObject* object, list ) + for ( ModelObject* object : list ) { label->addObject( object ); } diff --git a/translations/XmlStrings.cpp b/translations/XmlStrings.cpp index e812a54..7fe908e 100644 --- a/translations/XmlStrings.cpp +++ b/translations/XmlStrings.cpp @@ -83,7 +83,7 @@ int main( int argc, char *argv[] ) QStringList filenameList = app.arguments(); filenameList.removeFirst(); // Remove 0th argument, which is the command name - foreach ( QString filename, filenameList ) + for ( QString filename : filenameList ) { parseFile( filename ); } @@ -95,13 +95,13 @@ int main( int argc, char *argv[] ) out << "// Automatically generated with " << app.arguments().at(0) << Qt::endl; out << "//" << Qt::endl; out << "// Sources:" << Qt::endl; - foreach ( QString filename, filenameList ) + for ( QString filename : filenameList ) { out << "// " << filename << Qt::endl; } out << "//" << Qt::endl; - foreach ( QString string, stringList ) + for ( QString string : stringList ) { out << "QT_TRANSLATE_NOOP( \"XmlStrings\", \"" << string << "\" );" << Qt::endl; }