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

25
ApplicationCode/ProjectDataModel/RimWellLogFile.h
View File

@@ -49,24 +49,15 @@ public:
static RimWellLogFile* readWellLogFile( const QString& logFilePath, QString* errorMessage );
void setFileName( const QString& fileName );
QString fileName() const
{
return m_fileName().path();
}
QString name() const
{
return m_name;
}
QString fileName() const { return m_fileName().path(); }
QString name() const { return m_name; }
bool readFile( QString* errorMessage );
QString wellName() const;
QDateTime date() const;
RigWellLogFile* wellLogFileData()
{
return m_wellLogDataFile.p();
}
RigWellLogFile* wellLogFileData() { return m_wellLogDataFile.p(); }
std::vector<RimWellLogFileChannel*> wellLogChannels() const;
bool hasFlowData() const;
@@ -77,10 +68,7 @@ public:
WELL_FLOW_COND_STANDARD
};
RimWellLogFile::WellFlowCondition wellFlowRateCondition() const
{
return m_wellFlowCondition();
}
RimWellLogFile::WellFlowCondition wellFlowRateCondition() const { return m_wellFlowCondition(); }
void updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath );
@@ -98,10 +86,7 @@ private:
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute ) override;
caf::PdmFieldHandle* userDescriptionField() override
{
return &m_name;
}
caf::PdmFieldHandle* userDescriptionField() override { return &m_name; }
static bool isDateValid( const QDateTime dateTime );