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

Use AllowShortFunctionsOnASingleLine: InlineOnly

ApplicationCode/FileInterface/RifCaseRealizationParametersReader.cpp

@@ -235,7 +235,9 @@ RifCaseRealizationRunspecificationReader::RifCaseRealizationRunspecificationRead
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RifCaseRealizationRunspecificationReader::~RifCaseRealizationRunspecificationReader() {}
+RifCaseRealizationRunspecificationReader::~RifCaseRealizationRunspecificationReader()
+{
+}
 
 //--------------------------------------------------------------------------------------------------
 ///

ApplicationCode/FileInterface/RifColumnBasedUserData.cpp

@@ -35,12 +35,16 @@
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RifColumnBasedUserData::RifColumnBasedUserData() {}
+RifColumnBasedUserData::RifColumnBasedUserData()
+{
+}
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RifColumnBasedUserData::~RifColumnBasedUserData() {}
+RifColumnBasedUserData::~RifColumnBasedUserData()
+{
+}
 
 //--------------------------------------------------------------------------------------------------
 ///

ApplicationCode/FileInterface/RifCsvUserData.cpp

@@ -35,12 +35,16 @@
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RifCsvUserData::RifCsvUserData() {}
+RifCsvUserData::RifCsvUserData()
+{
+}
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RifCsvUserData::~RifCsvUserData() {}
+RifCsvUserData::~RifCsvUserData()
+{
+}
 
 //--------------------------------------------------------------------------------------------------
 ///

ApplicationCode/FileInterface/RifCsvUserDataParser.cpp

@@ -76,7 +76,9 @@ RifCsvUserDataParser::RifCsvUserDataParser( QString* errorText )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RifCsvUserDataParser::~RifCsvUserDataParser() {}
+RifCsvUserDataParser::~RifCsvUserDataParser()
+{
+}
 
 //--------------------------------------------------------------------------------------------------
 ///

ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp

@@ -58,12 +58,16 @@ QString pathsKeyword( "PATHS" );
 //--------------------------------------------------------------------------------------------------
 /// Constructor
 //--------------------------------------------------------------------------------------------------
-RifEclipseInputFileTools::RifEclipseInputFileTools() {}
+RifEclipseInputFileTools::RifEclipseInputFileTools()
+{
+}
 
 //--------------------------------------------------------------------------------------------------
 /// Destructor
 //--------------------------------------------------------------------------------------------------
-RifEclipseInputFileTools::~RifEclipseInputFileTools() {}
+RifEclipseInputFileTools::~RifEclipseInputFileTools()
+{
+}
 
 //--------------------------------------------------------------------------------------------------
 ///

ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp

@@ -45,12 +45,16 @@
 //--------------------------------------------------------------------------------------------------
 /// Constructor
 //--------------------------------------------------------------------------------------------------
-RifEclipseOutputFileTools::RifEclipseOutputFileTools() {}
+RifEclipseOutputFileTools::RifEclipseOutputFileTools()
+{
+}
 
 //--------------------------------------------------------------------------------------------------
 /// Destructor
 //--------------------------------------------------------------------------------------------------
