#5101 clang-format: Allow short functions on a single line

Use AllowShortFunctionsOnASingleLine: InlineOnly
This commit is contained in:
Magne Sjaastad
2020-02-12 11:13:38 +01:00
parent ab9d46ee75
commit 10f0abc9b5
428 changed files with 1519 additions and 1990 deletions

View File

@@ -60,7 +60,9 @@ RimAsciiDataCurve::RimAsciiDataCurve()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimAsciiDataCurve::~RimAsciiDataCurve() {}
RimAsciiDataCurve::~RimAsciiDataCurve()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -37,7 +37,9 @@ RimCalculatedSummaryCase::RimCalculatedSummaryCase()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimCalculatedSummaryCase::~RimCalculatedSummaryCase() {}
RimCalculatedSummaryCase::~RimCalculatedSummaryCase()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -48,7 +48,9 @@ RimCsvUserData::RimCsvUserData()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimCsvUserData::~RimCsvUserData() {}
RimCsvUserData::~RimCsvUserData()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -72,7 +72,9 @@ RimDerivedEnsembleCaseCollection::RimDerivedEnsembleCaseCollection()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimDerivedEnsembleCaseCollection::~RimDerivedEnsembleCaseCollection() {}
RimDerivedEnsembleCaseCollection::~RimDerivedEnsembleCaseCollection()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -44,22 +44,10 @@ public:
RimDerivedEnsembleCaseCollection();
~RimDerivedEnsembleCaseCollection() override;
RimSummaryCaseCollection* ensemble1() const
{
return m_ensemble1;
}
RimSummaryCaseCollection* ensemble2() const
{
return m_ensemble2;
}
DerivedSummaryOperator op() const
{
return m_operator();
}
bool isValid() const
{
return m_ensemble1 != nullptr && m_ensemble2 != nullptr;
}
RimSummaryCaseCollection* ensemble1() const { return m_ensemble1; }
RimSummaryCaseCollection* ensemble2() const { return m_ensemble2; }
DerivedSummaryOperator op() const { return m_operator(); }
bool isValid() const { return m_ensemble1 != nullptr && m_ensemble2 != nullptr; }
void setEnsemble1( RimSummaryCaseCollection* ensemble );
void setEnsemble2( RimSummaryCaseCollection* ensemble );

View File

@@ -58,7 +58,9 @@ RimDerivedSummaryCase::RimDerivedSummaryCase()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimDerivedSummaryCase::~RimDerivedSummaryCase() {}
RimDerivedSummaryCase::~RimDerivedSummaryCase()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -38,44 +38,17 @@ class RimEnsembleStatistics : public caf::PdmObject
public:
RimEnsembleStatistics();
bool isActive() const;
bool hideEnsembleCurves() const
{
return m_hideEnsembleCurves;
}
bool basedOnFilteredCases() const
{
return m_basedOnFilteredCases;
}
bool showP10Curve() const
{
return m_showP10Curve;
}
bool showP50Curve() const
{
return m_showP50Curve;
}
bool showP90Curve() const
{
return m_showP90Curve;
}
bool showMeanCurve() const
{
return m_showMeanCurve;
}
bool showCurveLabels() const
{
return m_showCurveLabels;
}
cvf::Color3f color() const
{
return m_color;
}
bool isActive() const;
bool hideEnsembleCurves() const { return m_hideEnsembleCurves; }
bool basedOnFilteredCases() const { return m_basedOnFilteredCases; }
bool showP10Curve() const { return m_showP10Curve; }
bool showP50Curve() const { return m_showP50Curve; }
bool showP90Curve() const { return m_showP90Curve; }
bool showMeanCurve() const { return m_showMeanCurve; }
bool showCurveLabels() const { return m_showCurveLabels; }
cvf::Color3f color() const { return m_color; }
bool includeIncompleteCurves() const
{
return m_includeIncompleteCurves;
}
bool includeIncompleteCurves() const { return m_includeIncompleteCurves; }
void disableP10Curve( bool disable );
void disableP50Curve( bool disable );

View File

