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

Janitor : Remove invalid conditionals

Browse Source
This commit is contained in:
Magne Sjaastad
2019-11-03 11:43:46 +01:00
parent 4ff56c7751
commit 93f6bc8c72
9 changed files with 15 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ProjectDataModel/Annotations/RimPolylinesFromFileAnnotation.cpp
View File

@@ -85,11 +85,12 @@ void RimPolylinesFromFileAnnotation::readPolyLinesFile( QString* errorMessage )
{
QString line = stream.readLine();
QStringList commentLineSegs = line.split( "#", QString::KeepEmptyParts );
if ( commentLineSegs.size() == 0 ) continue; // Empty line
if ( commentLineSegs.empty() ) continue; // Empty line
QStringList lineSegs = commentLineSegs[0].split( QRegExp( "\\s+" ), QString::SkipEmptyParts );
if ( lineSegs.size() == 0 ) continue; // No data
if ( lineSegs.empty() ) continue; // No data
if ( lineSegs.size() != 3 )
{
if ( errorMessage )
@@ -97,7 +98,6 @@ void RimPolylinesFromFileAnnotation::readPolyLinesFile( QString* errorMessage )
continue;
}
if ( lineSegs.size() == 3 ) // Normal case
{
bool isNumberParsingOk = true;
bool isOk = true;

2
ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp
View File

@@ -926,8 +926,6 @@ QList<caf::PdmOptionItemInfo> RimWellLogTrack::calculateValueOptions( const caf:
{
QList<caf::PdmOptionItemInfo> options;
if ( options.size() > 0 ) return options;
if ( fieldNeedingOptions == &m_regionAnnotationType )
{
options.push_back(