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/Commands/OctaveScriptCommands/RicDeleteScriptPathFeature.cpp
View File

@@ -49,7 +49,7 @@ bool RicDeleteScriptPathFeature::isCommandEnabled()
void RicDeleteScriptPathFeature::onActionTriggered(bool isChecked)
{
std::vector<RimScriptCollection*> calcScriptCollections = RicScriptFeatureImpl::selectedScriptCollections();
RimScriptCollection* scriptCollection = calcScriptCollections.size() > 0 ? calcScriptCollections[0] : NULL;
RimScriptCollection* scriptCollection = calcScriptCollections.size() > 0 ? calcScriptCollections[0] : nullptr;
if (scriptCollection)
{
QString toBeRemoved = scriptCollection->directory;

4
ApplicationCode/Commands/OctaveScriptCommands/RicNewScriptFeature.cpp
View File

@@ -56,8 +56,8 @@ void RicNewScriptFeature::onActionTriggered(bool isChecked)
std::vector<RimCalcScript*> calcScripts = RicScriptFeatureImpl::selectedScripts();
std::vector<RimScriptCollection*> calcScriptCollections = RicScriptFeatureImpl::selectedScriptCollections();
RimCalcScript* calcScript = calcScripts.size() > 0 ? calcScripts[0] : NULL;
RimScriptCollection* scriptColl = calcScriptCollections.size() > 0 ? calcScriptCollections[0] : NULL;
RimCalcScript* calcScript = calcScripts.size() > 0 ? calcScripts[0] : nullptr;
RimScriptCollection* scriptColl = calcScriptCollections.size() > 0 ? calcScriptCollections[0] : nullptr;
QString fullPathNewScript;