diff --git a/ApplicationLibCode/Application/RiaPreferences.cpp b/ApplicationLibCode/Application/RiaPreferences.cpp index 752184dcd2..10c2fec676 100644 --- a/ApplicationLibCode/Application/RiaPreferences.cpp +++ b/ApplicationLibCode/Application/RiaPreferences.cpp @@ -487,8 +487,6 @@ void RiaPreferences::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& scriptGroup->add( &scriptDirectories ); scriptGroup->add( &m_maxScriptFoldersDepth ); scriptGroup->add( &scriptEditorExecutable ); - - m_opmPreferences()->appendItems( uiOrdering ); } else if ( uiConfigName == RiaPreferences::tabNameOpmFlow() ) { diff --git a/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswCompletionsImpl.cpp b/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswCompletionsImpl.cpp index be016bb1cd..4a75e530d8 100644 --- a/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswCompletionsImpl.cpp +++ b/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswCompletionsImpl.cpp @@ -190,12 +190,6 @@ void exportSplitMswData( const RicExportCompletionDataSettingsUi& exportSettings }; // namespace internal -namespace internal -{ -constexpr double VALVE_SEGMENT_LENGTH = 0.1; - -}; // namespace internal - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/FileInterface/RifEclipseSummaryTools.h b/ApplicationLibCode/FileInterface/RifEclipseSummaryTools.h index 5c66bdca0e..bbf090b7ed 100644 --- a/ApplicationLibCode/FileInterface/RifEclipseSummaryTools.h +++ b/ApplicationLibCode/FileInterface/RifEclipseSummaryTools.h @@ -83,7 +83,6 @@ public: // Do not use this method directly, use the overload that infers the useOpmReader from Preferences // This method is public to be able to call it from unit tests static std::vector getRestartFileNames( const QString& headerFileName, bool useOpmReader, std::vector& warnings ); - static QString getRestartFilePath( const QString& headerFileName, const QString& restartCaseNameFromFile ); private: static void findSummaryFiles( const QString& inputFile, QString* headerFile, QStringList* dataFiles ); diff --git a/ApplicationLibCode/FileInterface/RifReaderEclipseOutput.cpp b/ApplicationLibCode/FileInterface/RifReaderEclipseOutput.cpp index 802aa68a86..9993237f37 100644 --- a/ApplicationLibCode/FileInterface/RifReaderEclipseOutput.cpp +++ b/ApplicationLibCode/FileInterface/RifReaderEclipseOutput.cpp @@ -407,12 +407,6 @@ bool RifReaderEclipseOutput::open( const QString& fileName, RigEclipseCaseData* eclipseCaseData->mainGrid()->invalidateCellsAboveI( iLimitFromEdfm - 1 /* zero based index */ ); } - auto iLimitFromEdfm = RifEdfmTools::checkForEdfmLimitI( fileName ); - if ( iLimitFromEdfm > 0 ) - { - eclipseCaseData->mainGrid()->invalidateCellsAboveI( iLimitFromEdfm - 1 /* zero based index */ ); - } - { auto task = progress.task( "Reading faults", 10 ); diff --git a/ApplicationLibCode/ProjectDataModel/RiaOpmParserTools.cpp b/ApplicationLibCode/ProjectDataModel/RiaOpmParserTools.cpp index aecd764dab..671ccbcdae 100644 --- a/ApplicationLibCode/ProjectDataModel/RiaOpmParserTools.cpp +++ b/ApplicationLibCode/ProjectDataModel/RiaOpmParserTools.cpp @@ -104,8 +104,6 @@ std::tuple, std::vector unitSystemFromTables; - std::optional unitSystemFromTables; - try { // The parser is not robust when looking for a small number of keywords. Several keywords is added as parsing error occurs. diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.h index 1a5937caa5..6b7ed3e7b9 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.h @@ -158,8 +158,6 @@ private: void updateReadOnlyState(); - void updateReadOutSettings(); - std::pair adjustedMinMax( const RimPlotAxisProperties* axis, double min, double max ) const; RimSummaryPlotReadOut* activeReadoutSettings() const; diff --git a/ApplicationLibCode/ProjectDataModel/VerticalFlowPerformance/RimVfpTableData.cpp b/ApplicationLibCode/ProjectDataModel/VerticalFlowPerformance/RimVfpTableData.cpp index 41430072a0..0f798baa43 100644 --- a/ApplicationLibCode/ProjectDataModel/VerticalFlowPerformance/RimVfpTableData.cpp +++ b/ApplicationLibCode/ProjectDataModel/VerticalFlowPerformance/RimVfpTableData.cpp @@ -27,8 +27,6 @@ #include "RimVfpTable.h" -#include - #include "cafCmdFeatureMenuBuilder.h" #include diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogChannelData.h b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogChannelData.h index 5ea25b20c4..72651c55ec 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogChannelData.h +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogChannelData.h @@ -20,7 +20,6 @@ #include "cafPdmField.h" #include "cafPdmObject.h" -#include "cafPdmPtrField.h" #include #include diff --git a/ApplicationLibCode/UserInterface/RiuRelativePermeabilityPlotUpdater.cpp b/ApplicationLibCode/UserInterface/RiuRelativePermeabilityPlotUpdater.cpp index 010c27c87b..2bafb32f93 100644 --- a/ApplicationLibCode/UserInterface/RiuRelativePermeabilityPlotUpdater.cpp +++ b/ApplicationLibCode/UserInterface/RiuRelativePermeabilityPlotUpdater.cpp @@ -21,8 +21,6 @@ #include "RiaLogging.h" #include "RiaResultNames.h" -#include "RiaResultNames.h" - #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" #include "RigEclipseCaseData.h" diff --git a/CMakeLists.txt b/CMakeLists.txt index b9ea1234e8..434f3532e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -772,16 +772,6 @@ else() list(APPEND THIRD_PARTY_LIBRARIES pugixml::static) endif() -# ############################################################################## -# pugixml -# ############################################################################## -find_package(pugixml CONFIG REQUIRED) -if(MSVC) - list(APPEND THIRD_PARTY_LIBRARIES pugixml::pugixml) -else() - list(APPEND THIRD_PARTY_LIBRARIES pugixml::static) -endif() - # ############################################################################## # nonstd::type-lite # ##############################################################################