Changeset 10768 for code/branches/cpp11_v2/src/orxonox/collisionshapes

Timestamp:

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

Author:

landauf

Message:

replace '0' by 'nullptr'

Location:

code/branches/cpp11_v2/src/orxonox/collisionshapes

Files:

• CollisionShape.cc (modified) (2 diffs)
• CompoundCollisionShape.cc (modified) (3 diffs)
• CompoundCollisionShape.h (modified) (1 diff)
• WorldEntityCollisionShape.cc (modified) (1 diff)

code/branches/cpp11_v2/src/orxonox/collisionshapes/CollisionShape.cc

@@ -57 +57 @@
         RegisterObject(CollisionShape);
 
-        this->parent_ = 0;
+        this->parent_ = nullptr;
         this->parentID_ = OBJECTID_UNKNOWN;
-        this->collisionShape_ = 0;
+        this->collisionShape_ = nullptr;
         this->position_ = Vector3::ZERO;
         this->orientation_ = Quaternion::IDENTITY;
@@ -154 +154 @@
     void CollisionShape::notifyDetached()
     {
-        this->parent_ = 0;
+        this->parent_ = nullptr;
         this->parentID_ = OBJECTID_UNKNOWN;
     }

code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.cc

@@ -197 +197 @@
     void CompoundCollisionShape::updatePublicShape()
     {
-        btCollisionShape* primitive = 0; // The primitive shape, if there is one.
+        btCollisionShape* primitive = nullptr; // The primitive shape, if there is one.
         bool bPrimitive = true; // Whether the CompoundCollisionShape has just one non-empty CollisionShape. And that shape also has no transformation.
         bool bEmpty = true; // Whether the CompoundCollisionShape is empty.
@@ -221 +221 @@
         {
             // If there was none all along, nothing needs to be changed.
-            if (this->collisionShape_ == 0)
+            if (this->collisionShape_ == nullptr)
                 return;
-            this->collisionShape_ = 0;
+            this->collisionShape_ = nullptr;
         }
         // If the CompoundCollisionShape is just a primitive.
@@ -253 +253 @@
             ++i;
         }
-        return 0;
+        return nullptr;
     }
 

code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.h

@@ -75 +75 @@
             void updatePublicShape();
             inline virtual btCollisionShape* createNewShape() const
-                { assert(false); return 0; }
+                { assert(false); return nullptr; }
 
             btCompoundShape* compoundShape_;

code/branches/cpp11_v2/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc

@@ -54 +54 @@
         CollisionShape::updateParent();
 
-        assert(this->worldEntityOwner_ != 0);
+        assert(this->worldEntityOwner_ != nullptr);
         this->worldEntityOwner_->notifyCollisionShapeChanged();
     }