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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.cpp
View File

@@ -736,7 +736,9 @@ void RimFlowCharacteristicsPlot::onLoadDataAndUpdate()
//--------------------------------------------------------------------------------------------------
/// TODO: implement properly
//--------------------------------------------------------------------------------------------------
void RimFlowCharacteristicsPlot::assignIdIfNecessary() {}
void RimFlowCharacteristicsPlot::assignIdIfNecessary()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/ProjectDataModel/Flow/RimFlowDiagSolution.cpp
View File

@@ -79,7 +79,9 @@ RimFlowDiagSolution::RimFlowDiagSolution( void )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimFlowDiagSolution::~RimFlowDiagSolution( void ) {}
RimFlowDiagSolution::~RimFlowDiagSolution( void )
{
}
//--------------------------------------------------------------------------------------------------
///

8
ApplicationCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.cpp
View File

@@ -152,7 +152,9 @@ QWidget* RimTofAccumulatedPhaseFractionsPlot::viewWidget()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimTofAccumulatedPhaseFractionsPlot::zoomAll() {}
void RimTofAccumulatedPhaseFractionsPlot::zoomAll()
{
}
//--------------------------------------------------------------------------------------------------
///
@@ -205,7 +207,9 @@ QString RimTofAccumulatedPhaseFractionsPlot::description() const
//--------------------------------------------------------------------------------------------------
/// TODO: Implement properly
//--------------------------------------------------------------------------------------------------
void RimTofAccumulatedPhaseFractionsPlot::assignIdIfNecessary() {}
void RimTofAccumulatedPhaseFractionsPlot::assignIdIfNecessary()
{
}
//--------------------------------------------------------------------------------------------------
///

11
ApplicationCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.h
View File

@@ -80,13 +80,10 @@ protected:
QImage snapshotWindowContent() override;
// Overridden PDM methods
caf::PdmFieldHandle* userDescriptionField() override
{
return &m_userName;
}
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
caf::PdmFieldHandle* userDescriptionField() override { return &m_userName; }
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
private:
caf::PdmField<bool> m_showPlotTitle;

8
ApplicationCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.cpp
View File

@@ -99,7 +99,9 @@ QWidget* RimTotalWellAllocationPlot::viewWidget()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimTotalWellAllocationPlot::zoomAll() {}
void RimTotalWellAllocationPlot::zoomAll()
{
}
//--------------------------------------------------------------------------------------------------
///
@@ -119,7 +121,9 @@ void RimTotalWellAllocationPlot::fieldChangedByUi( const caf::PdmFieldHandle* ch
//--------------------------------------------------------------------------------------------------
/// TODO: Implement properly
//--------------------------------------------------------------------------------------------------
void RimTotalWellAllocationPlot::assignIdIfNecessary() {}
void RimTotalWellAllocationPlot::assignIdIfNecessary()
{
}
//--------------------------------------------------------------------------------------------------
///

11
ApplicationCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.h
View File

@@ -76,13 +76,10 @@ protected:
QImage snapshotWindowContent() override;
// Overridden PDM methods
caf::PdmFieldHandle* userDescriptionField() override
{
return &m_userName;
}
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
caf::PdmFieldHandle* userDescriptionField() override { return &m_userName; }
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
private:
void assignIdIfNecessary() final;

4
ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp
View File

@@ -608,7 +608,9 @@ QString RimWellAllocationPlot::wellStatusTextForTimeStep( const QString&
//--------------------------------------------------------------------------------------------------
/// TODO: Implement properly
//--------------------------------------------------------------------------------------------------
void RimWellAllocationPlot::assignIdIfNecessary() {}
void RimWellAllocationPlot::assignIdIfNecessary()
{
}
//--------------------------------------------------------------------------------------------------
///

11
ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.h
View File

@@ -90,13 +90,10 @@ public:
protected:
// Overridden PDM methods
caf::PdmFieldHandle* userDescriptionField() override
{
return &m_userName;
}
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
caf::PdmFieldHandle* userDescriptionField() override { return &m_userName; }
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
std::set<QString> findSortedWellNames();

4
ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlotLegend.cpp
View File

@@ -33,7 +33,9 @@ RimWellAllocationPlotLegend::RimWellAllocationPlotLegend()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellAllocationPlotLegend::~RimWellAllocationPlotLegend() {}
RimWellAllocationPlotLegend::~RimWellAllocationPlotLegend()
{
}
//--------------------------------------------------------------------------------------------------
///

5
ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlotLegend.h
View File

@@ -33,10 +33,7 @@ public:
RimWellAllocationPlotLegend();
~RimWellAllocationPlotLegend() override;
bool isShowingLegend()
{
return m_showLegend();
}
bool isShowingLegend() { return m_showLegend(); }
protected:
caf::PdmFieldHandle* objectToggleField() override;

4
ApplicationCode/ProjectDataModel/Flow/RimWellDistributionPlot.cpp
View File

@@ -82,7 +82,9 @@ RimWellDistributionPlot::RimWellDistributionPlot( RiaDefines::PhaseType phase )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellDistributionPlot::~RimWellDistributionPlot() {}
RimWellDistributionPlot::~RimWellDistributionPlot()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/ProjectDataModel/Flow/RimWellDistributionPlotCollection.cpp
View File

@@ -158,7 +158,9 @@ QImage RimWellDistributionPlotCollection::snapshotWindowContent()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellDistributionPlotCollection::zoomAll() {}
void RimWellDistributionPlotCollection::zoomAll()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/ProjectDataModel/Flow/RimWellFlowRateCurve.cpp
View File

@@ -54,7 +54,9 @@ RimWellFlowRateCurve::RimWellFlowRateCurve()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellFlowRateCurve::~RimWellFlowRateCurve() {}
RimWellFlowRateCurve::~RimWellFlowRateCurve()
{
}
//--------------------------------------------------------------------------------------------------
///

15
ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp
View File

@@ -282,18 +282,9 @@ public:
RigResultPointCalculator() {}
virtual ~RigResultPointCalculator() {}
const std::vector<cvf::Vec3d>& pipeBranchCLCoords()
{
return m_pipeBranchCLCoords;
}
const std::vector<RigWellResultPoint>& pipeBranchWellResultPoints()
{
return m_pipeBranchWellResultPoints;
}
const std::vector<double>& pipeBranchMeasuredDepths()
{
return m_pipeBranchMeasuredDepths;
}
const std::vector<cvf::Vec3d>& pipeBranchCLCoords() { return m_pipeBranchCLCoords; }
const std::vector<RigWellResultPoint>& pipeBranchWellResultPoints() { return m_pipeBranchWellResultPoints; }
const std::vector<double>& pipeBranchMeasuredDepths() { return m_pipeBranchMeasuredDepths; }
protected:
RigEclipseWellLogExtractor* findWellLogExtractor( const QString& wellPathName, RimEclipseResultCase* eclCase )

4
ApplicationCode/ProjectDataModel/Flow/RimWellRftEnsembleCurveSet.cpp
View File

@@ -68,7 +68,9 @@ RimWellRftEnsembleCurveSet::RimWellRftEnsembleCurveSet()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellRftEnsembleCurveSet::~RimWellRftEnsembleCurveSet() {}
RimWellRftEnsembleCurveSet::~RimWellRftEnsembleCurveSet()
{
}
//--------------------------------------------------------------------------------------------------
///