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

Use AllowShortFunctionsOnASingleLine: InlineOnly
2025-02-25 18:55:39 -06:00 · 2020-02-12 11:13:38 +01:00
parent ab9d46ee75
commit 10f0abc9b5
428 changed files with 1519 additions and 1990 deletions
--- a/ApplicationCode/ProjectDataModel/Completions/RimCompletionTemplateCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimCompletionTemplateCollection.cpp
@@ -44,7 +44,9 @@ RimCompletionTemplateCollection::RimCompletionTemplateCollection()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimCompletionTemplateCollection::~RimCompletionTemplateCollection() {}
+RimCompletionTemplateCollection::~RimCompletionTemplateCollection()
+{
+}

 //--------------------------------------------------------------------------------------------------
 ///
--- a/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp
@@ -68,7 +68,9 @@ RimEllipseFractureTemplate::RimEllipseFractureTemplate()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimEllipseFractureTemplate::~RimEllipseFractureTemplate() {}
+RimEllipseFractureTemplate::~RimEllipseFractureTemplate()
+{
+}

 //--------------------------------------------------------------------------------------------------
 ///
--- a/ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPath.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPath.cpp
@@ -50,7 +50,9 @@ RimFishboneWellPath::RimFishboneWellPath()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimFishboneWellPath::~RimFishboneWellPath() {}
+RimFishboneWellPath::~RimFishboneWellPath()
+{
+}

 //--------------------------------------------------------------------------------------------------
 ///
--- a/ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPath.h
+++ b/ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPath.h
@@ -56,14 +56,8 @@ public:
    void setCoordinates( std::vector<cvf::Vec3d> coordinates );
    void setMeasuredDepths( std::vector<double> measuredDepths );

-    std::vector<cvf::Vec3d> coordinates() const
-    {
-        return m_coordinates();
-    }
-    std::vector<double> measuredDepths() const
-    {
-        return m_measuredDepths();
-    }
+    std::vector<cvf::Vec3d> coordinates() const { return m_coordinates(); }
+    std::vector<double>     measuredDepths() const { return m_measuredDepths(); }

 private:
    QString displayCoordinates() const;
--- a/ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPathCollection.h
+++ b/ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPathCollection.h
@@ -53,10 +53,7 @@ public:
    {
        return m_pipeProperties->holeDiameter( unitSystem );
    }
-    double skinFactor() const
-    {
-        return m_pipeProperties->skinFactor();
-    }
+    double skinFactor() const { return m_pipeProperties->skinFactor(); }

    void setUnitSystemSpecificDefaults();

--- a/ApplicationCode/ProjectDataModel/Completions/RimFishbonesCollection.h
+++ b/ApplicationCode/ProjectDataModel/Completions/RimFishbonesCollection.h
@@ -53,10 +53,7 @@ public:

    void   recalculateStartMD();
    double startMD() const;
-    double mainBoreSkinFactor() const
-    {
-        return m_skinFactor;
-    }
+    double mainBoreSkinFactor() const { return m_skinFactor; }
    double mainBoreDiameter( RiaEclipseUnitTools::UnitSystem unitSystem ) const;
    void   setUnitSystemSpecificDefaults();

--- a/ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.cpp
@@ -160,7 +160,9 @@ RimFishbonesMultipleSubs::RimFishbonesMultipleSubs()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimFishbonesMultipleSubs::~RimFishbonesMultipleSubs() {}
+RimFishbonesMultipleSubs::~RimFishbonesMultipleSubs()
+{
+}

 //--------------------------------------------------------------------------------------------------
 ///
--- a/ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.h
+++ b/ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.h
@@ -92,11 +92,8 @@ public:
    {
        return m_pipeProperties()->holeDiameter( unitSystem );
    }
-    double effectiveDiameter( RiaEclipseUnitTools::UnitSystem unitSystem ) const;
-    double skinFactor() const
-    {
-        return m_pipeProperties()->skinFactor();
-    }
+    double              effectiveDiameter( RiaEclipseUnitTools::UnitSystem unitSystem ) const;
+    double              skinFactor() const { return m_pipeProperties()->skinFactor(); }
    double              openHoleRoughnessFactor( RiaEclipseUnitTools::UnitSystem unitSystem ) const;
    double              icdOrificeDiameter( RiaEclipseUnitTools::UnitSystem unitSystem ) const;
    double              icdFlowCoefficient() const;
@@ -105,10 +102,7 @@ public:

    void geometryUpdated();

