From e8368327da1dd2b95260018a6799d728f53e175b Mon Sep 17 00:00:00 2001 From: Gaute Lindkvist Date: Thu, 24 Sep 2020 10:54:18 +0200 Subject: [PATCH] Use GSL::not_null a few places as a test/example. --- .../Application/RiaApplication.cpp | 22 +++++++------------ ApplicationCode/Application/RiaApplication.h | 16 +++++++++----- .../Application/RiaConsoleApplication.cpp | 4 +--- .../Application/RiaConsoleApplication.h | 2 +- .../Application/RiaGuiApplication.cpp | 4 +--- .../Application/RiaGuiApplication.h | 2 +- .../Application/RiaSummaryCurveDefinition.cpp | 22 +++++++------------ .../Application/RiaSummaryCurveDefinition.h | 9 +++++--- 8 files changed, 36 insertions(+), 45 deletions(-) diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp index 1e0b22a2de..f626973e17 100644 --- a/ApplicationCode/Application/RiaApplication.cpp +++ b/ApplicationCode/Application/RiaApplication.cpp @@ -705,9 +705,8 @@ bool RiaApplication::loadProject( const QString& projectFileName ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RiaApplication::saveProject( QString* errorMessage ) +bool RiaApplication::saveProject( gsl::not_null errorMessage ) { - CAF_ASSERT( errorMessage ); CAF_ASSERT( m_project.notNull() ); if ( !isProjectSavedToDisc() ) @@ -724,8 +723,9 @@ bool RiaApplication::saveProject( QString* errorMessage ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RiaApplication::saveProjectAs( const QString& fileName, QString* errorMessage ) +bool RiaApplication::saveProjectAs( const QString& fileName, gsl::not_null errorMessage ) { + CAF_ASSERT( m_project.notNull() ); // Make sure we always store path with forward slash to avoid issues when opening the project file on Linux m_project->fileName = RiaFilePathTools::toInternalSeparator( fileName ); @@ -733,7 +733,6 @@ bool RiaApplication::saveProjectAs( const QString& fileName, QString* errorMessa if ( !m_project->writeProjectFile() ) { - CAF_ASSERT( errorMessage ); *errorMessage = QString( "Not possible to save project file. Make sure you have sufficient access " "rights.\n\nProject file location : %1" ) .arg( fileName ); @@ -889,10 +888,9 @@ bool RiaApplication::openOdbCaseFromFile( const QString& fileName, bool applyTim //-------------------------------------------------------------------------------------------------- /// Add a list of well path file paths (JSON files) to the well path collection //-------------------------------------------------------------------------------------------------- -std::vector RiaApplication::addWellPathsToModel( QList wellPathFilePaths, QStringList* errorMessages ) +std::vector RiaApplication::addWellPathsToModel( QList wellPathFilePaths, + gsl::not_null errorMessages ) { - CAF_ASSERT( errorMessages ); - if ( m_project == nullptr || m_project->oilFields.size() < 1 ) return {}; RimOilField* oilField = m_project->activeOilField(); @@ -945,11 +943,9 @@ void RiaApplication::addWellPathFormationsToModel( QList wellPathFormat //-------------------------------------------------------------------------------------------------- /// Add a list of well log file paths (LAS files) to the well path collection //-------------------------------------------------------------------------------------------------- -std::vector RiaApplication::addWellLogsToModel( const QList& wellLogFilePaths, - QStringList* errorMessages ) +std::vector RiaApplication::addWellLogsToModel( const QList& wellLogFilePaths, + gsl::not_null errorMessages ) { - CAF_ASSERT( errorMessages ); - if ( m_project == nullptr || m_project->oilFields.size() < 1 ) return {}; RimOilField* oilField = m_project->activeOilField(); @@ -1776,10 +1772,8 @@ void RiaApplication::resetProject() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RiaApplication::generateCode( const QString& fileName, QString* errMsg ) +bool RiaApplication::generateCode( const QString& fileName, gsl::not_null errMsg ) { - CAF_ASSERT( errMsg ); - std::string fileExt = QFileInfo( fileName ).suffix().toStdString(); { diff --git a/ApplicationCode/Application/RiaApplication.h b/ApplicationCode/Application/RiaApplication.h index cdbe353bf6..4d8f194970 100644 --- a/ApplicationCode/Application/RiaApplication.h +++ b/ApplicationCode/Application/RiaApplication.h @@ -36,6 +36,8 @@ #include #include +#include + #include #include @@ -131,8 +133,8 @@ public: bool loadProject( const QString& projectFileName ); bool loadProject( const QString& projectFileName, ProjectLoadAction loadAction, RiaProjectModifier* projectModifier ); - bool saveProject( QString* errorMessage ); - bool saveProjectAs( const QString& fileName, QString* errorMessage ); + bool saveProject( gsl::not_null errorMessage ); + bool saveProjectAs( const QString& fileName, gsl::not_null errorMessage ); static bool hasValidProjectFileExtension( const QString& fileName ); void closeProject(); @@ -144,9 +146,11 @@ public: bool openOdbCaseFromFile( const QString& fileName, bool applyTimeStepFilter = false ); - std::vector addWellPathsToModel( QList wellPathFilePaths, QStringList* errorMessages ); + std::vector addWellPathsToModel( QList wellPathFilePaths, + gsl::not_null errorMessages ); void addWellPathFormationsToModel( QList wellPathFilePaths ); - std::vector addWellLogsToModel( const QList& wellLogFilePaths, QStringList* errorMessages ); + std::vector addWellLogsToModel( const QList& wellLogFilePaths, + gsl::not_null errorMessages ); QString scriptDirectories() const; QString scriptEditorPath() const; @@ -196,7 +200,7 @@ public: // Public implementation specific overrides virtual void initialize(); - virtual ApplicationStatus handleArguments( cvf::ProgramOptions* progOpt ) = 0; + virtual ApplicationStatus handleArguments( gsl::not_null progOpt ) = 0; virtual int launchUnitTestsWithConsole(); virtual void addToRecentFiles( const QString& fileName ) {} virtual void showFormattedTextInMessageBoxOrConsole( const QString& errMsg ) = 0; @@ -227,7 +231,7 @@ protected: friend class RiaRegressionTestRunner; void resetProject(); - bool generateCode( const QString& outputPath, QString* errMsg ); + bool generateCode( const QString& outputPath, gsl::not_null errMsg ); protected: cvf::ref m_defaultSceneFont; diff --git a/ApplicationCode/Application/RiaConsoleApplication.cpp b/ApplicationCode/Application/RiaConsoleApplication.cpp index 55aeadb731..ac4fa75ddc 100644 --- a/ApplicationCode/Application/RiaConsoleApplication.cpp +++ b/ApplicationCode/Application/RiaConsoleApplication.cpp @@ -112,10 +112,8 @@ void RiaConsoleApplication::initialize() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaApplication::ApplicationStatus RiaConsoleApplication::handleArguments( cvf::ProgramOptions* progOpt ) +RiaApplication::ApplicationStatus RiaConsoleApplication::handleArguments( gsl::not_null progOpt ) { - CVF_ASSERT( progOpt ); - // Handling of the actual command line options // -------------------------------------------------------- if ( cvf::Option o = progOpt->option( "ignoreArgs" ) ) diff --git a/ApplicationCode/Application/RiaConsoleApplication.h b/ApplicationCode/Application/RiaConsoleApplication.h index 1a8aa8c792..6090db3123 100644 --- a/ApplicationCode/Application/RiaConsoleApplication.h +++ b/ApplicationCode/Application/RiaConsoleApplication.h @@ -41,7 +41,7 @@ public: // Public RiaApplication overrides void initialize() override; - ApplicationStatus handleArguments( cvf::ProgramOptions* progOpt ) override; + ApplicationStatus handleArguments( gsl::not_null progOpt ) override; void showFormattedTextInMessageBoxOrConsole( const QString& errMsg ) override; void launchGrpcServer() override; #ifdef ENABLE_GRPC diff --git a/ApplicationCode/Application/RiaGuiApplication.cpp b/ApplicationCode/Application/RiaGuiApplication.cpp index 1560b545cf..97f78d5db9 100644 --- a/ApplicationCode/Application/RiaGuiApplication.cpp +++ b/ApplicationCode/Application/RiaGuiApplication.cpp @@ -441,10 +441,8 @@ void RiaGuiApplication::initialize() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaApplication::ApplicationStatus RiaGuiApplication::handleArguments( cvf::ProgramOptions* progOpt ) +RiaApplication::ApplicationStatus RiaGuiApplication::handleArguments( gsl::not_null progOpt ) { - CVF_ASSERT( progOpt ); - // Handling of the actual command line options // -------------------------------------------------------- if ( cvf::Option o = progOpt->option( "ignoreArgs" ) ) diff --git a/ApplicationCode/Application/RiaGuiApplication.h b/ApplicationCode/Application/RiaGuiApplication.h index 54eb1114d9..c3a3459381 100644 --- a/ApplicationCode/Application/RiaGuiApplication.h +++ b/ApplicationCode/Application/RiaGuiApplication.h @@ -136,7 +136,7 @@ public: // Public RiaApplication overrides void initialize() override; - ApplicationStatus handleArguments( cvf::ProgramOptions* progOpt ) override; + ApplicationStatus handleArguments( gsl::not_null progOpt ) override; int launchUnitTestsWithConsole() override; void addToRecentFiles( const QString& fileName ) override; void showFormattedTextInMessageBoxOrConsole( const QString& errMsg ) override; diff --git a/ApplicationCode/Application/RiaSummaryCurveDefinition.cpp b/ApplicationCode/Application/RiaSummaryCurveDefinition.cpp index 980103e442..51f338f7ae 100644 --- a/ApplicationCode/Application/RiaSummaryCurveDefinition.cpp +++ b/ApplicationCode/Application/RiaSummaryCurveDefinition.cpp @@ -37,28 +37,23 @@ RiaSummaryCurveDefinition::RiaSummaryCurveDefinition() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaSummaryCurveDefinition::RiaSummaryCurveDefinition( RimSummaryCase* summaryCase, +RiaSummaryCurveDefinition::RiaSummaryCurveDefinition( gsl::not_null summaryCase, const RifEclipseSummaryAddress& summaryAddress, bool isEnsembleCurve ) : m_summaryCase( summaryCase ) , m_summaryAddress( summaryAddress ) , m_isEnsembleCurve( isEnsembleCurve ) { - CAF_ASSERT( summaryCase ); - - if ( summaryCase ) - { - RimSummaryCaseCollection* ensemble = nullptr; - summaryCase->firstAncestorOfType( ensemble ); - m_ensemble = ensemble; - } + RimSummaryCaseCollection* ensemble = nullptr; + summaryCase->firstAncestorOfType( ensemble ); + m_ensemble = ensemble; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaSummaryCurveDefinition::RiaSummaryCurveDefinition( RimSummaryCaseCollection* ensemble, - const RifEclipseSummaryAddress& summaryAddress ) +RiaSummaryCurveDefinition::RiaSummaryCurveDefinition( gsl::not_null ensemble, + const RifEclipseSummaryAddress& summaryAddress ) : m_summaryCase( nullptr ) , m_summaryAddress( summaryAddress ) , m_ensemble( ensemble ) @@ -101,10 +96,9 @@ bool RiaSummaryCurveDefinition::isEnsembleCurve() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiaSummaryCurveDefinition::resultValues( const RiaSummaryCurveDefinition& curveDefinition, std::vector* values ) +void RiaSummaryCurveDefinition::resultValues( const RiaSummaryCurveDefinition& curveDefinition, + gsl::not_null*> values ) { - CVF_ASSERT( values ); - if ( !curveDefinition.summaryAddress().isValid() ) return; if ( !curveDefinition.summaryCase() ) return; diff --git a/ApplicationCode/Application/RiaSummaryCurveDefinition.h b/ApplicationCode/Application/RiaSummaryCurveDefinition.h index 03d6b4adc6..16d7ca71bd 100644 --- a/ApplicationCode/Application/RiaSummaryCurveDefinition.h +++ b/ApplicationCode/Application/RiaSummaryCurveDefinition.h @@ -25,6 +25,8 @@ #include #include +#include + class RimSummaryCase; class RimSummaryCaseCollection; @@ -35,10 +37,11 @@ class RiaSummaryCurveDefinition { public: RiaSummaryCurveDefinition(); - explicit RiaSummaryCurveDefinition( RimSummaryCase* summaryCase, + explicit RiaSummaryCurveDefinition( gsl::not_null summaryCase, const RifEclipseSummaryAddress& summaryAddress, bool isEnsembleCurve ); - explicit RiaSummaryCurveDefinition( RimSummaryCaseCollection* ensemble, const RifEclipseSummaryAddress& summaryAddress ); + explicit RiaSummaryCurveDefinition( gsl::not_null ensemble, + const RifEclipseSummaryAddress& summaryAddress ); RimSummaryCase* summaryCase() const; const RifEclipseSummaryAddress& summaryAddress() const; @@ -48,7 +51,7 @@ public: bool operator<( const RiaSummaryCurveDefinition& other ) const; // TODO: Consider moving to a separate tools class - static void resultValues( const RiaSummaryCurveDefinition& curveDefinition, std::vector* values ); + static void resultValues( const RiaSummaryCurveDefinition& curveDefinition, gsl::not_null*> values ); static const std::vector& timeSteps( const RiaSummaryCurveDefinition& curveDefinition ); QString curveDefinitionText() const;