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

Timestamp:

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

Author:

landauf

Message:

replace '0' by 'nullptr'

Location:

code/branches/cpp11_v2/src/orxonox/weaponsystem

Files:

• Munition.cc (modified) (4 diffs)
• Weapon.cc (modified) (2 diffs)
• WeaponMode.cc (modified) (2 diffs)
• WeaponPack.cc (modified) (4 diffs)
• WeaponSet.cc (modified) (1 diff)
• WeaponSlot.cc (modified) (2 diffs)
• WeaponSlot.h (modified) (1 diff)
• WeaponSystem.cc (modified) (8 diffs)

code/branches/cpp11_v2/src/orxonox/weaponsystem/Munition.cc

@@ -65 +65 @@
             // For separated magazines we definitively need a given user
             if (!user)
-                return 0;
+                return nullptr;
 
             // Use the map to get the magazine assigned to the given user
@@ -79 +79 @@
         }
 
-        return 0;
+        return nullptr;
     }
 
@@ -236 +236 @@
         // If we don't use separate magazines, set user to 0
         if (!this->bUseSeparateMagazines_)
-            user = 0;
+            user = nullptr;
 
         // Remove the current magazine for the given user
@@ -442 +442 @@
         // If we don't use separate magazines, set user to 0
         if (!this->bUseSeparateMagazines_)
-            user = 0;
+            user = nullptr;
 
         // Remove the current magazine for the given user

code/branches/cpp11_v2/src/orxonox/weaponsystem/Weapon.cc

@@ -45 +45 @@
         RegisterObject(Weapon);
 
-        this->weaponPack_ = 0;
-        this->weaponSlot_ = 0;
+        this->weaponPack_ = nullptr;
+        this->weaponSlot_ = nullptr;
         this->bReloading_ = false;
         this->reloadingWeaponmode_ = WeaponSystem::WEAPON_MODE_UNASSIGNED;
@@ -92 +92 @@
             ++i;
         }
-        return 0;
+        return nullptr;
     }
 

code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponMode.cc

@@ -51 +51 @@
         RegisterObject(WeaponMode);
 
-        this->weapon_ = 0;
+        this->weapon_ = nullptr;
         this->mode_ = WeaponSystem::WEAPON_MODE_UNASSIGNED;
 
-        this->munition_ = 0;
+        this->munition_ = nullptr;
         this->initialMunition_ = 0;
         this->initialMagazines_ = 0;
@@ -232 +232 @@
         }
         else
-            this->munition_ = 0;
+            this->munition_ = nullptr;
     }
 

code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponPack.cc

@@ -44 +44 @@
         RegisterObject(WeaponPack);
 
-        this->weaponSystem_ = 0;
+        this->weaponSystem_ = nullptr;
     }
 
@@ -107 +107 @@
         assert(it != this->weapons_.end());
         this->weapons_.erase(it);
-        weapon->setWeaponPack(0);
+        weapon->setWeaponPack(nullptr);
     }
 
@@ -121 +121 @@
         }
 
-        return 0;
+        return nullptr;
     }
 
@@ -139 +139 @@
             ++i;
         }
-        return 0;
+        return nullptr;
     }
 

code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSet.cc

@@ -43 +43 @@
         RegisterObject(WeaponSet);
 
-        this->weaponSystem_ = 0;
+        this->weaponSystem_ = nullptr;
         this->desiredFiremode_ = WeaponSystem::FIRE_MODE_UNASSIGNED;
     }

code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSlot.cc

@@ -43 +43 @@
         RegisterObject(WeaponSlot);
 
-        this->weaponSystem_ = 0;
-        this->weapon_ = 0;
+        this->weaponSystem_ = nullptr;
+        this->weapon_ = nullptr;
 
         this->setSyncMode(ObjectDirection::None);
@@ -88 +88 @@
         if (this->weapon_)
         {
-            this->weapon_->setWeaponSlot(0);
-            this->weapon_ = 0;
+            this->weapon_->setWeaponSlot(nullptr);
+            this->weapon_ = nullptr;
         }
     }

code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSlot.h

@@ -74 +74 @@
             */
             inline bool isOccupied() const
-                { return (this->weapon_ != 0); }
+                { return (this->weapon_ != nullptr); }
 
             inline void setWeaponSystem(WeaponSystem * weaponSystem)

code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSystem.cc

@@ -52 +52 @@
         RegisterObject(WeaponSystem);
 
-        this->pawn_ = 0;
+        this->pawn_ = nullptr;
     }
 
@@ -60 +60 @@
         {
             if (this->pawn_)
-                this->pawn_->setWeaponSystem(0);
+                this->pawn_->setWeaponSystem(nullptr);
 
             while (!this->weaponSets_.empty())
@@ -112 +112 @@
                 return (*it);
         }
-        return 0;
+        return nullptr;
     }
 
@@ -159 +159 @@
                 return it->second;
         }
-        return 0;
+        return nullptr;
     }
 
@@ -213 +213 @@
         // Remove all weapons from their WeaponSlot
         unsigned int i = 0;
-        Weapon* weapon = 0;
+        Weapon* weapon = nullptr;
         while ((weapon = wPack->getWeapon(i++)))
             if (weapon->getWeaponSlot())
@@ -237 +237 @@
                 return (*it);
         }
-        return 0;
+        return nullptr;
     }
 
@@ -303 +303 @@
     {
         if (!identifier || !identifier->getIdentifier())
-            return 0;
+            return nullptr;
 
         std::map<Identifier *, Munition *>::iterator it = this->munitions_.find(identifier->getIdentifier());
@@ -318 +318 @@
         else
         {
-            return 0;
+            return nullptr;
         }
     }