@@ -40,22 +40,10 @@ public:
const std::vector<double>& p90() const;
const std::vector<double>& mean() const;
bool hasP10Data() const
{
return !m_p10Data.empty();
}
bool hasP50Data() const
{
return !m_p50Data.empty();
}
bool hasP90Data() const
{
return !m_p90Data.empty();
}
bool hasMeanData() const
{
return !m_meanData.empty();
}
bool hasP10Data() const { return !m_p10Data.empty(); }
bool hasP50Data() const { return !m_p50Data.empty(); }
bool hasP90Data() const { return !m_p90Data.empty(); }
bool hasMeanData() const { return !m_meanData.empty(); }
QString caseName() const override;
void createSummaryReaderInterface() override;

View File

@@ -49,7 +49,9 @@ RimFileSummaryCase::RimFileSummaryCase()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimFileSummaryCase::~RimFileSummaryCase() {}
RimFileSummaryCase::~RimFileSummaryCase()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -57,7 +57,9 @@ RimGridSummaryCase::RimGridSummaryCase()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimGridSummaryCase::~RimGridSummaryCase() {}
RimGridSummaryCase::~RimGridSummaryCase()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -44,7 +44,9 @@ RimObservedEclipseUserData::RimObservedEclipseUserData()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimObservedEclipseUserData::~RimObservedEclipseUserData() {}
RimObservedEclipseUserData::~RimObservedEclipseUserData()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -88,7 +88,9 @@ RimSummaryAddress::RimSummaryAddress()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryAddress::~RimSummaryAddress() {}
RimSummaryAddress::~RimSummaryAddress()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -57,7 +57,9 @@ RimSummaryCase::RimSummaryCase()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCase::~RimSummaryCase() {}
RimSummaryCase::~RimSummaryCase()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -73,18 +73,9 @@ public:
{
}
bool isValid() const
{
return !name.isEmpty() && type != TYPE_NONE;
}
bool isNumeric() const
{
return type == TYPE_NUMERIC;
}
bool isText() const
{
return type == TYPE_TEXT;
}
bool isValid() const { return !name.isEmpty() && type != TYPE_NONE; }
bool isNumeric() const { return type == TYPE_NUMERIC; }
bool isText() const { return type == TYPE_TEXT; }
double normalizedStdDeviation() const;
static void sortByBinnedVariation( std::vector<NameParameterPair>& parameterVector );

View File

@@ -39,7 +39,9 @@ RimSummaryCrossPlotCollection::RimSummaryCrossPlotCollection()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCrossPlotCollection::~RimSummaryCrossPlotCollection() {}
RimSummaryCrossPlotCollection::~RimSummaryCrossPlotCollection()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -143,7 +143,9 @@ RimSummaryCurve::RimSummaryCurve()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCurve::~RimSummaryCurve() {}
RimSummaryCurve::~RimSummaryCurve()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -73,7 +73,9 @@ RimSummaryFilter_OBSOLETE::RimSummaryFilter_OBSOLETE()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryFilter_OBSOLETE::~RimSummaryFilter_OBSOLETE() {}
RimSummaryFilter_OBSOLETE::~RimSummaryFilter_OBSOLETE()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -38,7 +38,9 @@ RimSummaryObservedDataFile::RimSummaryObservedDataFile()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryObservedDataFile::~RimSummaryObservedDataFile() {}
RimSummaryObservedDataFile::~RimSummaryObservedDataFile()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -79,10 +79,7 @@ private:
}
}
double scaledValue( double value ) const
{
return value / m_scaleFactor;
}
double scaledValue( double value ) const { return value / m_scaleFactor; }
private:
double m_scaleFactor;

View File

@@ -106,7 +106,9 @@ RimSummaryPlotFilterTextCurveSetEditor::RimSummaryPlotFilterTextCurveSetEditor()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryPlotFilterTextCurveSetEditor::~RimSummaryPlotFilterTextCurveSetEditor() {}
RimSummaryPlotFilterTextCurveSetEditor::~RimSummaryPlotFilterTextCurveSetEditor()
{
}
//--------------------------------------------------------------------------------------------------
///

View File

@@ -28,7 +28,9 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryPlotNameHelper::RimSummaryPlotNameHelper() {}
RimSummaryPlotNameHelper::RimSummaryPlotNameHelper()
{
}
//--------------------------------------------------------------------------------------------------
///