diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp index 3bcb809d79..225c48893d 100644 --- a/ApplicationCode/Application/RiaApplication.cpp +++ b/ApplicationCode/Application/RiaApplication.cpp @@ -1106,7 +1106,7 @@ RiaPreferences* RiaApplication::preferences() /// //-------------------------------------------------------------------------------------------------- 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 fontSizes = m_preferences->defaultFontSizes(); diff --git a/ApplicationCode/Commands/ApplicationCommands/RicEditPreferencesFeature.cpp b/ApplicationCode/Commands/ApplicationCommands/RicEditPreferencesFeature.cpp index ec716eaebd..fc729e715b 100644 --- a/ApplicationCode/Commands/ApplicationCommands/RicEditPreferencesFeature.cpp +++ b/ApplicationCode/Commands/ApplicationCommands/RicEditPreferencesFeature.cpp @@ -57,7 +57,7 @@ void RicEditPreferencesFeature::onActionTriggered( bool isChecked ) { // Write preferences using QSettings and apply them to the application app->applyPreferences(); - app->applyGuiPreferences(oldPreferences.get()); + app->applyGuiPreferences( oldPreferences.get() ); app->updateGrpcServer(); } else diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.cpp index 9a3af18cee..4842d67823 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.cpp @@ -114,8 +114,8 @@ RimSummaryCurve* RicSummaryPlotFeatureImpl::addDefaultCurveToPlot( RimSummaryPlo std::vector RicSummaryPlotFeatureImpl::addDefaultCurvesToPlot( RimSummaryPlot* plot, RimSummaryCase* summaryCase ) { - QString curvesTextFilter = RiaApplication::instance()->preferences()->defaultSummaryCurvesTextFilter; - QStringList curveFilters = curvesTextFilter.split(";", QString::SkipEmptyParts); + QString curvesTextFilter = RiaApplication::instance()->preferences()->defaultSummaryCurvesTextFilter; + QStringList curveFilters = curvesTextFilter.split( ";", QString::SkipEmptyParts ); return addCurvesFromAddressFiltersToPlot( curveFilters, plot, summaryCase, false ); } @@ -760,11 +760,12 @@ std::set filteredSummaryAdressesFromCase( summaryAddressFilters, addrs, &filteredAdressesFromCases, &usedFilters ); - for ( size_t cfIdx = 0 ; cfIdx < usedFilters.size() ; ++cfIdx ) + for ( size_t cfIdx = 0; cfIdx < usedFilters.size(); ++cfIdx ) { if ( !usedFilters[cfIdx] ) { - RiaLogging::warning("Vector filter \"" + summaryAddressFilters[static_cast(cfIdx)] + "\" did not match anything in case: \"" + sumCase->caseName() + "\""); + RiaLogging::warning( "Vector filter \"" + summaryAddressFilters[static_cast( cfIdx )] + + "\" did not match anything in case: \"" + sumCase->caseName() + "\"" ); } } } @@ -786,11 +787,12 @@ std::vector RicSummaryPlotFeatureImpl::addCurvesFromAddressFil filteredSummaryAdressesFromCase( curveFilters, addrs, &curveAddressesToUse, &usedFilters ); - for (size_t cfIdx = 0 ; cfIdx < usedFilters.size() ; ++cfIdx) + for ( size_t cfIdx = 0; cfIdx < usedFilters.size(); ++cfIdx ) { if ( !usedFilters[cfIdx] ) { - RiaLogging::warning("Vector filter \"" + curveFilters[static_cast(cfIdx)] + "\" did not match anything in case: \"" + summaryCase->caseName() + "\""); + RiaLogging::warning( "Vector filter \"" + curveFilters[static_cast( cfIdx )] + + "\" did not match anything in case: \"" + summaryCase->caseName() + "\"" ); } } diff --git a/ApplicationCode/ProjectDataModel/RimScriptCollection.cpp b/ApplicationCode/ProjectDataModel/RimScriptCollection.cpp index 1e0de2b898..1618d64fe2 100644 --- a/ApplicationCode/ProjectDataModel/RimScriptCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimScriptCollection.cpp @@ -131,9 +131,9 @@ void RimScriptCollection::readContentFromDisc() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimScriptCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, - const QVariant& oldValue, - const QVariant& newValue) +void RimScriptCollection::fieldChangedByUi( const caf::PdmFieldHandle* changedField, + const QVariant& oldValue, + const QVariant& newValue ) { if ( &directory == changedField ) { diff --git a/ApplicationCode/ProjectDataModel/RimScriptCollection.h b/ApplicationCode/ProjectDataModel/RimScriptCollection.h index 6cd2e9ae7e..77e693d222 100644 --- a/ApplicationCode/ProjectDataModel/RimScriptCollection.h +++ b/ApplicationCode/ProjectDataModel/RimScriptCollection.h @@ -50,7 +50,7 @@ public: // Pdm Fields caf::PdmChildArrayField subDirectories; public: // Methods - void readContentFromDisc(); + void readContentFromDisc(); // Overrides from PdmObject void fieldChangedByUi( const caf::PdmFieldHandle* changedField,