diff --git a/ApplicationLibCode/Application/Tools/RiaGitDiff.cpp b/ApplicationLibCode/Application/Tools/RiaGitDiff.cpp index 332e9712f4..6df8a4ea3b 100644 --- a/ApplicationLibCode/Application/Tools/RiaGitDiff.cpp +++ b/ApplicationLibCode/Application/Tools/RiaGitDiff.cpp @@ -27,6 +27,10 @@ #ifdef _MSC_VER #pragma warning( disable : 4996 ) #endif +#ifdef __GNUC__ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Application/Tools/RiaImageFileCompare.cpp b/ApplicationLibCode/Application/Tools/RiaImageFileCompare.cpp index 66c86da047..d4f6766aad 100644 --- a/ApplicationLibCode/Application/Tools/RiaImageFileCompare.cpp +++ b/ApplicationLibCode/Application/Tools/RiaImageFileCompare.cpp @@ -23,6 +23,9 @@ #ifdef _MSC_VER #pragma warning( disable : 4996 ) #endif +#ifdef __GNUC__ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif //================================================================================================== // diff --git a/ApplicationLibCode/Application/Tools/RiaTextFileCompare.cpp b/ApplicationLibCode/Application/Tools/RiaTextFileCompare.cpp index 141af981c7..d19894ce2b 100644 --- a/ApplicationLibCode/Application/Tools/RiaTextFileCompare.cpp +++ b/ApplicationLibCode/Application/Tools/RiaTextFileCompare.cpp @@ -26,6 +26,9 @@ #ifdef _MSC_VER #pragma warning( disable : 4996 ) #endif +#ifdef __GNUC__ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif //-------------------------------------------------------------------------------------------------- /// diff --git a/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswCompletionsImpl.cpp b/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswCompletionsImpl.cpp index 39f1f55ec1..d200324805 100644 --- a/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswCompletionsImpl.cpp +++ b/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswCompletionsImpl.cpp @@ -676,9 +676,6 @@ void RicWellPathExportMswCompletionsImpl::generateFishbonesMswExportInfo( double maxSegmentLength = enableSegmentSplitting ? mswParameters->maxSegmentLength() : std::numeric_limits::infinity(); - double subStartMD = wellPath->fishbonesCollection()->startMD(); - double subStartTVD = RicMswTableFormatterTools::tvdFromMeasuredDepth( branch->wellPath(), subStartMD ); - auto unitSystem = exportInfo->unitSystem(); for ( RimFishbones* subs : fishbonesSubs ) @@ -808,9 +805,6 @@ void RicWellPathExportMswCompletionsImpl::generateFishbonesMswExportInfo( segmentOnParentBranch->addCompletion( std::move( icdCompletion ) ); } } - - subStartMD = subEndMD; - subStartTVD = subEndTVD; } } exportInfo->setHasSubGridIntersections( exportInfo->hasSubGridIntersections() || foundSubGridIntersections ); diff --git a/ApplicationLibCode/FileInterface/RifFileParseTools.cpp b/ApplicationLibCode/FileInterface/RifFileParseTools.cpp index c355bb6f24..1e26e0e32e 100644 --- a/ApplicationLibCode/FileInterface/RifFileParseTools.cpp +++ b/ApplicationLibCode/FileInterface/RifFileParseTools.cpp @@ -22,6 +22,10 @@ #ifdef _MSC_VER #pragma warning( disable : 4996 ) #endif +#ifdef __GNUC__ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/FileInterface/RifRftSegment.cpp b/ApplicationLibCode/FileInterface/RifRftSegment.cpp index 2bf2fb5244..f44c852fe3 100644 --- a/ApplicationLibCode/FileInterface/RifRftSegment.cpp +++ b/ApplicationLibCode/FileInterface/RifRftSegment.cpp @@ -199,7 +199,7 @@ const RifRftSegmentData* RifRftSegment::segmentData( int segmentNumber ) const //-------------------------------------------------------------------------------------------------- const RifRftSegmentData* RifRftSegment::segmentDataByIndex( int segmentIndex ) const { - CVF_ASSERT( segmentIndex < m_topology.size() ); + CVF_ASSERT( segmentIndex < static_cast( m_topology.size() ) ); return &( m_topology[segmentIndex] ); } diff --git a/ApplicationLibCode/ProjectDataModel/ProcessControl/RimProcess.cpp b/ApplicationLibCode/ProjectDataModel/ProcessControl/RimProcess.cpp index 815ead8a87..b1f79aecd1 100644 --- a/ApplicationLibCode/ProjectDataModel/ProcessControl/RimProcess.cpp +++ b/ApplicationLibCode/ProjectDataModel/ProcessControl/RimProcess.cpp @@ -29,6 +29,9 @@ #ifdef _MSC_VER #pragma warning( disable : 4996 ) #endif +#ifdef __GNUC__ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif CAF_PDM_SOURCE_INIT( RimProcess, "RimProcess" ); @@ -146,7 +149,6 @@ bool RimProcess::execute() QObject::connect( proc, SIGNAL( started() ), m_monitor, SLOT( started() ) ); bool retval = false; - proc->start( cmd ); if ( proc->waitForStarted( -1 ) ) { diff --git a/ApplicationLibCode/ReservoirDataModel/RigCaseCellResultsData.cpp b/ApplicationLibCode/ReservoirDataModel/RigCaseCellResultsData.cpp index 39c9c88f28..322749bf67 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigCaseCellResultsData.cpp +++ b/ApplicationLibCode/ReservoirDataModel/RigCaseCellResultsData.cpp @@ -2901,7 +2901,7 @@ void RigCaseCellResultsData::computeCompletionTypeForTimeStep( size_t timeStep ) // If permeabilities are generated by calculations, make sure that generated data is calculated // See RicExportFractureCompletionsImpl::generateCompdatValues() - for ( const QString& propertyName : { "PERMX", "PERMY", "PERMZ" } ) + for ( const QString propertyName : { "PERMX", "PERMY", "PERMZ" } ) { for ( auto userCalculation : RimProject::current()->gridCalculationCollection()->calculations() ) { diff --git a/ApplicationLibCode/ReservoirDataModel/RigWbsParameter.h b/ApplicationLibCode/ReservoirDataModel/RigWbsParameter.h index d0cb03c6f1..060661d757 100644 --- a/ApplicationLibCode/ReservoirDataModel/RigWbsParameter.h +++ b/ApplicationLibCode/ReservoirDataModel/RigWbsParameter.h @@ -99,7 +99,8 @@ private: SourceAddress( QString primary = "", QString secondary = "", QString units = RiaWellLogUnitTools::noUnitString() ) - : primary( primary ) + : resType( RIG_NODAL ) + , primary( primary ) , secondary( secondary ) , units( units ) { diff --git a/ApplicationLibCode/UserInterface/AnalysisPlots/RiuGroupedBarChartBuilder.cpp b/ApplicationLibCode/UserInterface/AnalysisPlots/RiuGroupedBarChartBuilder.cpp index e094201924..42d9a8b81d 100644 --- a/ApplicationLibCode/UserInterface/AnalysisPlots/RiuGroupedBarChartBuilder.cpp +++ b/ApplicationLibCode/UserInterface/AnalysisPlots/RiuGroupedBarChartBuilder.cpp @@ -100,8 +100,7 @@ class RiuBarChartScaleDraw : public QwtScaleDraw public: struct RiuBarChartTick { - RiuBarChartTick() = default; - RiuBarChartTick( const RiuBarChartTick& rhs ) = default; + RiuBarChartTick() = default; RiuBarChartTick( QwtScaleDiv::TickType tickType, const QString& label, bool oppositeSide = false ) : tickType( tickType ) , label( label ) diff --git a/ApplicationLibCode/UserInterface/RiuMdiSubWindow.h b/ApplicationLibCode/UserInterface/RiuMdiSubWindow.h index ea056737ec..4e69734269 100644 --- a/ApplicationLibCode/UserInterface/RiuMdiSubWindow.h +++ b/ApplicationLibCode/UserInterface/RiuMdiSubWindow.h @@ -25,7 +25,7 @@ class RiuMdiSubWindow : public QMdiSubWindow { Q_OBJECT public: - RiuMdiSubWindow( QWidget* parent = nullptr, Qt::WindowFlags flags = nullptr ); + RiuMdiSubWindow( QWidget* parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags() ); ~RiuMdiSubWindow() override; diff --git a/Fwk/AppFwk/cafViewer/cafOpenGLWidget.h b/Fwk/AppFwk/cafViewer/cafOpenGLWidget.h index 0da8fe54cc..7237990f98 100644 --- a/Fwk/AppFwk/cafViewer/cafOpenGLWidget.h +++ b/Fwk/AppFwk/cafViewer/cafOpenGLWidget.h @@ -58,7 +58,7 @@ public: const QGLFormat& format, QWidget* parent, OpenGLWidget* shareWidget = nullptr, - Qt::WindowFlags f = nullptr ); + Qt::WindowFlags f = Qt::WindowFlags() ); OpenGLWidget( OpenGLWidget* shareWidget, QWidget* parent, Qt::WindowFlags f = Qt::WindowFlags() ); cvf::OpenGLContext* cvfOpenGLContext() const;