COMP: Use nullptr instead of 0 or NULL

hjmjohnson · jcfr · commit 52664335302a · 2020-03-15T08:26:36.000-07:00
The check converts the usage of null pointer constants (eg. NULL, 0) to
use the new C++11 nullptr keyword.

cd ${BLDDIR}
run-clang-tidy.py -extra-arg=-D__clang__ -checks=-*,modernize-use-nullptr  -header-filter=.* -fix
diff --git a/Libs/MRML/Core/Testing/vtkMRMLDisplayableHierarchyNodeDisplayPropertiesTest.cxx b/Libs/MRML/Core/Testing/vtkMRMLDisplayableHierarchyNodeDisplayPropertiesTest.cxx
@@ -376,7 +376,7 @@ bool TestColors(vtkMRMLScene* scene,
       return false;
       }
     vtkMRMLDisplayableHierarchyNode* hierarchyNode = GetHierarchyNode(scene, level);
-    assert(hierarchyNode != 0);
+    assert(hierarchyNode != nullptr);
     vtkMRMLDisplayNode* hierarchyDisplayNode = hierarchyNode->GetDisplayNode();
     if (hierarchyDisplayNode->GetColor()[0] != hierarchyColors[level][0] ||
         hierarchyDisplayNode->GetColor()[1] != hierarchyColors[level][1] ||
@@ -411,7 +411,7 @@ bool TestVisibility(vtkMRMLScene* scene,
       return false;
       }
     vtkMRMLDisplayableHierarchyNode* hierarchyNode = GetHierarchyNode(scene, level);
-    assert(hierarchyNode != 0);
+    assert(hierarchyNode != nullptr);
     vtkMRMLDisplayNode* hierarchyDisplayNode = hierarchyNode->GetDisplayNode();
     if (hierarchyDisplayNode->GetVisibility() != hierarchyVisibility[level])
       {
diff --git a/Libs/MRML/Core/vtkMRMLScene.cxx b/Libs/MRML/Core/vtkMRMLScene.cxx
@@ -1304,7 +1304,7 @@ vtkMRMLNode* vtkMRMLScene::AddNewNodeByClassWithID(std::string className, std::s
   if (className.empty())
     {
     vtkErrorMacro("AddNewNodeByClassWithID: className is an emptry string");
-    return NULL;
+    return nullptr;
     }
 
   if (nodeID.empty())
@@ -1325,7 +1325,7 @@ vtkMRMLNode* vtkMRMLScene::AddNewNodeByClassWithID(std::string className, std::s
   if (this->NodeIDs.find(nodeID) != this->NodeIDs.end())
     {
     vtkErrorMacro("AddNewNodeByClassWithID: node already exists with ID - " << nodeID);
-    return NULL;
+    return nullptr;
     }
 
   vtkSmartPointer<vtkMRMLNode> nodeToAdd =
@@ -1910,7 +1910,7 @@ vtkMRMLNode* vtkMRMLScene::GetNodeByID(const char* id)
     {
     // Ensure the node can't be found, and there is no error with the cache
     // mechanism.
-    vtkMRMLNode* foundNode = 0;
+    vtkMRMLNode* foundNode = nullptr;
     vtkCollectionSimpleIterator it;
     for (this->Nodes->InitTraversal(it);
          (node = (vtkMRMLNode*)this->Nodes->GetNextItemAsObject(it)) ;)
diff --git a/Libs/MRML/Core/vtkMRMLTextStorageNode.cxx b/Libs/MRML/Core/vtkMRMLTextStorageNode.cxx
@@ -108,7 +108,7 @@ int vtkMRMLTextStorageNode::ReadDataInternal(vtkMRMLNode * refNode)
 bool vtkMRMLTextStorageNode::CanWriteFromReferenceNode(vtkMRMLNode * refNode)
 {
   vtkMRMLTextNode* textNode = vtkMRMLTextNode::SafeDownCast(refNode);
-  if (textNode == NULL)
+  if (textNode == nullptr)
     {
     vtkErrorMacro("vtkMRMLTextStorageNode::CanWriteFromReferenceNode: input is not a text node");
     return false;
@@ -120,7 +120,7 @@ bool vtkMRMLTextStorageNode::CanWriteFromReferenceNode(vtkMRMLNode * refNode)
 int vtkMRMLTextStorageNode::WriteDataInternal(vtkMRMLNode * refNode)
 {
   vtkMRMLTextNode* textNode = vtkMRMLTextNode::SafeDownCast(refNode);
-  if (textNode == NULL)
+  if (textNode == nullptr)
     {
     vtkErrorMacro(<< "vtkMRMLTextStorageNode::WriteDataInternal: Do not recognize node type " << refNode->GetClassName());
     return 0;
diff --git a/Libs/MRML/DisplayableManager/vtkMRMLCrosshairDisplayableManager.cxx b/Libs/MRML/DisplayableManager/vtkMRMLCrosshairDisplayableManager.cxx
@@ -142,7 +142,7 @@ vtkMRMLCrosshairDisplayableManager::vtkInternal::~vtkInternal()
     }
 
   // everything should be empty
-  assert(this->CrosshairNode == 0);
+  assert(this->CrosshairNode == nullptr);
 }
 
 //---------------------------------------------------------------------------
diff --git a/Libs/MRML/DisplayableManager/vtkMRMLVolumeGlyphSliceDisplayableManager.cxx b/Libs/MRML/DisplayableManager/vtkMRMLVolumeGlyphSliceDisplayableManager.cxx
@@ -123,7 +123,7 @@ vtkMRMLVolumeGlyphSliceDisplayableManager::vtkInternal::~vtkInternal()
 {
   this->SetSliceCompositeNode(nullptr);
   // everything should be empty
-  assert(this->SliceCompositeNode == 0);
+  assert(this->SliceCompositeNode == nullptr);
   assert(this->VolumeNodes.size() == 0);
   assert(this->DisplayNodes.size() == 0);
   assert(this->Actors.size() == 0);
diff --git a/Libs/MRML/Logic/vtkMRMLSliceLayerLogic.cxx b/Libs/MRML/Logic/vtkMRMLSliceLayerLogic.cxx
@@ -391,15 +391,15 @@ void vtkMRMLSliceLayerLogic::UpdateNodeReferences ()
     if ( displayNode != this->VolumeDisplayNodeObserved &&
          this->VolumeDisplayNode != nullptr)
       {
-      vtkDebugMacro("vtkMRMLSliceLayerLogic::UpdateNodeReferences: new display node = " << (displayNode == 0 ? "null" : "valid") << endl);
+      vtkDebugMacro("vtkMRMLSliceLayerLogic::UpdateNodeReferences: new display node = " << (displayNode == nullptr ? "null" : "valid") << endl);
       this->VolumeDisplayNode->Delete();
       this->VolumeDisplayNode = nullptr;
       }
 
     if ( displayNode != this->VolumeDisplayNodeObserved &&
          this->VolumeDisplayNodeUVW != nullptr)
       {
-      vtkDebugMacro("vtkMRMLSliceLayerLogic::UpdateNodeReferences: new display node = " << (displayNode == 0 ? "null" : "valid") << endl);
+      vtkDebugMacro("vtkMRMLSliceLayerLogic::UpdateNodeReferences: new display node = " << (displayNode == nullptr ? "null" : "valid") << endl);
       this->VolumeDisplayNodeUVW->Delete();
       this->VolumeDisplayNodeUVW = nullptr;
       }
diff --git a/Libs/MRML/Widgets/qMRMLSceneModel.cxx b/Libs/MRML/Widgets/qMRMLSceneModel.cxx
@@ -1176,7 +1176,7 @@ void qMRMLSceneModel::onMRMLSceneNodeAboutToBeAdded(vtkMRMLScene* scene, vtkMRML
   Q_UNUSED(node);
 #ifndef QT_NO_DEBUG
   Q_D(qMRMLSceneModel);
-  Q_ASSERT(scene != 0);
+  Q_ASSERT(scene != nullptr);
   Q_ASSERT(scene == d->MRMLScene);
 #endif
 }
diff --git a/Modules/Loadable/Data/Logic/vtkSlicerDataModuleLogic.cxx b/Modules/Loadable/Data/Logic/vtkSlicerDataModuleLogic.cxx
@@ -74,7 +74,7 @@ void vtkSlicerDataModuleLogic::SetMRMLSceneInternal(vtkMRMLScene * newScene)
 //-----------------------------------------------------------------------------
 void vtkSlicerDataModuleLogic::RegisterNodes()
 {
-  assert(this->GetMRMLScene() != 0);
+  assert(this->GetMRMLScene() != nullptr);
 }
 
 //---------------------------------------------------------------------------
diff --git a/Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyVisibilityPlugin.h b/Modules/Loadable/SubjectHierarchy/Widgets/qSlicerSubjectHierarchyVisibilityPlugin.h
@@ -38,7 +38,7 @@ class Q_SLICER_MODULE_SUBJECTHIERARCHY_WIDGETS_EXPORT qSlicerSubjectHierarchyVis
 
 public:
   typedef qSlicerSubjectHierarchyAbstractPlugin Superclass;
-  qSlicerSubjectHierarchyVisibilityPlugin(QObject* parent = NULL);
+  qSlicerSubjectHierarchyVisibilityPlugin(QObject* parent = nullptr);
   ~qSlicerSubjectHierarchyVisibilityPlugin() override;
 
 public:
diff --git a/Modules/Loadable/Texts/qSlicerTextsReader.h b/Modules/Loadable/Texts/qSlicerTextsReader.h
@@ -31,7 +31,7 @@ class qSlicerTextsReader : public qSlicerFileReader
   Q_OBJECT
 public:
   typedef qSlicerFileReader Superclass;
-  qSlicerTextsReader(QObject* parent = 0);
+  qSlicerTextsReader(QObject* parent = nullptr);
   ~qSlicerTextsReader() override;
 
   QString description() const override;
diff --git a/Modules/Loadable/Transforms/MRMLDM/vtkMRMLLinearTransformsDisplayableManager3D.cxx b/Modules/Loadable/Transforms/MRMLDM/vtkMRMLLinearTransformsDisplayableManager3D.cxx
@@ -64,9 +64,9 @@ class vtkLinearTransformWidgetCallback : public vtkCommand
   { return new vtkLinearTransformWidgetCallback; }
 
   vtkLinearTransformWidgetCallback()
-    : Widget(NULL)
-    , Node(NULL)
-    , DisplayableManager(NULL)
+    : Widget(nullptr)
+    , Node(nullptr)
+    , DisplayableManager(nullptr)
   {
   }
 
diff --git a/Modules/Loadable/Units/Logic/vtkSlicerUnitsLogic.cxx b/Modules/Loadable/Units/Logic/vtkSlicerUnitsLogic.cxx
@@ -280,7 +280,7 @@ void vtkSlicerUnitsLogic::RegisterNodes()
 //-----------------------------------------------------------------------------
 void vtkSlicerUnitsLogic::RegisterNodesInternal(vtkMRMLScene* scene)
 {
-  assert(scene != 0);
+  assert(scene != nullptr);
 
   vtkNew<vtkMRMLUnitNode> unitNode;
   scene->RegisterNodeClass(unitNode.GetPointer());
@@ -327,7 +327,7 @@ void vtkSlicerUnitsLogic::SaveDefaultUnits()
     assert(qIt != quantities.end());
     const char* quantity = *qIt;
     const char* unitID = *uIt;
-    assert( (quantity != 0) == (unitID != 0) );
+    assert( (quantity != nullptr) == (unitID != nullptr) );
     if (quantity && unitID)
       {
       this->CachedDefaultUnits[quantity] = unitID;
diff --git a/Modules/Loadable/VolumeRendering/MRML/vtkMRMLVolumeRenderingDisplayNode.cxx b/Modules/Loadable/VolumeRendering/MRML/vtkMRMLVolumeRenderingDisplayNode.cxx
@@ -308,7 +308,7 @@ void vtkMRMLVolumeRenderingDisplayNode::ProcessMRMLEvents(vtkObject *caller,
       shaderPropertyNode == vtkMRMLShaderPropertyNode::SafeDownCast(caller) &&
       event ==  vtkCommand::ModifiedEvent)
     {
-    this->InvokeEvent(vtkCommand::ModifiedEvent, NULL);
+    this->InvokeEvent(vtkCommand::ModifiedEvent, nullptr);
     }
   vtkMRMLAnnotationROINode* roiNode = this->GetROINode();
   if (roiNode != nullptr &&

Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,7 @@ bool TestColors(vtkMRMLScene* scene,`
`376`	`376`	`return false;`
`377`	`377`	`}`
`378`	`378`	`vtkMRMLDisplayableHierarchyNode* hierarchyNode = GetHierarchyNode(scene, level);`
`379`		`- assert(hierarchyNode != 0);`
	`379`	`+ assert(hierarchyNode != nullptr);`
`380`	`380`	`vtkMRMLDisplayNode* hierarchyDisplayNode = hierarchyNode->GetDisplayNode();`
`381`	`381`	`if (hierarchyDisplayNode->GetColor()[0] != hierarchyColors[level][0] \|\|`
`382`	`382`	`hierarchyDisplayNode->GetColor()[1] != hierarchyColors[level][1] \|\|`
`@@ -411,7 +411,7 @@ bool TestVisibility(vtkMRMLScene* scene,`
`411`	`411`	`return false;`
`412`	`412`	`}`
`413`	`413`	`vtkMRMLDisplayableHierarchyNode* hierarchyNode = GetHierarchyNode(scene, level);`
`414`		`- assert(hierarchyNode != 0);`
	`414`	`+ assert(hierarchyNode != nullptr);`
`415`	`415`	`vtkMRMLDisplayNode* hierarchyDisplayNode = hierarchyNode->GetDisplayNode();`
`416`	`416`	`if (hierarchyDisplayNode->GetVisibility() != hierarchyVisibility[level])`
`417`	`417`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1304,7 +1304,7 @@ vtkMRMLNode* vtkMRMLScene::AddNewNodeByClassWithID(std::string className, std::s`
`1304`	`1304`	`if (className.empty())`
`1305`	`1305`	`{`
`1306`	`1306`	`vtkErrorMacro("AddNewNodeByClassWithID: className is an emptry string");`
`1307`		`- return NULL;`
	`1307`	`+ return nullptr;`
`1308`	`1308`	`}`
`1309`	`1309`
`1310`	`1310`	`if (nodeID.empty())`
`@@ -1325,7 +1325,7 @@ vtkMRMLNode* vtkMRMLScene::AddNewNodeByClassWithID(std::string className, std::s`
`1325`	`1325`	`if (this->NodeIDs.find(nodeID) != this->NodeIDs.end())`
`1326`	`1326`	`{`
`1327`	`1327`	`vtkErrorMacro("AddNewNodeByClassWithID: node already exists with ID - " << nodeID);`
`1328`		`- return NULL;`
	`1328`	`+ return nullptr;`
`1329`	`1329`	`}`
`1330`	`1330`
`1331`	`1331`	`vtkSmartPointer<vtkMRMLNode> nodeToAdd =`
`@@ -1910,7 +1910,7 @@ vtkMRMLNode* vtkMRMLScene::GetNodeByID(const char* id)`
`1910`	`1910`	`{`
`1911`	`1911`	`// Ensure the node can't be found, and there is no error with the cache`
`1912`	`1912`	`// mechanism.`
`1913`		`- vtkMRMLNode* foundNode = 0;`
	`1913`	`+ vtkMRMLNode* foundNode = nullptr;`
`1914`	`1914`	`vtkCollectionSimpleIterator it;`
`1915`	`1915`	`for (this->Nodes->InitTraversal(it);`
`1916`	`1916`	`(node = (vtkMRMLNode*)this->Nodes->GetNextItemAsObject(it)) ;)`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ int vtkMRMLTextStorageNode::ReadDataInternal(vtkMRMLNode * refNode)`
`108`	`108`	`bool vtkMRMLTextStorageNode::CanWriteFromReferenceNode(vtkMRMLNode * refNode)`
`109`	`109`	`{`
`110`	`110`	`vtkMRMLTextNode* textNode = vtkMRMLTextNode::SafeDownCast(refNode);`
`111`		`- if (textNode == NULL)`
	`111`	`+ if (textNode == nullptr)`
`112`	`112`	`{`
`113`	`113`	`vtkErrorMacro("vtkMRMLTextStorageNode::CanWriteFromReferenceNode: input is not a text node");`
`114`	`114`	`return false;`
`@@ -120,7 +120,7 @@ bool vtkMRMLTextStorageNode::CanWriteFromReferenceNode(vtkMRMLNode * refNode)`
`120`	`120`	`int vtkMRMLTextStorageNode::WriteDataInternal(vtkMRMLNode * refNode)`
`121`	`121`	`{`
`122`	`122`	`vtkMRMLTextNode* textNode = vtkMRMLTextNode::SafeDownCast(refNode);`
`123`		`- if (textNode == NULL)`
	`123`	`+ if (textNode == nullptr)`
`124`	`124`	`{`
`125`	`125`	`vtkErrorMacro(<< "vtkMRMLTextStorageNode::WriteDataInternal: Do not recognize node type " << refNode->GetClassName());`
`126`	`126`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ vtkMRMLCrosshairDisplayableManager::vtkInternal::~vtkInternal()`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`// everything should be empty`
`145`		`- assert(this->CrosshairNode == 0);`
	`145`	`+ assert(this->CrosshairNode == nullptr);`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`//---------------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ vtkMRMLVolumeGlyphSliceDisplayableManager::vtkInternal::~vtkInternal()`
`123`	`123`	`{`
`124`	`124`	`this->SetSliceCompositeNode(nullptr);`
`125`	`125`	`// everything should be empty`
`126`		`- assert(this->SliceCompositeNode == 0);`
	`126`	`+ assert(this->SliceCompositeNode == nullptr);`
`127`	`127`	`assert(this->VolumeNodes.size() == 0);`
`128`	`128`	`assert(this->DisplayNodes.size() == 0);`
`129`	`129`	`assert(this->Actors.size() == 0);`
Original file line number	Diff line number	Diff line change
`@@ -391,15 +391,15 @@ void vtkMRMLSliceLayerLogic::UpdateNodeReferences ()`
`391`	`391`	`if ( displayNode != this->VolumeDisplayNodeObserved &&`
`392`	`392`	`this->VolumeDisplayNode != nullptr)`
`393`	`393`	`{`
`394`		`- vtkDebugMacro("vtkMRMLSliceLayerLogic::UpdateNodeReferences: new display node = " << (displayNode == 0 ? "null" : "valid") << endl);`
	`394`	`+ vtkDebugMacro("vtkMRMLSliceLayerLogic::UpdateNodeReferences: new display node = " << (displayNode == nullptr ? "null" : "valid") << endl);`
`395`	`395`	`this->VolumeDisplayNode->Delete();`
`396`	`396`	`this->VolumeDisplayNode = nullptr;`
`397`	`397`	`}`
`398`	`398`
`399`	`399`	`if ( displayNode != this->VolumeDisplayNodeObserved &&`
`400`	`400`	`this->VolumeDisplayNodeUVW != nullptr)`
`401`	`401`	`{`
`402`		`- vtkDebugMacro("vtkMRMLSliceLayerLogic::UpdateNodeReferences: new display node = " << (displayNode == 0 ? "null" : "valid") << endl);`
	`402`	`+ vtkDebugMacro("vtkMRMLSliceLayerLogic::UpdateNodeReferences: new display node = " << (displayNode == nullptr ? "null" : "valid") << endl);`
`403`	`403`	`this->VolumeDisplayNodeUVW->Delete();`
`404`	`404`	`this->VolumeDisplayNodeUVW = nullptr;`
`405`	`405`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1176,7 +1176,7 @@ void qMRMLSceneModel::onMRMLSceneNodeAboutToBeAdded(vtkMRMLScene* scene, vtkMRML`
`1176`	`1176`	`Q_UNUSED(node);`
`1177`	`1177`	`#ifndef QT_NO_DEBUG`
`1178`	`1178`	`Q_D(qMRMLSceneModel);`
`1179`		`- Q_ASSERT(scene != 0);`
	`1179`	`+ Q_ASSERT(scene != nullptr);`
`1180`	`1180`	`Q_ASSERT(scene == d->MRMLScene);`
`1181`	`1181`	`#endif`
`1182`	`1182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ void vtkSlicerDataModuleLogic::SetMRMLSceneInternal(vtkMRMLScene * newScene)`
`74`	`74`	`//-----------------------------------------------------------------------------`
`75`	`75`	`void vtkSlicerDataModuleLogic::RegisterNodes()`
`76`	`76`	`{`
`77`		`- assert(this->GetMRMLScene() != 0);`
	`77`	`+ assert(this->GetMRMLScene() != nullptr);`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`//---------------------------------------------------------------------------`