Changeset 10765 for code/branches/cpp11_v2/src/modules/docking

Timestamp:

Nov 4, 2015, 10:25:42 PM (9 years ago)

Author:

landauf

Message:

replace 'NULL' by 'nullptr'

Location:

code/branches/cpp11_v2/src/modules/docking

Files:

• Dock.cc (modified) (7 diffs)
• DockToShip.cc (modified) (2 diffs)
• DockingAnimation.cc (modified) (1 diff)
• DockingController.cc (modified) (2 diffs)
• DockingEffect.cc (modified) (1 diff)

code/branches/cpp11_v2/src/modules/docking/Dock.cc

@@ -87 +87 @@
 
         PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger);
-        PlayerInfo* player = NULL;
+        PlayerInfo* player = nullptr;
 
         // Check whether it is a player trigger and extract pawn from it
-        if(pTrigger != NULL)
+        if(pTrigger != nullptr)
         {
             if(!pTrigger->isForPlayer()) {  // The PlayerTrigger is not exclusively for Pawns which means we cannot extract one.
@@ -103 +103 @@
             return false;
         }
-        if(player == NULL)
+        if(player == nullptr)
         {
             orxout(verbose, context::docking) << "Docking::execute Can't retrieve PlayerInfo from Trigger. (" << trigger->getIdentifier()->getName() << ")" << endl;
@@ -131 +131 @@
     {
         PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger);
-        PlayerInfo* player = NULL;
+        PlayerInfo* player = nullptr;
 
         // Check whether it is a player trigger and extract pawn from it
-        if(pTrigger != NULL)
+        if(pTrigger != nullptr)
         {
             if(!pTrigger->isForPlayer()) {  // The PlayerTrigger is not exclusively for Pawns which means we cannot extract one.
@@ -147 +147 @@
             return false;
         }
-        if(player == NULL)
+        if(player == nullptr)
         {
             orxout(verbose, context::docking) << "Docking::execute Can't retrieve PlayerInfo from Trigger. (" << trigger->getIdentifier()->getName() << ")" << endl;
@@ -315 +315 @@
             }
         }
-        return NULL;
+        return nullptr;
     }
 
@@ -333 +333 @@
             i--;
         }
-        return NULL;
+        return nullptr;
     }
 
@@ -352 +352 @@
             i--;
         }
-        return NULL;
+        return nullptr;
     }
 }

code/branches/cpp11_v2/src/modules/docking/DockToShip.cc

@@ -72 +72 @@
 
         DockingTarget *target = DockingEffect::findTarget(this->target_);
-        if (target == NULL) {
+        if (target == nullptr) {
             orxout(internal_warning, context::docking) << "Can't retrieve target for '" << this->target_ << "'.." << endl;
             return false;
@@ -78 +78 @@
 
         ControllableEntity *dockTo = (ControllableEntity*) target->getParent();
-        if (dockTo == NULL) {
+        if (dockTo == nullptr) {
             orxout(internal_warning, context::docking) << "Parent is not a ControllableEntity.." << endl;
             return false;

code/branches/cpp11_v2/src/modules/docking/DockingAnimation.cc

@@ -45 +45 @@
         RegisterObject(DockingAnimation);
 
-        this->parent_ = NULL;
+        this->parent_ = nullptr;
     }
 

code/branches/cpp11_v2/src/modules/docking/DockingController.cc

@@ -44 +44 @@
         RegisterObject(DockingController);
 
-        this->dock_ = NULL;
-        this->player_ = NULL;
-        this->entity_ = NULL;
+        this->dock_ = nullptr;
+        this->player_ = nullptr;
+        this->entity_ = nullptr;
     }
 
@@ -122 +122 @@
         this->player_->startControl(this->entity_);
         this->setActive(false);
-        this->controllableEntity_ = NULL;
+        this->controllableEntity_ = nullptr;
 
         if (this->docking_)

code/branches/cpp11_v2/src/modules/docking/DockingEffect.cc

@@ -70 +70 @@
                 return (*it);
         }
-        return NULL;
+        return nullptr;
     }
 }