Disable use of Qt keyword foreach

OPM · Oct 24, 2024 · 0e9dd95 · 0e9dd95
1 parent 690758f
commit 0e9dd95
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 22 deletions.
diff --git a/ApplicationLibCode/Application/Tools/Cloud/RiaSumoConnector.cpp b/ApplicationLibCode/Application/Tools/Cloud/RiaSumoConnector.cpp
@@ -276,7 +276,7 @@ void RiaSumoConnector::parseEnsembleNames( QNetworkReply* reply, const SumoCaseI
         QJsonObject   aggregationColumnsObject = aggregationsObject["iteration_names"].toObject();
 
         QJsonArray bucketsArray = aggregationColumnsObject["buckets"].toArray();
-        foreach ( const QJsonValue& bucket, bucketsArray )
+        for ( const QJsonValue& bucket : bucketsArray )
         {
             QJsonObject bucketObj    = bucket.toObject();
             auto        ensembleName = bucketObj["key"].toString();
@@ -825,7 +825,7 @@ void RiaSumoConnector::parseCases( QNetworkReply* reply )
 
         m_cases.clear();
 
-        foreach ( const QJsonValue& value, hitsObjects )
+        for ( const QJsonValue& value : hitsObjects )
         {
             QJsonObject resultObj = value.toObject();
             QJsonObject sourceObj = resultObj["_source"].toObject();
@@ -931,7 +931,7 @@ void RiaSumoConnector::parseBlobIds( QNetworkReply*    reply,
         QJsonObject rootHits    = jsonObj["hits"].toObject();
         QJsonArray  hitsObjects = rootHits["hits"].toArray();
 
-        foreach ( const QJsonValue& value, hitsObjects )
+        for ( const QJsonValue& value : hitsObjects )
         {
             QJsonObject resultObj = value.toObject();
             QJsonObject sourceObj = resultObj["_source"].toObject();

diff --git a/ApplicationLibCode/FileInterface/RifPerforationIntervalReader.cpp b/ApplicationLibCode/FileInterface/RifPerforationIntervalReader.cpp
@@ -32,7 +32,7 @@ std::map<QString, std::vector<RifPerforationInterval>> RifPerforationIntervalRea
 {
     std::map<QString, std::vector<RifPerforationInterval>> perforationIntervals;
 
-    foreach ( QString filePath, filePaths )
+    for ( const QString& filePath : filePaths )
     {
         readFileIntoMap( filePath, &perforationIntervals );
     }

diff --git a/ApplicationLibCode/FileInterface/RifWellPathImporter.cpp b/ApplicationLibCode/FileInterface/RifWellPathImporter.cpp
@@ -161,7 +161,7 @@ RifWellPathImporter::WellData RifWellPathImporter::readJsonWellData( const QStri
     wellData.m_wellPathGeometry->setDatumElevation( datumElevation );
     wellData.m_name = jsonMap["name"].toString();
 
-    foreach ( QVariant point, pathList )
+    for ( const QVariant& point : pathList )
     {
         QMap<QString, QVariant> coordinateMap = point.toMap();
         cvf::Vec3d              vec3d( coordinateMap["east"].toDouble(),

diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.cpp
@@ -397,7 +397,7 @@ std::vector<RimWellLogLasFile*> RimWellPathCollection::addWellLogs( const QStrin
 
     std::vector<RimWellLogLasFile*> logFileInfos;
 
-    foreach ( QString filePath, filePaths )
+    for ( const QString& filePath : filePaths )
     {
         QString            errorMessage;
         RimWellLogLasFile* logFileInfo = RimWellLogLasFile::readWellLogFile( filePath, &errorMessage );

diff --git a/ApplicationLibCode/UnitTests/RifEclipseInputFileTools-Test.cpp b/ApplicationLibCode/UnitTests/RifEclipseInputFileTools-Test.cpp
@@ -25,7 +25,7 @@ TEST( RifEclipseInputFileToolsTest, FaultFaces )
                   << "i+";
 
         cvf::StructGridInterface::FaceEnum faceType;
-        foreach ( QString text, faceTexts )
+        for ( const QString& text : faceTexts )
         {
             faceType = RifEclipseInputFileTools::faceEnumFromText( text );
             EXPECT_EQ( cvf::StructGridInterface::POS_I, faceType );
@@ -40,7 +40,7 @@ TEST( RifEclipseInputFileToolsTest, FaultFaces )
                   << "i-";
 
         cvf::StructGridInterface::FaceEnum faceType;
-        foreach ( QString text, faceTexts )
+        for ( const QString& text : faceTexts )
         {
             faceType = RifEclipseInputFileTools::faceEnumFromText( text );
             EXPECT_EQ( cvf::StructGridInterface::NEG_I, faceType );
@@ -59,7 +59,7 @@ TEST( RifEclipseInputFileToolsTest, FaultFaces )
                   << "j+";
 
         cvf::StructGridInterface::FaceEnum faceType;
-        foreach ( QString text, faceTexts )
+        for ( const QString& text : faceTexts )
         {
             faceType = RifEclipseInputFileTools::faceEnumFromText( text );
             EXPECT_EQ( cvf::StructGridInterface::POS_J, faceType );
@@ -74,7 +74,7 @@ TEST( RifEclipseInputFileToolsTest, FaultFaces )
                   << "j-";
 
         cvf::StructGridInterface::FaceEnum faceType;
-        foreach ( QString text, faceTexts )
+        for ( const QString& text : faceTexts )
         {
             faceType = RifEclipseInputFileTools::faceEnumFromText( text );
             EXPECT_EQ( cvf::StructGridInterface::NEG_J, faceType );
@@ -93,7 +93,7 @@ TEST( RifEclipseInputFileToolsTest, FaultFaces )
                   << "k+";
 
         cvf::StructGridInterface::FaceEnum faceType;
-        foreach ( QString text, faceTexts )
+        for ( const QString& text : faceTexts )
         {
             faceType = RifEclipseInputFileTools::faceEnumFromText( text );
             EXPECT_EQ( cvf::StructGridInterface::POS_K, faceType );
@@ -108,7 +108,7 @@ TEST( RifEclipseInputFileToolsTest, FaultFaces )
                   << "k-";
 
         cvf::StructGridInterface::FaceEnum faceType;
-        foreach ( QString text, faceTexts )
+        for ( const QString& text : faceTexts )
         {
             faceType = RifEclipseInputFileTools::faceEnumFromText( text );
             EXPECT_EQ( cvf::StructGridInterface::NEG_K, faceType );
@@ -124,7 +124,7 @@ TEST( RifEclipseInputFileToolsTest, FaultFaces )
                   << " y /";
 
         cvf::StructGridInterface::FaceEnum faceType;
-        foreach ( QString text, faceTexts )
+        for ( const QString& text : faceTexts )
         {
             faceType = RifEclipseInputFileTools::faceEnumFromText( text );
             EXPECT_NE( cvf::StructGridInterface::NO_FACE, faceType );
@@ -139,7 +139,7 @@ TEST( RifEclipseInputFileToolsTest, FaultFaces )
                   << "   +k-  ";
 
         cvf::StructGridInterface::FaceEnum faceType;
-        foreach ( QString text, faceTexts )
+        for ( const QString& text : faceTexts )
         {
             faceType = RifEclipseInputFileTools::faceEnumFromText( text );
             EXPECT_EQ( cvf::StructGridInterface::NO_FACE, faceType );
@@ -155,7 +155,7 @@ TEST( RifEclipseInputFileToolsTest, FaultFaces )
                   << " i+  ";
 
         cvf::StructGridInterface::FaceEnum faceType;
-        foreach ( QString text, faceTexts )
+        for ( const QString& text : faceTexts )
         {
             faceType = RifEclipseInputFileTools::faceEnumFromText( text );
             EXPECT_EQ( cvf::StructGridInterface::POS_I, faceType );

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -563,6 +563,9 @@ set(QT_LIBRARIES
 )
 qt_standard_project_setup()
 
+# Disable use of foreach
+add_definitions(-DQT_NO_FOREACH)
+
 # Open GL
 find_package(OpenGL)
 

diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafNotificationCenter.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafNotificationCenter.cpp
@@ -72,7 +72,7 @@ void NotificationCenter::notifyObserversOfDataChange( caf::PdmObjectHandle* item
 {
     CAF_ASSERT( itemThatChanged );
 
-    foreach ( DataModelObserver* o, m_observers )
+    for ( DataModelObserver* o : m_observers )
     {
         o->handleModelNotification( itemThatChanged );
     }
@@ -83,7 +83,7 @@ void NotificationCenter::notifyObserversOfDataChange( caf::PdmObjectHandle* item
 //--------------------------------------------------------------------------------------------------
 void NotificationCenter::notifyObservers()
 {
-    foreach ( DataModelObserver* o, m_observers )
+    for ( DataModelObserver* o : m_observers )
     {
         o->handleModelNotification( nullptr );
     }
@@ -94,7 +94,7 @@ void NotificationCenter::notifyObservers()
 //--------------------------------------------------------------------------------------------------
 void NotificationCenter::notifyObserversOfSelectionChange()
 {
-    foreach ( DataModelObserver* o, m_observers )
+    for ( DataModelObserver* o : m_observers )
     {
         o->handleModelSelectionChange();
     }

diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUniqueIdValidator.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUniqueIdValidator.cpp
@@ -88,7 +88,7 @@ QValidator::State PdmUniqueIdValidator::validate( QString& currentString, int& )
 
     if ( m_usedIds.find( currentValue ) != m_usedIds.end() )
     {
-        foreach ( QWidget* widget, QApplication::topLevelWidgets() )
+        for ( QWidget* widget : QApplication::topLevelWidgets() )
         {
             if ( widget->inherits( "QMainWindow" ) )
             {

diff --git a/Fwk/AppFwk/cafUserInterface/cafQTreeViewStateSerializer.cpp b/Fwk/AppFwk/cafUserInterface/cafQTreeViewStateSerializer.cpp
@@ -107,7 +107,7 @@ QModelIndex caf::QTreeViewStateSerializer::getModelIndexFromString( QAbstractIte
 
     QModelIndex mi;
 
-    foreach ( QString modelIndexString, modelIndexStringList )
+    for ( const QString& modelIndexString : modelIndexStringList )
     {
         QStringList items = modelIndexString.split( " " );
 

diff --git a/Fwk/VizFwk/LibGuiQt/cvfqtUtils.cpp b/Fwk/VizFwk/LibGuiQt/cvfqtUtils.cpp
@@ -119,7 +119,7 @@ std::vector<cvf::String> Utils::toStringVector(const QStringList& stringList)
 {
     std::vector<cvf::String> strVec;
 
-    foreach (QString s, stringList)
+    for (const QString& s : stringList)
     {
         strVec.push_back(toString(s));
     }
@@ -136,7 +136,7 @@ QStringList Utils::toQStringList(const std::vector<cvf::String>& stringVector)
 {
     QStringList strList;
 
-    foreach (cvf::String s, stringVector)
+    for (const cvf::String& s : stringVector)
     {
         strList.push_back(toQString(s));
     }