From 0abe496457e15d12c86eaf15ad9ff79ef5fc9720 Mon Sep 17 00:00:00 2001 From: Thomas Edvalson Date: Sun, 20 Apr 2014 15:40:59 -0400 Subject: [PATCH] Replace some NULLs with nullptr --- src/cpp3ds/Graphics/Actor.cpp | 9 ++++----- src/cpp3ds/Graphics/Stage.cpp | 15 +++++++-------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/cpp3ds/Graphics/Actor.cpp b/src/cpp3ds/Graphics/Actor.cpp index d96bb8a..8142b58 100644 --- a/src/cpp3ds/Graphics/Actor.cpp +++ b/src/cpp3ds/Graphics/Actor.cpp @@ -1,4 +1,3 @@ -#include #include #include @@ -7,10 +6,10 @@ namespace cpp3ds { void Actor::addStage(Stage& stage){ StageNode *node = new StageNode(); node->stage = &stage; - node->next = NULL; - if (stageHead == NULL) + node->next = nullptr; + if (stageHead == nullptr) stageHead = node; - if (stageTail != NULL) + if (stageTail != nullptr) stageTail->next = node; stageTail = node; } @@ -18,7 +17,7 @@ namespace cpp3ds { void Actor::detach(){ // Remove this actor from all stages StageNode* cur = stageHead; - while (cur != NULL) { + while (cur != nullptr) { cur->stage->removeActor(*this); cur = cur->next; } diff --git a/src/cpp3ds/Graphics/Stage.cpp b/src/cpp3ds/Graphics/Stage.cpp index f2759d1..525d80c 100644 --- a/src/cpp3ds/Graphics/Stage.cpp +++ b/src/cpp3ds/Graphics/Stage.cpp @@ -1,4 +1,3 @@ -#include #include #include #include @@ -13,10 +12,10 @@ namespace cpp3ds { ActorNode *node = new ActorNode(); node->actor = &actor; node->prev = actorTail; - node->next = NULL; - if (actorHead == NULL) + node->next = nullptr; + if (actorHead == nullptr) actorHead = node; - if (actorTail != NULL) + if (actorTail != nullptr) actorTail->next = node; actorTail = node; actor.addStage(*this); @@ -24,15 +23,15 @@ namespace cpp3ds { void Stage::removeActor(Actor& actor){ ActorNode* cur = actorHead; - while (cur != NULL) { + while (cur != nullptr) { if (cur->actor == &actor) { if (cur == actorHead) actorHead = cur->next; if (cur == actorTail) actorTail = cur->prev; - if (cur->prev != NULL) + if (cur->prev != nullptr) cur->prev->next = cur->next; - if (cur->next != NULL) + if (cur->next != nullptr) cur->next->prev = cur->prev; delete cur; break; @@ -46,7 +45,7 @@ namespace cpp3ds { ActorNode* cur = actorTail; x += this->x; y += this->y; - while (cur != NULL) { + while (cur != nullptr) { Actor& actor = *cur->actor; if (use3D) { float slider = Input::get3DSlider() * actor.depth3d;