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

Add static access function for RiaPreferences

Browse Source
This commit is contained in:
Magne Sjaastad 2020-04-24 12:24:46 +02:00
parent 616af75df3
commit 42964c0da4
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/Application/RiaPreferences.cpp
View File

@ -412,6 +412,14 @@ RiaPreferences::~RiaPreferences( void )
delete m_readerSettings; delete m_readerSettings;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaPreferences* RiaPreferences::current()
{
return RiaApplication::instance()->preferences();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/Application/RiaPreferences.h
View File

@ -76,6 +76,8 @@ public:
RiaPreferences( void ); RiaPreferences( void );
~RiaPreferences( void ) override; ~RiaPreferences( void ) override;
static RiaPreferences* current();
QStringList tabNames(); QStringList tabNames();
const RifReaderSettings* readerSettings() const; const RifReaderSettings* readerSettings() const;

3
ApplicationCode/FileInterface/RifReaderInterface.cpp
View File

@ -19,7 +19,6 @@
#include "RifReaderInterface.h" #include "RifReaderInterface.h"
#include "RiaApplication.h"
#include "RiaPreferences.h" #include "RiaPreferences.h"
#include "RifReaderSettings.h" #include "RifReaderSettings.h"
@ -108,7 +107,7 @@ size_t RifReaderInterface::timeStepIndexOnFile( size_t timeStepIndex ) const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
const RifReaderSettings* RifReaderInterface::readerSettings() const const RifReaderSettings* RifReaderInterface::readerSettings() const
{ {
RiaPreferences* prefs = RiaApplication::instance()->preferences(); RiaPreferences* prefs = RiaPreferences::current();
CVF_ASSERT( prefs->readerSettings() ); CVF_ASSERT( prefs->readerSettings() );