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

#4657 Remove unused parameter

Browse Source
This commit is contained in:
Magne Sjaastad
2019-09-05 19:37:52 +02:00
parent eb4f44d4d2
commit d44598c070
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Application/RiaApplication.cpp
View File

@@ -1105,8 +1105,8 @@ RiaPreferences* RiaApplication::preferences()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaApplication::applyPreferences( const RiaPreferences* oldPreferences )
{
void RiaApplication::applyPreferences()
{
// The creation of a font is time consuming, so make sure you really need your own font
// instead of using the application font
std::map<RiaDefines::FontSettingType, RiaFontCache::FontSize> fontSizes = m_preferences->defaultFontSizes();
@@ -1410,7 +1410,7 @@ void RiaApplication::initialize()
m_preferences = new RiaPreferences;
caf::PdmSettings::readFieldsFromApplicationStore( m_preferences );
m_preferences->initAfterReadRecursively();
applyPreferences( nullptr );
applyPreferences();
// Start with a project
m_project = new RimProject;

2
ApplicationCode/Application/RiaApplication.h
View File

@@ -162,7 +162,7 @@ public:
void waitForProcess() const;
RiaPreferences* preferences();
void applyPreferences( const RiaPreferences* oldPreferences = nullptr );
void applyPreferences();
QString commandLineParameterHelp();
void setCommandLineHelpText( const QString& commandLineHelpText );

4
ApplicationCode/Commands/ApplicationCommands/RicEditPreferencesFeature.cpp
View File

@@ -56,8 +56,8 @@ void RicEditPreferencesFeature::onActionTriggered( bool isChecked )
if ( propertyDialog.exec() == QDialog::Accepted )
{
// Write preferences using QSettings and apply them to the application
app->applyPreferences( oldPreferences.get() );
app->applyGuiPreferences( oldPreferences.get() );
app->applyPreferences();
app->applyGuiPreferences(oldPreferences.get());
app->updateGrpcServer();
}
else