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

#1280 Use nullptr instead of NULL

Browse Source
This commit is contained in:
Magne Sjaastad 2017-03-02 13:39:41 +01:00
parent 3089abc83d
commit 2b029cbc11
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmObjectHandle.h
View File

@ -23,7 +23,7 @@ class PdmXmlObjectHandle;
class PdmObjectHandle class PdmObjectHandle
{ {
public: public:
PdmObjectHandle() { m_parentField = NULL; } PdmObjectHandle() { m_parentField = nullptr; }
virtual ~PdmObjectHandle(); virtual ~PdmObjectHandle();
/// The registered fields contained in this PdmObject. /// The registered fields contained in this PdmObject.
@ -65,7 +65,7 @@ public:
CapabilityType* capability = dynamic_cast<CapabilityType*>(m_capabilities[i].first); CapabilityType* capability = dynamic_cast<CapabilityType*>(m_capabilities[i].first);
if (capability) return capability; if (capability) return capability;
} }
return NULL; return nullptr;
} }
PdmUiObjectHandle* uiCapability() const; // Implementation is in cafPdmUiObjectHandle.cpp PdmUiObjectHandle* uiCapability() const; // Implementation is in cafPdmUiObjectHandle.cpp
@ -120,7 +120,7 @@ namespace caf
template <typename T> template <typename T>
void PdmObjectHandle::firstAncestorOrThisOfType(T*& ancestor) const void PdmObjectHandle::firstAncestorOrThisOfType(T*& ancestor) const
{ {
ancestor = NULL; ancestor = nullptr;
// Check if this matches the type // Check if this matches the type
@ -133,11 +133,11 @@ void PdmObjectHandle::firstAncestorOrThisOfType(T*& ancestor) const
// Search parents for first type match // Search parents for first type match
PdmObjectHandle* parent = NULL; PdmObjectHandle* parent = nullptr;
PdmFieldHandle* parentField = this->parentField(); PdmFieldHandle* parentField = this->parentField();
if (parentField) parent = parentField->ownerObject(); if (parentField) parent = parentField->ownerObject();
while (parent != NULL) while (parent != nullptr)
{ {
T* objectOfType = dynamic_cast<T*>(parent); T* objectOfType = dynamic_cast<T*>(parent);
if (objectOfType) if (objectOfType)
@ -156,7 +156,7 @@ void PdmObjectHandle::firstAncestorOrThisOfType(T*& ancestor) const
} }
else else
{ {
parent = NULL; parent = nullptr;
} }
} }
} }