-RifEclipseOutputFileTools::~RifEclipseOutputFileTools() {}
+RifEclipseOutputFileTools::~RifEclipseOutputFileTools()
+{
+}
 
 struct KeywordItemCounter
 {
@@ -61,10 +65,7 @@ struct KeywordItemCounter
     {
     }
 
-    bool operator==( const std::string& rhs ) const
-    {
-        return this->m_keyword == rhs;
-    }
+    bool operator==( const std::string& rhs ) const { return this->m_keyword == rhs; }
 
     std::string m_keyword;
     size_t      m_aggregatedItemCount;

ApplicationCode/FileInterface/RifEclipseRestartDataAccess.cpp

@@ -21,17 +21,23 @@
 //--------------------------------------------------------------------------------------------------
 /// Constructor
 //--------------------------------------------------------------------------------------------------
-RifEclipseRestartDataAccess::RifEclipseRestartDataAccess() {}
+RifEclipseRestartDataAccess::RifEclipseRestartDataAccess()
+{
+}
 
 //--------------------------------------------------------------------------------------------------
 /// Destructor
 //--------------------------------------------------------------------------------------------------
-RifEclipseRestartDataAccess::~RifEclipseRestartDataAccess() {}
+RifEclipseRestartDataAccess::~RifEclipseRestartDataAccess()
+{
+}
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RifRestartReportKeywords::RifRestartReportKeywords() {}
+RifRestartReportKeywords::RifRestartReportKeywords()
+{
+}
 
 //--------------------------------------------------------------------------------------------------
 ///

ApplicationCode/FileInterface/RifEclipseRestartDataAccess.h

@@ -41,18 +41,9 @@ public:
     {
     }
 
-    std::string keyword() const
-    {
-        return m_keyword;
-    }
-    size_t itemCount() const
-    {
-        return m_itemCount;
-    }
-    int indexWithinReportStep() const
-    {
-        return m_indexWithinReportStep;
-    }
+    std::string keyword() const { return m_keyword; }
+    size_t      itemCount() const { return m_itemCount; }
+    int         indexWithinReportStep() const { return m_indexWithinReportStep; }
 
 private:
     std::string m_keyword;

ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.cpp

@@ -97,7 +97,9 @@ void RifEclipseRestartFilesetAccess::setRestartFiles( const QStringList& fileSet
 //--------------------------------------------------------------------------------------------------
 /// Close files
 //--------------------------------------------------------------------------------------------------
-void RifEclipseRestartFilesetAccess::close() {}
+void RifEclipseRestartFilesetAccess::close()
+{
+}
 
 //--------------------------------------------------------------------------------------------------
 ///

ApplicationCode/FileInterface/RifEclipseRftAddress.h

@@ -53,18 +53,9 @@ public:
 public:
     RifEclipseRftAddress( QString wellName, QDateTime timeStep, RftWellLogChannelType wellLogChannel );
 
-    const QString& wellName() const
-    {
-        return m_wellName;
-    }
-    QDateTime timeStep() const
-    {
-        return m_timeStep;
-    }
-    const RftWellLogChannelType& wellLogChannel() const
-    {
-        return m_wellLogChannel;
-    }
+    const QString&               wellName() const { return m_wellName; }
+    QDateTime                    timeStep() const { return m_timeStep; }
+    const RftWellLogChannelType& wellLogChannel() const { return m_wellLogChannel; }
 
     static std::set<RftWellLogChannelType> rftPlotChannelTypes()
     {

ApplicationCode/FileInterface/RifEclipseSummaryAddress.h

@@ -160,62 +160,23 @@ public:
 
     // Access methods
 
-    SummaryVarCategory category() const
-    {
-        return m_variableCategory;
-    }
-    const std::string& quantityName() const
-    {
-        return m_quantityName;
-    }
-    bool isHistoryQuantity() const;
+    SummaryVarCategory category() const { return m_variableCategory; }
+    const std::string& quantityName() const { return m_quantityName; }
+    bool               isHistoryQuantity() const;
 
-    int regionNumber() const
-    {
-        return m_regionNumber;
-    }
-    int regionNumber2() const
-    {
-        return m_regionNumber2;
-    }
+    int regionNumber() const { return m_regionNumber; }
+    int regionNumber2() const { return m_regionNumber2; }
 
-    const std::string& wellGroupName() const
-    {
-        return m_wellGroupName;
-    }
-    const std::string& wellName() const
-    {
-        return m_wellName;
-    }
-    int wellSegmentNumber() const
-    {
-        return m_wellSegmentNumber;
-    }
-    const std::string& lgrName() const
-    {
-        return m_lgrName;
-    }
-    int cellI() const
-    {
-        return m_cellI;
-    }
-    int cellJ() const
-    {
-        return m_cellJ;
-    }
-    int cellK() const
-    {
-        return m_cellK;
-    }
-    int aquiferNumber() const
-    {
-        return m_aquiferNumber;
-    }
-    int id() const
-    {
-        return m_id;
-    }
-    std::string blockAsString() const;
+    const std::string& wellGroupName() const { return m_wellGroupName; }
+    const std::string& wellName() const { return m_wellName; }
+    int                wellSegmentNumber() const { return m_wellSegmentNumber; }
+    const std::string& lgrName() const { return m_lgrName; }
+    int                cellI() const { return m_cellI; }
+    int                cellJ() const { return m_cellJ; }
+    int                cellK() const { return m_cellK; }
+    int                aquiferNumber() const { return m_aquiferNumber; }
+    int                id() const { return m_id; }
+    std::string        blockAsString() const;
 
     const std::string ensembleStatisticsQuantityName() const;
 
@@ -226,45 +187,18 @@ public:
     bool        isUiTextMatchingFilterText( const QString& filterString ) const;
 
     bool isValid() const;
-    void setQuantityName( const std::string& quantity )
-    {
-        m_quantityName = quantity;
-    }
-    void setWellName( const std::string& wellName )
-    {
-        m_wellName = wellName;
-    }
-    void setWellGroupName( const std::string& wellGroupName )
-    {
-        m_wellGroupName = wellGroupName;
-    }
-    void setRegion( int region )
-    {
-        m_regionNumber = (int16_t)region;
-    }
-    void setAquiferNumber( int aquiferNumber )
-    {
-        m_aquiferNumber = (int16_t)aquiferNumber;
-    }
+    void setQuantityName( const std::string& quantity ) { m_quantityName = quantity; }
+    void setWellName( const std::string& wellName ) { m_wellName = wellName; }
+    void setWellGroupName( const std::string& wellGroupName ) { m_wellGroupName = wellGroupName; }
+    void setRegion( int region ) { m_regionNumber = (int16_t)region; }
+    void setAquiferNumber( int aquiferNumber ) { m_aquiferNumber = (int16_t)aquiferNumber; }
     void setCellIjk( const std::string& uiText );
-    void setWellSegmentNumber( int segment )
-    {
-        m_wellSegmentNumber = (int16_t)segment;
-    }
+    void setWellSegmentNumber( int segment ) { m_wellSegmentNumber = (int16_t)segment; }
 
-    void setAsErrorResult()
-    {
-        m_isErrorResult = true;
-    }
-    bool isErrorResult() const
-    {
-        return m_isErrorResult;
-    }
+    void setAsErrorResult() { m_isErrorResult = true; }
+    bool isErrorResult() const { return m_isErrorResult; }
 
-    void setId( int id )
-    {
-        m_id = id;
-    }
+    void setId( int id ) { m_id = id; }
 
     bool hasAccumulatedData() const;
 

ApplicationCode/FileInterface/RifEclipseUserDataParserTools.h

@@ -103,25 +103,13 @@ public:
         }
     }
 
-    std::string origin() const
-    {
-        return m_origin;
-    }
+    std::string origin() const { return m_origin; }
 
-    std::string startDate() const
-    {
-        return m_startDate;
-    }
+    std::string startDate() const { return m_startDate; }
 
-    std::vector<Column>& columnInfos()
-    {
-        return m_columnInfos;
-    }
+    std::vector<Column>& columnInfos() { return m_columnInfos; }
 
-    const std::vector<Column>& columnInfos() const
-    {
-        return m_columnInfos;
-    }
+    const std::vector<Column>& columnInfos() const { return m_columnInfos; }
 
     int       dateTimeColumnIndex() const;
     QDateTime findFirstDate() const;

ApplicationCode/FileInterface/RifElementPropertyReader.cpp

@@ -36,7 +36,9 @@ RifElementPropertyReader::RifElementPropertyReader( const std::vector<int>& elem
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RifElementPropertyReader::~RifElementPropertyReader() {}
+RifElementPropertyReader::~RifElementPropertyReader()
+{
+}
 
 //--------------------------------------------------------------------------------------------------
 ///

ApplicationCode/FileInterface/RifHdf5Reader.cpp

@@ -64,7 +64,9 @@ RifHdf5Reader::RifHdf5Reader( const QString& fileName )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RifHdf5Reader::~RifHdf5Reader() {}
+RifHdf5Reader::~RifHdf5Reader()
+{
+}
 
 //--------------------------------------------------------------------------------------------------
 ///

ApplicationCode/FileInterface/RifKeywordVectorUserData.cpp

@@ -35,12 +35,16 @@
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RifKeywordVectorUserData::RifKeywordVectorUserData() {}
+RifKeywordVectorUserData::RifKeywordVectorUserData()
+{
+}
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RifKeywordVectorUserData::~RifKeywordVectorUserData() {}
+RifKeywordVectorUserData::~RifKeywordVectorUserData()
+{
+}
 
 //--------------------------------------------------------------------------------------------------
 ///

ApplicationCode/FileInterface/RifReaderEclipseInput.cpp

@@ -35,12 +35,16 @@
 //--------------------------------------------------------------------------------------------------
 /// Constructor
 //--------------------------------------------------------------------------------------------------
-RifReaderEclipseInput::RifReaderEclipseInput() {}
+RifReaderEclipseInput::RifReaderEclipseInput()
+{
+}
 
 //--------------------------------------------------------------------------------------------------
 /// Destructor
 //--------------------------------------------------------------------------------------------------
-RifReaderEclipseInput::~RifReaderEclipseInput() {}
+RifReaderEclipseInput::~RifReaderEclipseInput()
+{
+}
 
 //--------------------------------------------------------------------------------------------------
 /// Open file and read geometry into given reservoir object

ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp

@@ -604,12 +604,16 @@ const std::vector<double> RifReaderEclipseSummary::ValuesCache::EMPTY_VECTOR;
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RifReaderEclipseSummary::ValuesCache::ValuesCache() {}
+RifReaderEclipseSummary::ValuesCache::ValuesCache()
+{
+}
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RifReaderEclipseSummary::ValuesCache::~ValuesCache() {}
+RifReaderEclipseSummary::ValuesCache::~ValuesCache()
+{
+}
 
 //--------------------------------------------------------------------------------------------------
 ///

ApplicationCode/FileInterface/RifReaderEclipseSummary.h

@@ -49,10 +49,7 @@ public:
         , endDate( _endDate )
     {
     }
-    bool valid()
-    {
-        return !fileName.isEmpty();
-    }
+    bool valid() { return !fileName.isEmpty(); }
 
     QString fileName;
     time_t  startDate;
@@ -79,10 +76,7 @@ public:
     bool        values( const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values ) const override;
     std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override;
     RiaEclipseUnitTools::UnitSystem unitSystem() const override;
-    QStringList                     warnings() const
-    {
-        return m_warnings;
-    }
+    QStringList                     warnings() const { return m_warnings; }
 
     void markForCachePurge( const RifEclipseSummaryAddress& address ) override;
 

ApplicationCode/FileInterface/RifReaderInterface.h

@@ -62,14 +62,8 @@ public:
                                 size_t                        stepIndex,
                                 std::vector<double>*          values ) = 0;
 
-    void setFilenamesWithFaults( const std::vector<QString>& filenames )
-    {
-        m_filenamesWithFaults = filenames;
-    }
-    std::vector<QString> filenamesWithFaults()
-    {
-        return m_filenamesWithFaults;
-    }
+    void setFilenamesWithFaults( const std::vector<QString>& filenames ) { m_filenamesWithFaults = filenames; }
+    std::vector<QString> filenamesWithFaults() { return m_filenamesWithFaults; }
 
     void setTimeStepFilter( const std::vector<size_t>& fileTimeStepIndices );
 

ApplicationCode/FileInterface/RifReaderMockModel.cpp

@@ -141,7 +141,9 @@ RifReaderMockModel::RifReaderMockModel()
     */
 }
 
-RifReaderMockModel::~RifReaderMockModel() {}
+RifReaderMockModel::~RifReaderMockModel()
+{
+}
 
 //--------------------------------------------------------------------------------------------------
 ///

ApplicationCode/FileInterface/RifReaderObservedData.cpp

@@ -29,12 +29,16 @@
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RifReaderObservedData::RifReaderObservedData() {}
+RifReaderObservedData::RifReaderObservedData()
+{
+}
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RifReaderObservedData::~RifReaderObservedData() {}
+RifReaderObservedData::~RifReaderObservedData()
+{
+}
 
 //--------------------------------------------------------------------------------------------------
 ///

ApplicationCode/FileInterface/RifSummaryCaseRestartSelector.cpp

@@ -78,7 +78,9 @@ RifSummaryCaseRestartSelector::RifSummaryCaseRestartSelector()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RifSummaryCaseRestartSelector::~RifSummaryCaseRestartSelector() {}
+RifSummaryCaseRestartSelector::~RifSummaryCaseRestartSelector()
+{
+}
 
 //--------------------------------------------------------------------------------------------------
 ///