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

System : Replace NULL with nullptr

Browse Source
This commit is contained in:
Magne Sjaastad
2018-10-10 10:17:07 +02:00
parent c0d8fe37e1
commit 9d9771295f
20 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/FileInterface/RifCsvUserDataParser.cpp
View File

@@ -363,7 +363,7 @@ bool RifCsvUserDataParser::parseColumnBasedData(const AsciiDataParseOptions& par
throw 0;
}
// Add NULL value
// Add nullptr value
value = HUGE_VAL;
}
col.values.push_back(value);

4
ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp
View File

@@ -153,7 +153,7 @@ bool RifEclipseInputFileTools::openGridFile(const QString& fileName, RigEclipseC
allKwReadOk = allKwReadOk && nullptr != (coordKw = ecl_kw_fscanf_alloc_current_grdecl__(gridFilePointer, false , ecl_type_create_from_type(ECL_FLOAT_TYPE)));
progress.setProgress(3);
// If ACTNUM is not defined, this pointer will be NULL, which is a valid condition
// If ACTNUM is not defined, this pointer will be nullptr, which is a valid condition
if (actnumPos >= 0)
{
fseek(gridFilePointer, actnumPos, SEEK_SET);
@@ -161,7 +161,7 @@ bool RifEclipseInputFileTools::openGridFile(const QString& fileName, RigEclipseC
progress.setProgress(4);
}
// If MAPAXES is not defined, this pointer will be NULL, which is a valid condition
// If MAPAXES is not defined, this pointer will be nullptr, which is a valid condition
if (mapaxesPos >= 0)
{
fseek(gridFilePointer, mapaxesPos, SEEK_SET);

2
ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp
View File

@@ -234,7 +234,7 @@ bool RifEclipseOutputFileTools::keywordData(ecl_file_type* ecl_file, const QStri
}
//--------------------------------------------------------------------------------------------------
/// Get first occurrence of file of given type in given list of filenames, as filename or NULL if not found
/// Get first occurrence of file of given type in given list of filenames, as filename or nullptr if not found
//--------------------------------------------------------------------------------------------------
QString RifEclipseOutputFileTools::firstFileNameOfType(const QStringList& fileSet, ecl_file_enum fileType)
{

6
ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.cpp
View File

@@ -50,7 +50,7 @@ RifEclipseRestartFilesetAccess::~RifEclipseRestartFilesetAccess()
ecl_file_close(m_ecl_files[i]);
}
m_ecl_files[i] = NULL;
m_ecl_files[i] = nullptr;
}
}
@@ -91,7 +91,7 @@ void RifEclipseRestartFilesetAccess::setRestartFiles(const QStringList& fileSet)
for (int i = 0; i < m_fileNames.size(); i++)
{
m_ecl_files.push_back(NULL);
m_ecl_files.push_back(nullptr);
}
CVF_ASSERT(m_fileNames.size() == static_cast<int>(m_ecl_files.size()));
@@ -269,7 +269,7 @@ void RifEclipseRestartFilesetAccess::openTimeStep(size_t timeStep)
{
CVF_ASSERT(timeStep < m_ecl_files.size());
if (m_ecl_files[timeStep] == NULL)
if (m_ecl_files[timeStep] == nullptr)
{
int index = static_cast<int>(timeStep);
ecl_file_type* ecl_file = ecl_file_open(RiaStringEncodingTools::toNativeEncoded(m_fileNames[index]).data(), ECL_FILE_CLOSE_STREAM);

6
ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp
View File

@@ -125,7 +125,7 @@ RifReaderEclipseSummary::~RifReaderEclipseSummary()
//--------------------------------------------------------------------------------------------------
bool RifReaderEclipseSummary::open(const QString& headerFileName, bool includeRestartFiles)
{
assert(m_ecl_sum == NULL);
assert(m_ecl_sum == nullptr);
m_ecl_sum = openEclSum(headerFileName, includeRestartFiles);
@@ -375,7 +375,7 @@ RifEclipseSummaryAddress addressFromErtSmSpecNode(const smspec_node_type * ertSu
//--------------------------------------------------------------------------------------------------
bool RifReaderEclipseSummary::values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) const
{
assert(m_ecl_sum != NULL);
assert(m_ecl_sum != nullptr);
int variableIndex = indexFromAddress(resultAddress);
@@ -428,7 +428,7 @@ int RifReaderEclipseSummary::timeStepCount() const
//--------------------------------------------------------------------------------------------------
const std::vector<time_t>& RifReaderEclipseSummary::timeSteps(const RifEclipseSummaryAddress& resultAddress) const
{
assert(m_ecl_sum != NULL);
assert(m_ecl_sum != nullptr);
return m_timeSteps;
}