Changeset 10768 for code/branches/cpp11_v2/src/modules/objects

Timestamp:

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

Author:

landauf

Message:

replace '0' by 'nullptr'

Location:

code/branches/cpp11_v2/src/modules/objects

Files:

• Attacher.cc (modified) (3 diffs)
• controllers/TurretController.cc (modified) (2 diffs)
• eventsystem/EventDispatcher.cc (modified) (1 diff)
• eventsystem/EventFilter.cc (modified) (2 diffs)

code/branches/cpp11_v2/src/modules/objects/Attacher.cc

@@ -40 +40 @@
         RegisterObject(Attacher);
 
-        this->target_ = 0;
+        this->target_ = nullptr;
     }
 
@@ -90 +90 @@
             ++i;
         }
-        return 0;
+        return nullptr;
     }
 
@@ -96 +96 @@
     {
         this->targetname_ = target;
-        this->target_ = 0;
+        this->target_ = nullptr;
 
         if (this->targetname_.empty())

code/branches/cpp11_v2/src/modules/objects/controllers/TurretController.cc

@@ -81 +81 @@
         {
             this->forgetTarget();
-            turret->setTarget(0);
+            turret->setTarget(nullptr);
         }
 
@@ -99 +99 @@
         float minScore = FLT_MAX;
         float tempScore;
-        Pawn* minScorePawn = 0;
+        Pawn* minScorePawn = nullptr;
 
         for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); ++it)

code/branches/cpp11_v2/src/modules/objects/eventsystem/EventDispatcher.cc

@@ -79 +79 @@
             ++i;
         }
-        return 0;
+        return nullptr;
     }
 }

code/branches/cpp11_v2/src/modules/objects/eventsystem/EventFilter.cc

@@ -102 +102 @@
             ++i;
         }
-        return 0;
+        return nullptr;
     }
 
@@ -119 +119 @@
             ++i;
         }
-        return 0;
+        return nullptr;
     }
 }