-    const std::vector<SubLateralIndex>& installedLateralIndices() const
-    {
-        return m_subLateralIndices;
-    };
+    const std::vector<SubLateralIndex>&        installedLateralIndices() const { return m_subLateralIndices; };
    std::vector<cvf::Vec3d>                    coordsForLateral( size_t subIndex, size_t lateralIndex ) const;
    std::vector<std::pair<cvf::Vec3d, double>> coordsAndMDForLateral( size_t subIndex, size_t lateralIndex ) const;
    void                                       recomputeLateralLocations();
--- a/ApplicationCode/ProjectDataModel/Completions/RimFishbonesPipeProperties.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimFishbonesPipeProperties.cpp
@@ -38,7 +38,9 @@ RimFishbonesPipeProperties::RimFishbonesPipeProperties()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimFishbonesPipeProperties::~RimFishbonesPipeProperties() {}
+RimFishbonesPipeProperties::~RimFishbonesPipeProperties()
+{
+}

 //--------------------------------------------------------------------------------------------------
 ///
--- a/ApplicationCode/ProjectDataModel/Completions/RimFishbonesPipeProperties.h
+++ b/ApplicationCode/ProjectDataModel/Completions/RimFishbonesPipeProperties.h
@@ -41,10 +41,7 @@ public:
    RimFishbonesPipeProperties();
    ~RimFishbonesPipeProperties() override;

-    double skinFactor() const
-    {
-        return m_skinFactor();
-    }
+    double skinFactor() const { return m_skinFactor(); }
    double holeDiameter( RiaEclipseUnitTools::UnitSystem unitSystem ) const;

    void setUnitSystemSpecificDefaults();
--- a/ApplicationCode/ProjectDataModel/Completions/RimFracture.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimFracture.cpp
@@ -160,7 +160,9 @@ RimFracture::RimFracture()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimFracture::~RimFracture() {}
+RimFracture::~RimFracture()
+{
+}

 //--------------------------------------------------------------------------------------------------
 ///
--- a/ApplicationCode/ProjectDataModel/Completions/RimFracture.h
+++ b/ApplicationCode/ProjectDataModel/Completions/RimFracture.h
@@ -55,10 +55,7 @@ public:
    {
    }

-    bool isDirty() const
-    {
-        return isDataDirty;
-    }
+    bool isDirty() const { return isDataDirty; }

    double eqWellRadius;
    double width;
--- a/ApplicationCode/ProjectDataModel/Completions/RimFractureContainment.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimFractureContainment.cpp
@@ -61,7 +61,9 @@ RimFractureContainment::RimFractureContainment()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimFractureContainment::~RimFractureContainment() {}
+RimFractureContainment::~RimFractureContainment()
+{
+}

 //--------------------------------------------------------------------------------------------------
 ///
--- a/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.cpp
@@ -187,7 +187,9 @@ RimFractureTemplate::RimFractureTemplate()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimFractureTemplate::~RimFractureTemplate() {}
+RimFractureTemplate::~RimFractureTemplate()
+{
+}

 //--------------------------------------------------------------------------------------------------
 ///
--- a/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.h
+++ b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.h
@@ -58,10 +58,7 @@ public:
        return false;
    }

-    bool isConductivityDefined() const
-    {
-        return ( m_conductivity != std::numeric_limits<double>::infinity() );
-    }
+    bool isConductivityDefined() const { return ( m_conductivity != std::numeric_limits<double>::infinity() ); }

    // Unit : meter or feet
    double m_width;
