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-tidy) : modernize-use-nullptr

Browse Source
This commit is contained in:
Magne Sjaastad
2018-02-18 18:56:43 +01:00
parent 69875eec8f
commit 1ae30ef11a
195 changed files with 552 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
View File

@@ -71,7 +71,7 @@ RimIdenticalGridCaseGroup::RimIdenticalGridCaseGroup()
statisticsCaseCollection->uiCapability()->setUiIcon(QIcon(":/Histograms16x16.png"));
m_mainGrid = NULL;
m_mainGrid = nullptr;
m_unionOfMatrixActiveCells = new RigActiveCellInfo;
m_unionOfFractureActiveCells = new RigActiveCellInfo;
@@ -82,13 +82,13 @@ RimIdenticalGridCaseGroup::RimIdenticalGridCaseGroup()
//--------------------------------------------------------------------------------------------------
RimIdenticalGridCaseGroup::~RimIdenticalGridCaseGroup()
{
m_mainGrid = NULL;
m_mainGrid = nullptr;
delete caseCollection;
caseCollection = NULL;
caseCollection = nullptr;
delete statisticsCaseCollection;
statisticsCaseCollection = NULL;
statisticsCaseCollection = nullptr;
}
//--------------------------------------------------------------------------------------------------
@@ -130,7 +130,7 @@ void RimIdenticalGridCaseGroup::removeCase(RimEclipseCase* reservoir)
if (caseCollection()->reservoirs().size() == 0)
{
m_mainGrid = NULL;
m_mainGrid = nullptr;
}
clearActiveCellUnions();
@@ -145,7 +145,7 @@ RigMainGrid* RimIdenticalGridCaseGroup::mainGrid()
{
if (m_mainGrid) return m_mainGrid;
return NULL;
return nullptr;
}
//--------------------------------------------------------------------------------------------------
@@ -512,7 +512,7 @@ RimEclipseCase* RimIdenticalGridCaseGroup::mainCase()
}
else
{
return NULL;
return nullptr;
}
}