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

clang-format : Apply clang-format on files coming from feature branch

Browse Source
This commit is contained in:
Magne Sjaastad 2019-09-06 12:53:32 +02:00
parent d44598c070
commit deb73df726
5 changed files with 14 additions and 12 deletions
ApplicationCode
Application
RiaApplication.cpp
Commands
ApplicationCommands
RicEditPreferencesFeature.cpp
SummaryPlotCommands
RicSummaryPlotFeatureImpl.cpp
ProjectDataModel
RimScriptCollection.cppRimScriptCollection.h

2
ApplicationCode/Application/RiaApplication.cpp
View File

@ -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<RiaDefines::FontSettingType, RiaFontCache::FontSize> fontSizes = m_preferences->defaultFontSizes();

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

@ -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

14
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.cpp
View File

@ -114,8 +114,8 @@ RimSummaryCurve* RicSummaryPlotFeatureImpl::addDefaultCurveToPlot( RimSummaryPlo
std::vector<RimSummaryCurve*> 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<RifEclipseSummaryAddress>
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<int>(cfIdx)] + "\" did not match anything in case: \"" + sumCase->caseName() + "\"");
RiaLogging::warning( "Vector filter \"" + summaryAddressFilters[static_cast<int>( cfIdx )] +
"\" did not match anything in case: \"" + sumCase->caseName() + "\"" );
}
}
}
@ -786,11 +787,12 @@ std::vector<RimSummaryCurve*> 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<int>(cfIdx)] + "\" did not match anything in case: \"" + summaryCase->caseName() + "\"");
RiaLogging::warning( "Vector filter \"" + curveFilters[static_cast<int>( cfIdx )] +
"\" did not match anything in case: \"" + summaryCase->caseName() + "\"" );
}
}

6
ApplicationCode/ProjectDataModel/RimScriptCollection.cpp
View File

@ -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 )
{

2
ApplicationCode/ProjectDataModel/RimScriptCollection.h
View File

@ -50,7 +50,7 @@ public: // Pdm Fields
caf::PdmChildArrayField<RimScriptCollection*> subDirectories;
public: // Methods
void readContentFromDisc();
void readContentFromDisc();
// Overrides from PdmObject
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,