clang-format: Set column width to 140

* Set column width to 140
* Use c++20
* Remove redundant virtual
This commit is contained in:
Magne Sjaastad
2023-02-26 10:48:40 +01:00
committed by GitHub
parent 8768e186d8
commit f8c5cf389f
1535 changed files with 10456 additions and 19398 deletions

View File

@@ -22,12 +22,10 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
cvf::ref<RigWellPathFormations> RifWellPathFormationsImporter::readWellPathFormations( const QString& formationFilePath,
const QString& wellName )
cvf::ref<RigWellPathFormations> RifWellPathFormationsImporter::readWellPathFormations( const QString& formationFilePath, const QString& wellName )
{
readAllWellPathFormations( formationFilePath );
if ( m_fileNameToWellPathFormationMap[formationFilePath].find( wellName ) !=
m_fileNameToWellPathFormationMap[formationFilePath].end() )
if ( m_fileNameToWellPathFormationMap[formationFilePath].find( wellName ) != m_fileNameToWellPathFormationMap[formationFilePath].end() )
{
return m_fileNameToWellPathFormationMap[formationFilePath][wellName];
}
@@ -40,8 +38,8 @@ cvf::ref<RigWellPathFormations> RifWellPathFormationsImporter::readWellPathForma
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
cvf::ref<RigWellPathFormations>
RifWellPathFormationsImporter::reloadWellPathFormations( const QString& formationFilePath, const QString& wellName )
cvf::ref<RigWellPathFormations> RifWellPathFormationsImporter::reloadWellPathFormations( const QString& formationFilePath,
const QString& wellName )
{
m_fileNameToWellPathFormationMap.erase( formationFilePath );
@@ -51,8 +49,7 @@ cvf::ref<RigWellPathFormations>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::map<QString, cvf::ref<RigWellPathFormations>>
RifWellPathFormationsImporter::readWellPathFormationsFromPath( const QString& filePath )
std::map<QString, cvf::ref<RigWellPathFormations>> RifWellPathFormationsImporter::readWellPathFormationsFromPath( const QString& filePath )
{
// If we have the file in the map, assume it is already read.
if ( m_fileNameToWellPathFormationMap.find( filePath ) != m_fileNameToWellPathFormationMap.end() )