Fix build for Qt6.10.1 and add Windows build for Qt 6.10

.github/workflows/ResInsightWithCache.yml

@@ -34,6 +34,20 @@ jobs:
               qt-version: 6.6.3,
               ri-unit-test-path: "ResInsight-tests",
             }
+          - {
+              name: "Windows_2022_qt_610",
+              os: windows-2022,
+              cc: "cl",
+              cxx: "cl",
+              build-python-module: false,
+              execute-unit-tests: true,
+              execute-pytests: false,
+              unity-build: true,
+              publish-to-pypi: false,
+              vcpkg-bootstrap: bootstrap-vcpkg.bat,
+              qt-version: 6.10.1,
+              ri-unit-test-path: "ResInsight-tests",
+            }
           - {
               name: "Ubuntu 24.04 gcc",
               os: ubuntu-24.04,

ApplicationLibCode/CommandFileInterface/RicfCreateMultipleFractures.cpp

@@ -101,14 +101,14 @@ caf::PdmScriptResponse RicfCreateMultipleFractures::execute()
 
     if ( !gridCase )
     {
-        QString error = QString( "createMultipleFractures: Could not find case with ID %1" ).arg( m_caseId );
+        QString error = QString( "createMultipleFractures: Could not find case with ID %1" ).arg( m_caseId() );
         RiaLogging::error( error );
         return caf::PdmScriptResponse( caf::PdmScriptResponse::COMMAND_ERROR, error );
     }
 
     if ( !fractureTemplate )
     {
-        QString error = QString( "createMultipleFractures: Could not find fracture template with ID %1" ).arg( m_templateId );
+        QString error = QString( "createMultipleFractures: Could not find fracture template with ID %1" ).arg( m_templateId() );
         RiaLogging::error( error );
         return caf::PdmScriptResponse( caf::PdmScriptResponse::COMMAND_ERROR, error );
     }

ApplicationLibCode/CommandFileInterface/RicfExportPropertyInViews.cpp

@@ -129,7 +129,7 @@ caf::PdmScriptResponse RicfExportPropertyInViews::execute()
         if ( resultAccessor.isNull() )
         {
             QString warning = QString( "exportProperty: Could not find property. Case ID %1, time step %2, property '%3'" )
-                                  .arg( m_caseId )
+                                  .arg( m_caseId() )
                                   .arg( view->currentTimeStep() )
                                   .arg( propertyName );
             RiaLogging::warning( warning );

ApplicationLibCode/CommandFileInterface/RicfExportVisibleCells.cpp

@@ -94,8 +94,10 @@ caf::PdmScriptResponse RicfExportVisibleCells::execute()
     }
     if ( !eclipseView )
     {
-        QString error(
-            QString( "exportVisibleCells: Could not find view of id %1 or named '%2' in case ID %3" ).arg( m_viewId ).arg( m_viewName ).arg( m_caseId ) );
+        QString error( QString( "exportVisibleCells: Could not find view of id %1 or named '%2' in case ID %3" )
+                           .arg( m_viewId() )
+                           .arg( m_viewName() )
+                           .arg( m_caseId() ) );
         RiaLogging::error( error );
         return caf::PdmScriptResponse( caf::PdmScriptResponse::COMMAND_ERROR, error );
     }

ApplicationLibCode/CommandFileInterface/RicfScaleFractureTemplate.cpp

@@ -70,7 +70,7 @@ caf::PdmScriptResponse RicfScaleFractureTemplate::execute()
 
     if ( !templ )
     {
-        QString error = QString( "scaleFractureTemplate: Fracture template not found. Id=%1" ).arg( m_id );
+        QString error = QString( "scaleFractureTemplate: Fracture template not found. Id=%1" ).arg( m_id() );
         RiaLogging::error( error );
         return caf::PdmScriptResponse( caf::PdmScriptResponse::COMMAND_ERROR, error );
     }

ApplicationLibCode/CommandFileInterface/RicfSetFractureContainment.cpp

@@ -66,7 +66,7 @@ caf::PdmScriptResponse RicfSetFractureContainment::execute()
 
     if ( !templ )
     {
-        QString error = QString( "setFractureContainment: Fracture template not found. Id=%1" ).arg( m_id );
+        QString error = QString( "setFractureContainment: Fracture template not found. Id=%1" ).arg( m_id() );
         RiaLogging::error( error );
         return caf::PdmScriptResponse( caf::PdmScriptResponse::COMMAND_ERROR, error );
     }

ApplicationLibCode/ProjectDataModel/CellFilters/RimCellRangeFilter.cpp

@@ -102,21 +102,21 @@ QString RimCellRangeFilter::fullName() const
     {
         if ( ( cellCountI == 1 ) && ( cellCountJ > 1 ) && ( cellCountK > 1 ) )
         {
-            return QString( "%1-slice %2" ).arg( axisI ).arg( startIndexI );
+            return QString( "%1-slice %2" ).arg( axisI ).arg( startIndexI() );
         }
         else if ( ( cellCountJ == 1 ) && ( cellCountI > 1 ) && ( cellCountK > 1 ) )
         {
-            return QString( "%1-slice %2" ).arg( axisJ ).arg( startIndexJ );
+            return QString( "%1-slice %2" ).arg( axisJ ).arg( startIndexJ() );
         }
         else if ( ( cellCountK == 1 ) && ( cellCountI > 1 ) && ( cellCountJ > 1 ) )
         {
-            return QString( "%1-slice %2" ).arg( axisK ).arg( startIndexK );
+            return QString( "%1-slice %2" ).arg( axisK ).arg( startIndexK() );
         }
         else
         {
-            QString irange = QString( "%1=%2-%3" ).arg( axisI ).arg( startIndexI ).arg( startIndexI + cellCountI - 1 );
-            QString jrange = QString( "%1=%2-%3" ).arg( axisJ ).arg( startIndexJ ).arg( startIndexJ + cellCountJ - 1 );
-            QString krange = QString( "%1=%2-%3" ).arg( axisK ).arg( startIndexK ).arg( startIndexK + cellCountK - 1 );
+            QString irange = QString( "%1=%2-%3" ).arg( axisI ).arg( startIndexI() ).arg( startIndexI + cellCountI - 1 );
+            QString jrange = QString( "%1=%2-%3" ).arg( axisJ ).arg( startIndexJ() ).arg( startIndexJ + cellCountJ - 1 );
+            QString krange = QString( "%1=%2-%3" ).arg( axisK ).arg( startIndexK() ).arg( startIndexK + cellCountK - 1 );
             return QString( "%1 %2 %3" ).arg( irange, jrange, krange );
         }
     };

ApplicationLibCode/ProjectDataModel/Completions/RimDiameterRoughnessInterval.cpp

@@ -297,7 +297,7 @@ void RimDiameterRoughnessInterval::updateConnectedEditors()
 //--------------------------------------------------------------------------------------------------
 QString RimDiameterRoughnessInterval::generateDisplayLabel() const
 {
-    return QString( "MD %.1f-%.1f: D=%.3fm, R=%1em" ).arg( m_startMD ).arg( m_endMD ).arg( m_diameter ).arg( m_roughnessFactor );
+    return QString( "MD %.1f-%.1f: D=%.3fm, R=%1em" ).arg( m_startMD() ).arg( m_endMD() ).arg( m_diameter() ).arg( m_roughnessFactor() );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplate.cpp

@@ -612,7 +612,7 @@ QString RimFractureTemplate::dFactorSummary() const
             auto wellRadius = f->nonDarcyProperties().eqWellRadius;
             text += indentedText( QString( "rw : %1" ).arg( wellRadius ) );
 
-            auto mu = m_gasViscosity;
+            auto mu = m_gasViscosity();
             text += indentedText( QString( "μ  : %1" ).arg( mu ) );
         }
         text += "</pre>";

ApplicationLibCode/ProjectDataModel/Completions/RimPerforationInterval.cpp

@@ -332,7 +332,7 @@ void RimPerforationInterval::fieldChangedByUi( const caf::PdmFieldHandle* change
 //--------------------------------------------------------------------------------------------------
 void RimPerforationInterval::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/ )
 {
-    setName( QString( "%1 - %2" ).arg( m_startMD ).arg( m_endMD ) );
+    setName( QString( "%1 - %2" ).arg( m_startMD() ).arg( m_endMD() ) );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp

@@ -104,7 +104,7 @@ void RimStimPlanFractureTemplate::setDefaultsBasedOnFile()
     computeDepthOfWellPathAtFracture();
     computePerforationLength();
 
-    RiaLogging::info( QString( "Setting well/fracture intersection depth at %1" ).arg( m_wellPathDepthAtFracture ) );
+    RiaLogging::info( QString( "Setting well/fracture intersection depth at %1" ).arg( m_wellPathDepthAtFracture() ) );
 
     m_activeTimeStepIndex = static_cast<int>( m_stimPlanFractureDefinitionData->totalNumberTimeSteps() - 1 );
 

ApplicationLibCode/ProjectDataModel/Completions/RimThermalFractureTemplate.cpp

@@ -102,7 +102,7 @@ void RimThermalFractureTemplate::setDefaultsBasedOnFile()
     computeDepthOfWellPathAtFracture();
     computePerforationLength();
 
-    RiaLogging::info( QString( "Setting well/fracture intersection depth at %1" ).arg( m_wellPathDepthAtFracture ) );
+    RiaLogging::info( QString( "Setting well/fracture intersection depth at %1" ).arg( m_wellPathDepthAtFracture() ) );
 
     m_activeTimeStepIndex = static_cast<int>( m_fractureDefinitionData->numTimeSteps() - 1 );
 

ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotRegressionCurve.cpp

@@ -541,8 +541,8 @@ void RimGridCrossPlotRegressionCurve::updateRectAnnotation()
         {
             QString textLines;
             textLines += QString( "<b>Case:</b> %1<br>" ).arg( dataSet->caseNameString() );
-            textLines += QString( "<b>%1:</b> %2 - %3<br>" ).arg( dataSet->xAxisName() ).arg( m_minRangeX ).arg( m_maxRangeX );
-            textLines += QString( "<b>%1:</b> %2 - %3<br>" ).arg( dataSet->yAxisName() ).arg( m_minRangeY ).arg( m_maxRangeY );
+            textLines += QString( "<b>%1:</b> %2 - %3<br>" ).arg( dataSet->xAxisName() ).arg( m_minRangeX() ).arg( m_maxRangeX() );
+            textLines += QString( "<b>%1:</b> %2 - %3<br>" ).arg( dataSet->yAxisName() ).arg( m_minRangeY() ).arg( m_maxRangeY() );
             annotation->setText( textLines );
         }
     }

ApplicationLibCode/ProjectDataModel/Jobs/RimOpmFlowJobSettings.cpp

@@ -291,7 +291,7 @@ QStringList RimOpmFlowJobSettings::commandLineOptions( QString resInsightWorkDir
 {
     QStringList options;
 
-    options << QString( "--threads-per-process=%1" ).arg( m_threadsPerProcess );
+    options << QString( "--threads-per-process=%1" ).arg( m_threadsPerProcess() );
 
     QString trueOrFalse = m_enableEsmry ? "true" : "false";
     options << "--enable-esmry=" + trueOrFalse;

ApplicationLibCode/ProjectDataModel/ProcessControl/RimProcess.cpp

@@ -176,7 +176,7 @@ bool RimProcess::start( bool enableStdOut, bool enableStdErr )
     m_qProcess  = new QProcess();
     QString cmd = commandLine();
 
-    if ( m_enableLogging ) RiaLogging::info( QString( "Start process %1: %2" ).arg( m_id ).arg( cmd ) );
+    if ( m_enableLogging ) RiaLogging::info( QString( "Start process %1: %2" ).arg( m_id() ).arg( cmd ) );
 
     m_monitor->clearStdOutErr();
 
@@ -200,7 +200,7 @@ bool RimProcess::start( bool enableStdOut, bool enableStdErr )
     auto error = m_qProcess->errorString();
     if ( !m_qProcess->waitForStarted( -1 ) )
     {
-        RiaLogging::error( QString( "Failed to start process %1. %2." ).arg( m_id ).arg( error ) );
+        RiaLogging::error( QString( "Failed to start process %1. %2." ).arg( m_id() ).arg( error ) );
         return false;
     }
 

ApplicationLibCode/ProjectDataModel/Rim3dView.cpp

@@ -372,7 +372,7 @@ void Rim3dView::updateViewWidgetAfterCreation()
 void Rim3dView::setId( int id )
 {
     m_id                  = id;
-    QString viewIdTooltip = QString( "View id: %1" ).arg( m_id );
+    QString viewIdTooltip = QString( "View id: %1" ).arg( m_id() );
     this->setUiToolTip( viewIdTooltip );
 }
 

ApplicationLibCode/ProjectDataModel/RimColorLegendItem.cpp

@@ -158,7 +158,7 @@ void RimColorLegendItem::defineEditorAttribute( const caf::PdmFieldHandle* field
 //--------------------------------------------------------------------------------------------------
 QString RimColorLegendItem::itemName() const
 {
-    return QString( "%1" ).arg( m_categoryValue, 2, 10, QChar( '0' ) ) + " " + m_categoryName;
+    return QString( "%1" ).arg( m_categoryValue(), 2, 10, QChar( '0' ) ) + " " + m_categoryName;
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/ProjectDataModel/RimEclipseGeometrySelectionItem.cpp

@@ -107,7 +107,7 @@ QString RimEclipseGeometrySelectionItem::geometrySelectionText() const
     }
 
     text += ", ";
-    text += QString( "Grid index %1" ).arg( m_gridIndex );
+    text += QString( "Grid index %1" ).arg( m_gridIndex() );
     text += ", ";
     text += RigTimeHistoryResultAccessor::geometrySelectionText( m_eclipseCase->eclipseCaseData(), m_gridIndex, m_cellIndex );
 

ApplicationLibCode/ProjectDataModel/RimPlotWindow.cpp

@@ -405,7 +405,7 @@ void RimPlotWindow::updateWindowVisibility()
 void RimPlotWindow::setId( int id )
 {
     m_id                  = id;
-    QString viewIdTooltip = QString( "Plot id: %1" ).arg( m_id );
+    QString viewIdTooltip = QString( "Plot id: %1" ).arg( m_id() );
     setUiToolTip( viewIdTooltip );
 }
 

ApplicationLibCode/ProjectDataModel/Seismic/RimSeismicSection.cpp

@@ -1093,15 +1093,15 @@ QString RimSeismicSection::fullName() const
     }
     else if ( m_type() == RiaDefines::SeismicSectionType::SS_INLINE )
     {
-        prefix = QString( "Inline [%1]" ).arg( m_inlineIndex );
+        prefix = QString( "Inline [%1]" ).arg( m_inlineIndex() );
     }
     else if ( m_type() == RiaDefines::SeismicSectionType::SS_XLINE )
     {
-        prefix = QString( "Xline [%1]" ).arg( m_xlineIndex );
+        prefix = QString( "Xline [%1]" ).arg( m_xlineIndex() );
     }
     else if ( m_type() == RiaDefines::SeismicSectionType::SS_DEPTHSLICE )
     {
-        prefix = QString( "Depth Slice [%1]" ).arg( m_depthIndex );
+        prefix = QString( "Depth Slice [%1]" ).arg( m_depthIndex() );
     }
 
     if ( !name.isEmpty() ) return QString( "%1 - %2" ).arg( prefix ).arg( name );

ApplicationLibCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScaling.cpp

@@ -130,10 +130,10 @@ RigEclipseCaseData* RimElasticPropertyScaling::getEclipseCaseData()
 void RimElasticPropertyScaling::updateAutoName()
 {
     QString name = QString( "%1/%2 - %3: %4" )
-                       .arg( m_formation )
-                       .arg( m_facies )
+                       .arg( m_formation() )
+                       .arg( m_facies() )
                        .arg( caf::AppEnum<RiaDefines::CurveProperty>::uiText( m_property() ) )
-                       .arg( m_scale );
+                       .arg( m_scale() );
     setName( name );
 }
 

ApplicationLibCode/ProjectDataModel/VerticalFlowPerformance/RimVfpTable.cpp

@@ -111,7 +111,7 @@ void RimVfpTable::updateObjectName()
         if ( m_tableNumber >= 0 )
         {
             if ( !name.isEmpty() ) name += " - ";
-            name += QString( "Table %1" ).arg( m_tableNumber );
+            name += QString( "Table %1" ).arg( m_tableNumber() );
         }
 
         if ( m_tableType() == RimVfpDefines::TableType::INJECTION )

ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp

@@ -1160,7 +1160,7 @@ QString RimWellLogExtractionCurve::createCurveAutoName()
         // Add part to curve name for geo mech cases with more than 1 part
         if ( geomCase && geomCase->geoMechData() && geomCase->geoMechData()->femParts() && geomCase->geoMechData()->femParts()->partCount() > 1 )
         {
-            generatedCurveName.push_back( QString( "Part %1" ).arg( m_geomPartId ) );
+            generatedCurveName.push_back( QString( "Part %1" ).arg( m_geomPartId() ) );
         }
     }
 

ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettings.cpp

@@ -234,7 +234,7 @@ void RimWellIASettings::defineEditorAttribute( const caf::PdmFieldHandle* field,
 //--------------------------------------------------------------------------------------------------
 QString RimWellIASettings::fullName() const
 {
-    return QString( "%1 - [%2 - %3]" ).arg( name() ).arg( m_startMD ).arg( m_endMD );
+    return QString( "%1 - [%2 - %3]" ).arg( name() ).arg( m_startMD() ).arg( m_endMD() );
 }
 
 //--------------------------------------------------------------------------------------------------