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

clang-format: Set column width to 140

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

31
ApplicationLibCode/FileInterface/RifWellMeasurementReader.cpp
View File

@@ -27,8 +27,7 @@
//==================================================================================================
///
//==================================================================================================
void RifWellMeasurementReader::readWellMeasurements( std::vector<RifWellMeasurement>& wellMeasurements,
const QStringList& filePaths )
void RifWellMeasurementReader::readWellMeasurements( std::vector<RifWellMeasurement>& wellMeasurements, const QStringList& filePaths )
{
for ( const QString& filePath : filePaths )
{
@@ -48,8 +47,7 @@ void RifWellMeasurementReader::readWellMeasurements( std::vector<RifWellMeasurem
//==================================================================================================
///
//==================================================================================================
void RifWellMeasurementReader::readWellMeasurements( std::vector<RifWellMeasurement>& wellMeasurements,
const QString& filePath )
void RifWellMeasurementReader::readWellMeasurements( std::vector<RifWellMeasurement>& wellMeasurements, const QString& filePath )
{
QFile file( filePath );
if ( !file.open( QIODevice::ReadOnly | QIODevice::Text ) )
@@ -75,8 +73,7 @@ void RifWellMeasurementReader::readWellMeasurements( std::vector<RifWellMeasurem
//==================================================================================================
///
//==================================================================================================
RifWellMeasurement
RifWellMeasurementReader::parseWellMeasurement( const QString& line, int lineNumber, const QString& filePath )
RifWellMeasurement RifWellMeasurementReader::parseWellMeasurement( const QString& line, int lineNumber, const QString& filePath )
{
QStringList tokens = tokenize( line, "," );
@@ -117,18 +114,13 @@ QStringList RifWellMeasurementReader::tokenize( const QString& line, const QStri
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QDate RifWellMeasurementReader::parseDate( const QString& token,
const QString& propertyName,
int lineNumber,
const QString& filePath )
QDate RifWellMeasurementReader::parseDate( const QString& token, const QString& propertyName, int lineNumber, const QString& filePath )
{
QDate date = QDate::fromString( token, Qt::ISODate );
if ( !date.isValid() )
{
throw FileParseException( QString( "Invalid date format (must be ISO 8601) for '%1' on line %2: %3" )
.arg( propertyName )
.arg( lineNumber )
.arg( filePath ) );
throw FileParseException(
QString( "Invalid date format (must be ISO 8601) for '%1' on line %2: %3" ).arg( propertyName ).arg( lineNumber ).arg( filePath ) );
}
return date;
@@ -137,17 +129,13 @@ QDate RifWellMeasurementReader::parseDate( const QString& token,
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RifWellMeasurementReader::parseDouble( const QString& token,
const QString& propertyName,
int lineNumber,
const QString& filePath )
double RifWellMeasurementReader::parseDouble( const QString& token, const QString& propertyName, int lineNumber, const QString& filePath )
{
bool isOk = false;
double value = token.toDouble( &isOk );
if ( !isOk )
{
throw FileParseException(
QString( "Invalid number for '%1' on line %2: %3" ).arg( propertyName ).arg( lineNumber ).arg( filePath ) );
throw FileParseException( QString( "Invalid number for '%1' on line %2: %3" ).arg( propertyName ).arg( lineNumber ).arg( filePath ) );
}
return value;
@@ -162,8 +150,7 @@ int RifWellMeasurementReader::parseInt( const QString& token, const QString& pro
int value = token.toInt( &isOk );
if ( !isOk )
{
throw FileParseException(
QString( "Invalid number for '%1' on line %2: %3" ).arg( propertyName ).arg( lineNumber ).arg( filePath ) );
throw FileParseException( QString( "Invalid number for '%1' on line %2: %3" ).arg( propertyName ).arg( lineNumber ).arg( filePath ) );
}
return value;