diff --git a/ApplicationCode/Commands/RicSummaryCaseRestartDialog.cpp b/ApplicationCode/Commands/RicSummaryCaseRestartDialog.cpp index 48ea405fe2..e89a2dcba6 100644 --- a/ApplicationCode/Commands/RicSummaryCaseRestartDialog.cpp +++ b/ApplicationCode/Commands/RicSummaryCaseRestartDialog.cpp @@ -214,7 +214,7 @@ RicSummaryCaseRestartDialogResult RicSummaryCaseRestartDialog::openDialog(const { if (failOnSummaryImportError) { - return RicSummaryCaseRestartDialogResult(RicSummaryCaseRestartDialogResult::ERROR); + return RicSummaryCaseRestartDialogResult(RicSummaryCaseRestartDialogResult::SUMMARY_ERROR); } } else @@ -228,11 +228,11 @@ RicSummaryCaseRestartDialogResult RicSummaryCaseRestartDialog::openDialog(const // If only grid file is present, return if (!handleSummaryFile && !initialGridFile.isEmpty()) { - RicSummaryCaseRestartDialogResult::Status status = RicSummaryCaseRestartDialogResult::OK; + RicSummaryCaseRestartDialogResult::Status status = RicSummaryCaseRestartDialogResult::SUMMARY_OK; if (!initialSummaryFile.isEmpty()) { // We were meant to have a summary file but due to an error we don't. - status = RicSummaryCaseRestartDialogResult::SUMMARY_FILE_WARNING; + status = RicSummaryCaseRestartDialogResult::SUMMARY_WARNING; } return RicSummaryCaseRestartDialogResult(status, defaultSummaryImportOption, @@ -251,7 +251,7 @@ RicSummaryCaseRestartDialogResult RicSummaryCaseRestartDialog::openDialog(const // If no restart files are found and no warnings, do not show dialog if (originFileInfos.empty() &&!hasWarnings) { - return RicSummaryCaseRestartDialogResult(RicSummaryCaseRestartDialogResult::OK, NOT_IMPORT, NOT_IMPORT, QStringList({ initialSummaryFile }), QStringList({ initialGridFile }), false); + return RicSummaryCaseRestartDialogResult(RicSummaryCaseRestartDialogResult::SUMMARY_OK, NOT_IMPORT, NOT_IMPORT, QStringList({ initialSummaryFile }), QStringList({ initialGridFile }), false); } RicSummaryCaseRestartDialogResult dialogResult; @@ -332,11 +332,11 @@ RicSummaryCaseRestartDialogResult RicSummaryCaseRestartDialog::openDialog(const dialog.resize(DEFAULT_DIALOG_WIDTH, DEFAULT_DIALOG_INIT_HEIGHT); dialog.exec(); - RicSummaryCaseRestartDialogResult::Status status = RicSummaryCaseRestartDialogResult::OK; + RicSummaryCaseRestartDialogResult::Status status = RicSummaryCaseRestartDialogResult::SUMMARY_OK; if (dialog.result() == QDialog::Rejected) { - status = RicSummaryCaseRestartDialogResult::CANCELLED; + status = RicSummaryCaseRestartDialogResult::SUMMARY_CANCELLED; } dialogResult = RicSummaryCaseRestartDialogResult(status, @@ -347,7 +347,7 @@ RicSummaryCaseRestartDialogResult RicSummaryCaseRestartDialog::openDialog(const dialog.applyToAllSelected()); } - if (dialogResult.status != RicSummaryCaseRestartDialogResult::OK) + if (dialogResult.status != RicSummaryCaseRestartDialogResult::SUMMARY_OK) { return RicSummaryCaseRestartDialogResult(dialogResult.status, NOT_IMPORT, NOT_IMPORT, QStringList(), QStringList(), false); } diff --git a/ApplicationCode/Commands/RicSummaryCaseRestartDialog.h b/ApplicationCode/Commands/RicSummaryCaseRestartDialog.h index b6e49b9e7c..9dfc7f98a4 100644 --- a/ApplicationCode/Commands/RicSummaryCaseRestartDialog.h +++ b/ApplicationCode/Commands/RicSummaryCaseRestartDialog.h @@ -106,12 +106,12 @@ class RicSummaryCaseRestartDialogResult public: enum Status { - OK = 0, - CANCELLED = 1, - SUMMARY_FILE_WARNING = 2, - ERROR = 3 + SUMMARY_OK = 0, + SUMMARY_CANCELLED, + SUMMARY_WARNING, + SUMMARY_ERROR }; - RicSummaryCaseRestartDialogResult(Status _status = ERROR) : + RicSummaryCaseRestartDialogResult(Status _status = SUMMARY_ERROR) : status(_status), summaryImportOption(RicSummaryCaseRestartDialog::IMPORT_ALL), gridImportOption(RicSummaryCaseRestartDialog::NOT_IMPORT), diff --git a/ApplicationCode/FileInterface/RifSummaryCaseRestartSelector.cpp b/ApplicationCode/FileInterface/RifSummaryCaseRestartSelector.cpp index ae86f1aa17..177fb65ccb 100644 --- a/ApplicationCode/FileInterface/RifSummaryCaseRestartSelector.cpp +++ b/ApplicationCode/FileInterface/RifSummaryCaseRestartSelector.cpp @@ -180,7 +180,7 @@ void RifSummaryCaseRestartSelector::determineFilesToImportByAskingUser(const std m_defaultGridImportMode, &lastResult); - if (result.status == RicSummaryCaseRestartDialogResult::CANCELLED) + if (result.status == RicSummaryCaseRestartDialogResult::SUMMARY_CANCELLED) { // Cancel pressed, cancel everything and return early m_summaryFileInfos.clear(); @@ -189,8 +189,8 @@ void RifSummaryCaseRestartSelector::determineFilesToImportByAskingUser(const std return; } - if (result.status == RicSummaryCaseRestartDialogResult::ERROR || - result.status == RicSummaryCaseRestartDialogResult::SUMMARY_FILE_WARNING) + if (result.status == RicSummaryCaseRestartDialogResult::SUMMARY_ERROR || + result.status == RicSummaryCaseRestartDialogResult::SUMMARY_WARNING) { // A summary import failure occurred with one of the files. The others may still have worked. m_summaryFileErrors.push_back(initialFile.summaryFileName()); @@ -207,7 +207,7 @@ void RifSummaryCaseRestartSelector::determineFilesToImportByAskingUser(const std } } - if (result.status != RicSummaryCaseRestartDialogResult::ERROR) + if (result.status != RicSummaryCaseRestartDialogResult::SUMMARY_ERROR) { lastResult = result;