OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Janitor : Several fixes by clang-tidy and use of clang compiler

Browse Source
This commit is contained in:
Magne Sjaastad
2021-04-05 18:18:34 +02:00
parent b01569869a
commit d754ef4705
36 changed files with 185 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationLibCode/FileInterface/RifSummaryCaseRestartSelector.cpp
View File

@@ -220,7 +220,7 @@ void RifSummaryCaseRestartSelector::determineFilesToImportByAskingUser( const st
{
RifSummaryCaseFileResultInfo resultFileInfo( file,
result.summaryImportOption ==
RicSummaryCaseRestartDialog::IMPORT_ALL );
RicSummaryCaseRestartDialog::ImportOptions::IMPORT_ALL );
if ( !vectorContains( m_summaryFileInfos, resultFileInfo ) )
{
m_summaryFileInfos.push_back( resultFileInfo );
@@ -275,15 +275,15 @@ void RifSummaryCaseRestartSelector::determineFilesToImportUsingPrefs( const std:
if ( handleSummaryFile )
{
if ( defaultSummaryImportMode == RicSummaryCaseRestartDialog::IMPORT_ALL )
if ( defaultSummaryImportMode == RicSummaryCaseRestartDialog::ImportOptions::IMPORT_ALL )
{
m_summaryFileInfos.push_back( RifSummaryCaseFileResultInfo( initialSummaryFile, true ) );
}
else if ( defaultSummaryImportMode == RicSummaryCaseRestartDialog::NOT_IMPORT )
else if ( defaultSummaryImportMode == RicSummaryCaseRestartDialog::ImportOptions::NOT_IMPORT )
{
m_summaryFileInfos.push_back( RifSummaryCaseFileResultInfo( initialSummaryFile, false ) );
}
else if ( defaultSummaryImportMode == RicSummaryCaseRestartDialog::SEPARATE_CASES )
else if ( defaultSummaryImportMode == RicSummaryCaseRestartDialog::ImportOptions::SEPARATE_CASES )
{
m_summaryFileInfos.push_back( RifSummaryCaseFileResultInfo( initialSummaryFile, false ) );
bool hasWarnings = false;
@@ -307,7 +307,7 @@ void RifSummaryCaseRestartSelector::determineFilesToImportUsingPrefs( const std:
m_gridFiles.push_back( initialGridFile );
RicSummaryCaseRestartDialog::ImportOptions defaultGridImportMode = mapReadOption( prefs->gridImportMode() );
if ( defaultGridImportMode == RicSummaryCaseRestartDialog::SEPARATE_CASES )
if ( defaultGridImportMode == RicSummaryCaseRestartDialog::ImportOptions::SEPARATE_CASES )
{
RifReaderEclipseSummary reader;
bool hasWarnings = false;