Changeset 10768 for code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.cc

Timestamp:

Nov 6, 2015, 10:54:34 PM (8 years ago)

Author:

landauf

Message:

replace '0' by 'nullptr'

File:

• code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.cc (modified) (5 diffs)

code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.cc

@@ -77 +77 @@
         this->node_ = this->getScene()->getRootSceneNode()->createChildSceneNode();
 
-        this->parent_ = 0;
+        this->parent_ = nullptr;
         this->parentID_ = OBJECTID_UNKNOWN;
         this->bDeleteWithParent_ = true;
@@ -90 +90 @@
 
         // Default behaviour does not include physics
-        this->physicalBody_   = 0;
+        this->physicalBody_   = nullptr;
         this->bPhysicsActive_ = false;
         this->bPhysicsActiveSynchronised_    = false;
@@ -498 +498 @@
     void WorldEntity::notifyDetached()
     {
-        this->parent_ = 0;
+        this->parent_ = nullptr;
         this->parentID_ = OBJECTID_UNKNOWN;
 
@@ -525 +525 @@
             ++i;
         }
-        return 0;
+        return nullptr;
     }
 
@@ -856 +856 @@
             deactivatePhysics();
             delete this->physicalBody_;
-            this->physicalBody_ = 0;
+            this->physicalBody_ = nullptr;
             this->collisionType_ = None;
             this->collisionTypeSynchronised_ = None;