--- a/ApplicationCode/ProjectDataModel/Completions/RimMswCompletionParameters.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimMswCompletionParameters.cpp
@@ -98,7 +98,9 @@ RimMswCompletionParameters::RimMswCompletionParameters( bool enableReferenceDept
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimMswCompletionParameters::~RimMswCompletionParameters() {}
+RimMswCompletionParameters::~RimMswCompletionParameters()
+{
+}

 //--------------------------------------------------------------------------------------------------
 ///
--- a/ApplicationCode/ProjectDataModel/Completions/RimNonDarcyPerforationParameters.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimNonDarcyPerforationParameters.cpp
@@ -96,7 +96,9 @@ RimNonDarcyPerforationParameters::RimNonDarcyPerforationParameters()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimNonDarcyPerforationParameters::~RimNonDarcyPerforationParameters() {}
+RimNonDarcyPerforationParameters::~RimNonDarcyPerforationParameters()
+{
+}

 //--------------------------------------------------------------------------------------------------
 ///
--- a/ApplicationCode/ProjectDataModel/Completions/RimPerforationInterval.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimPerforationInterval.cpp
@@ -69,7 +69,9 @@ RimPerforationInterval::RimPerforationInterval()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimPerforationInterval::~RimPerforationInterval() {}
+RimPerforationInterval::~RimPerforationInterval()
+{
+}

 //--------------------------------------------------------------------------------------------------
 ///
--- a/ApplicationCode/ProjectDataModel/Completions/RimSimWellFracture.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimSimWellFracture.cpp
@@ -55,7 +55,9 @@ RimSimWellFracture::RimSimWellFracture( void )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimSimWellFracture::~RimSimWellFracture() {}
+RimSimWellFracture::~RimSimWellFracture()
+{
+}

 //--------------------------------------------------------------------------------------------------
 ///
--- a/ApplicationCode/ProjectDataModel/Completions/RimSimWellFracture.h
+++ b/ApplicationCode/ProjectDataModel/Completions/RimSimWellFracture.h
@@ -42,15 +42,9 @@ public:
    void updateAzimuthBasedOnWellAzimuthAngle() override;

    double wellAzimuthAtFracturePosition() const override;
-    double fractureMD() const override
-    {
-        return m_location;
-    }
+    double fractureMD() const override { return m_location; }

-    int branchIndex() const
-    {
-        return m_branchIndex();
-    }
+    int branchIndex() const { return m_branchIndex(); }

    void loadDataAndUpdate() override;

--- a/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp
@@ -93,7 +93,9 @@ RimStimPlanFractureTemplate::RimStimPlanFractureTemplate()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimStimPlanFractureTemplate::~RimStimPlanFractureTemplate() {}
+RimStimPlanFractureTemplate::~RimStimPlanFractureTemplate()
+{
+}

 //--------------------------------------------------------------------------------------------------
 ///
--- a/ApplicationCode/ProjectDataModel/Completions/RimValveTemplate.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimValveTemplate.cpp
@@ -59,12 +59,16 @@ RimValveTemplate::RimValveTemplate()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimValveTemplate::~RimValveTemplate() {}
+RimValveTemplate::~RimValveTemplate()
+{
+}

 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimValveTemplate::loadDataAndUpdate() {}
+void RimValveTemplate::loadDataAndUpdate()
+{
+}

 //--------------------------------------------------------------------------------------------------
 ///
--- a/ApplicationCode/ProjectDataModel/Completions/RimValveTemplateCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimValveTemplateCollection.cpp
@@ -46,7 +46,9 @@ RimValveTemplateCollection::RimValveTemplateCollection()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimValveTemplateCollection::~RimValveTemplateCollection() {}
+RimValveTemplateCollection::~RimValveTemplateCollection()
+{
+}

 //--------------------------------------------------------------------------------------------------
 ///
--- a/ApplicationCode/ProjectDataModel/Completions/RimWellPathAicdParameters.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimWellPathAicdParameters.cpp
@@ -74,7 +74,9 @@ RimWellPathAicdParameters::RimWellPathAicdParameters()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimWellPathAicdParameters::~RimWellPathAicdParameters() {}
+RimWellPathAicdParameters::~RimWellPathAicdParameters()
+{
+}

 //--------------------------------------------------------------------------------------------------
 /// Requires that all the required parameters are set and a proper value
--- a/ApplicationCode/ProjectDataModel/Completions/RimWellPathFracture.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimWellPathFracture.cpp
@@ -44,7 +44,9 @@ RimWellPathFracture::RimWellPathFracture( void )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimWellPathFracture::~RimWellPathFracture() {}
+RimWellPathFracture::~RimWellPathFracture()
+{
+}

 //--------------------------------------------------------------------------------------------------
 ///
--- a/ApplicationCode/ProjectDataModel/Completions/RimWellPathFractureCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimWellPathFractureCollection.cpp
@@ -50,7 +50,9 @@ RimWellPathFractureCollection::RimWellPathFractureCollection( void )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimWellPathFractureCollection::~RimWellPathFractureCollection() {}
+RimWellPathFractureCollection::~RimWellPathFractureCollection()
+{
+}

 //--------------------------------------------------------------------------------------------------
 ///
--- a/ApplicationCode/ProjectDataModel/Completions/RimWellPathValve.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimWellPathValve.cpp
@@ -67,7 +67,9 @@ RimWellPathValve::RimWellPathValve()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimWellPathValve::~RimWellPathValve() {}
+RimWellPathValve::~RimWellPathValve()
+{
+}

 //--------------------------------------------------------------------------------------------------
 ///