#14245 Remove gsl functions and ThirdParty/gsl folder

This commit is contained in:
Magne Sjaastad committed 2026-06-24 18:47:04 +02:00
1 parent 0a97fa0a29
commit 2ac1948abe
61 files changed
+162 -5086

No files matched your search

@@ -979,7 +979,7 @@ bool RiaApplication::loadProject( const QString& projectFileName )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RiaApplication::saveProject( gsl::not_null<QString*> errorMessage )
bool RiaApplication::saveProject( QString* errorMessage )
{
CAF_ASSERT( m_project );
@@ -997,7 +997,7 @@ bool RiaApplication::saveProject( gsl::not_null<QString*> errorMessage )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RiaApplication::saveProjectAs( const QString& fileName, gsl::not_null<QString*> errorMessage )
bool RiaApplication::saveProjectAs( const QString& fileName, QString* errorMessage )
{
CAF_ASSERT( m_project );
// Make sure we always store path with forward slash to avoid issues when opening the project file on Linux
@@ -1118,7 +1118,7 @@ bool RiaApplication::openOdbCaseFromFile( const QString& fileName, bool applyTim
m_project->activeOilField()->geoMechModels = std::make_unique<RimGeoMechModels>();
}
gsl::not_null<RimGeoMechModels*> geoMechModelCollection = m_project->activeOilField()->geoMechModels();
RimGeoMechModels* geoMechModelCollection = m_project->activeOilField()->geoMechModels();
// Check if the file is already open, the odb reader does not support opening the same file twice very well
for ( auto gmcase : geoMechModelCollection->cases() )
@@ -1161,7 +1161,7 @@ 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<RimWellPath*> RiaApplication::addWellPathsToModel( QList<QString> wellPathFilePaths, gsl::not_null<QStringList*> errorMessages )
std::vector<RimWellPath*> RiaApplication::addWellPathsToModel( QList<QString> wellPathFilePaths, QStringList* errorMessages )
{
if ( m_project == nullptr || m_project->oilFields.empty() ) return {};
@@ -1215,8 +1215,7 @@ void RiaApplication::addWellPathFormationsToModel( QList<QString> wellPathFormat
//--------------------------------------------------------------------------------------------------
/// Add a list of well log file paths (LAS files) to the well path collection
//--------------------------------------------------------------------------------------------------
std::vector<RimWellLogLasFile*> RiaApplication::addWellLogsToModel( const QList<QString>& wellLogFilePaths,
gsl::not_null<QStringList*> errorMessages )
std::vector<RimWellLogLasFile*> RiaApplication::addWellLogsToModel( const QList<QString>& wellLogFilePaths, QStringList* errorMessages )
{
if ( m_project == nullptr || m_project->oilFields.empty() ) return {};
@@ -1734,7 +1733,7 @@ void RiaApplication::resetProject()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RiaApplication::generateCode( const QString& fileName, gsl::not_null<QString*> errMsg )
bool RiaApplication::generateCode( const QString& fileName, QString* errMsg )
{
std::string fileExt = QFileInfo( fileName ).suffix().toStdString();
@@ -34,8 +34,6 @@
#include <QProcessEnvironment>
#include <QString>
#include <gsl/gsl>
#include <memory>
class QAction;
@@ -138,8 +136,8 @@ public:
bool loadProject( const QString& projectFileName );
bool loadProject( const QString& projectFileName, ProjectLoadAction loadAction, RiaProjectModifier* projectModifier );
bool saveProject( gsl::not_null<QString*> errorMessage );
bool saveProjectAs( const QString& fileName, gsl::not_null<QString*> errorMessage );
bool saveProject( QString* errorMessage );
bool saveProjectAs( const QString& fileName, QString* errorMessage );
static bool hasValidProjectFileExtension( const QString& fileName );
void closeProject();
@@ -151,9 +149,9 @@ public:
bool openOdbCaseFromFile( const QString& fileName, bool applyTimeStepFilter = false );
std::vector<RimWellPath*> addWellPathsToModel( QList<QString> wellPathFilePaths, gsl::not_null<QStringList*> errorMessages );
std::vector<RimWellPath*> addWellPathsToModel( QList<QString> wellPathFilePaths, QStringList* errorMessages );
void addWellPathFormationsToModel( QList<QString> wellPathFilePaths );
std::vector<RimWellLogLasFile*> addWellLogsToModel( const QList<QString>& wellLogFilePaths, gsl::not_null<QStringList*> errorMessages );
std::vector<RimWellLogLasFile*> addWellLogsToModel( const QList<QString>& wellLogFilePaths, QStringList* errorMessages );
QString scriptDirectories() const;
QString scriptEditorPath() const;
@@ -197,7 +195,7 @@ public:
// Public implementation specific overrides
virtual void initialize();
virtual ApplicationStatus handleArguments( gsl::not_null<cvf::ProgramOptions*> progOpt ) = 0;
virtual ApplicationStatus handleArguments( cvf::ProgramOptions* progOpt ) = 0;
virtual void addToRecentFiles( const QString& fileName ) {}
virtual void showFormattedTextInMessageBoxOrConsole( const QString& errMsg ) = 0;
@@ -227,7 +225,7 @@ protected:
friend class RiaRegressionTestRunner;
void resetProject();
bool generateCode( const QString& outputPath, gsl::not_null<QString*> errMsg );
bool generateCode( const QString& outputPath, QString* errMsg );
static std::vector<caf::PdmDeprecation> defaultDeprecations();
@@ -129,7 +129,7 @@ void RiaConsoleApplication::initialize()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaApplication::ApplicationStatus RiaConsoleApplication::handleArguments( gsl::not_null<cvf::ProgramOptions*> progOpt )
RiaApplication::ApplicationStatus RiaConsoleApplication::handleArguments( cvf::ProgramOptions* progOpt )
{
// Handling of the actual command line options
// --------------------------------------------------------
@@ -41,7 +41,7 @@ public:
// Public RiaApplication overrides
void initialize() override;
ApplicationStatus handleArguments( gsl::not_null<cvf::ProgramOptions*> progOpt ) override;
ApplicationStatus handleArguments( cvf::ProgramOptions* progOpt ) override;
void showFormattedTextInMessageBoxOrConsole( const QString& errMsg ) override;
protected:
@@ -564,7 +564,7 @@ void RiaGuiApplication::initialize()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaApplication::ApplicationStatus RiaGuiApplication::handleArguments( gsl::not_null<cvf::ProgramOptions*> progOpt )
RiaApplication::ApplicationStatus RiaGuiApplication::handleArguments( cvf::ProgramOptions* progOpt )
{
// Handling of the actual command line options
// --------------------------------------------------------
@@ -121,7 +121,7 @@ public:
// Public RiaApplication overrides
void initialize() override;
ApplicationStatus handleArguments( gsl::not_null<cvf::ProgramOptions*> progOpt ) override;
ApplicationStatus handleArguments( cvf::ProgramOptions* progOpt ) override;
void addToRecentFiles( const QString& fileName ) override;
void showFormattedTextInMessageBoxOrConsole( const QString& errMsg ) override;
@@ -18,8 +18,6 @@
#pragma once
#include <gsl/gsl>
class RigEclipseWellLogExtractor;
class RigGeoMechWellLogExtractor;
class RigWellPath;
@@ -26,8 +26,6 @@
#include <utility>
#include <vector>
#include <gsl/gsl>
class RimSummaryCase;
class RimSummaryEnsemble;
class RiaSummaryCurveAddress;