Index: code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.cc	(revision 10765)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.cc	(revision 10768)
@@ -40,5 +40,5 @@
         RegisterObject(AnnounceMessage);
 
-        this->owner_ = 0;
+        this->owner_ = nullptr;
 
         this->setDelay(3.0f);
Index: code/branches/cpp11_v2/src/modules/overlays/hud/CountDown.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/CountDown.cc	(revision 10765)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/CountDown.cc	(revision 10768)
@@ -71,5 +71,5 @@
         RegisterObject(CountDown);
 
-        this->owner_ = 0;
+        this->owner_ = nullptr;
         this->hasStopped_ = false;
     }
Index: code/branches/cpp11_v2/src/modules/overlays/hud/DeathMessage.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/DeathMessage.cc	(revision 10765)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/DeathMessage.cc	(revision 10768)
@@ -40,5 +40,5 @@
         RegisterObject(DeathMessage);
 
-        this->owner_ = 0;
+        this->owner_ = nullptr;
 
         this->setDelay(2.0f);
Index: code/branches/cpp11_v2/src/modules/overlays/hud/GametypeFadingMessage.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/GametypeFadingMessage.cc	(revision 10765)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/GametypeFadingMessage.cc	(revision 10768)
@@ -40,5 +40,5 @@
         RegisterObject(GametypeFadingMessage);
 
-        this->owner_ = 0;
+        this->owner_ = nullptr;
         this->setDelay(2.0f);
         this->setFadeouttime(0.5f);
Index: code/branches/cpp11_v2/src/modules/overlays/hud/GametypeStaticMessage.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/GametypeStaticMessage.cc	(revision 10765)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/GametypeStaticMessage.cc	(revision 10768)
@@ -42,5 +42,5 @@
     {
         RegisterObject(GametypeStaticMessage);
-        this->owner_ = 0;
+        this->owner_ = nullptr;
     }
 
Index: code/branches/cpp11_v2/src/modules/overlays/hud/HUDBar.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDBar.cc	(revision 10765)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDBar.cc	(revision 10768)
@@ -191,5 +191,5 @@
             return barColours_[index];
         else
-            return 0;
+            return nullptr;
     }
 
Index: code/branches/cpp11_v2/src/modules/overlays/hud/HUDBoostBar.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDBoostBar.cc	(revision 10765)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDBoostBar.cc	(revision 10768)
@@ -42,5 +42,5 @@
         RegisterObject(HUDBoostBar);
 
-        this->owner_ = 0;
+        this->owner_ = nullptr;
         this->flashInterval_ = 0.25f;
         this->flashDt_ = 0.0f;
Index: code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.cc	(revision 10765)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.cc	(revision 10768)
@@ -41,5 +41,5 @@
 
         this->setConfigValues();
-        this->owner_ = 0;
+        this->owner_ = nullptr;
     }
 
Index: code/branches/cpp11_v2/src/modules/overlays/hud/HUDHealthBar.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDHealthBar.cc	(revision 10765)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDHealthBar.cc	(revision 10768)
@@ -43,5 +43,5 @@
         RegisterObject(HUDHealthBar);
 
-        this->owner_ = 0;
+        this->owner_ = nullptr;
         this->bUseBarColour_ = false;
 
@@ -58,5 +58,5 @@
         {
             this->textoverlay_->destroy();
-            this->textoverlay_ = 0;
+            this->textoverlay_ = nullptr;
         }
     }
Index: code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc	(revision 10765)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc	(revision 10768)
@@ -69,5 +69,5 @@
     RegisterClass ( HUDNavigation );
 
-    HUDNavigation* HUDNavigation::localHUD_s = 0;
+    HUDNavigation* HUDNavigation::localHUD_s = nullptr;
 
     HUDNavigation::HUDNavigation(Context* context) :
Index: code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.cc	(revision 10765)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.cc	(revision 10768)
@@ -68,5 +68,5 @@
         this->shapeMaterials_[RadarViewable::Triangle] = "RadarTriangle.png";
         this->shapeMaterials_[RadarViewable::Square]   = "RadarSquare.png";
-        this->owner_ = 0;
+        this->owner_ = nullptr;
 
         this->map3DFront_ = static_cast<Ogre::PanelOverlayElement*>(Ogre::OverlayManager::getSingleton()
Index: code/branches/cpp11_v2/src/modules/overlays/hud/HUDSpeedBar.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDSpeedBar.cc	(revision 10765)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDSpeedBar.cc	(revision 10768)
@@ -43,5 +43,5 @@
         RegisterObject(HUDSpeedBar);
 
-        this->owner_ = 0;
+        this->owner_ = nullptr;
     }
 
Index: code/branches/cpp11_v2/src/modules/overlays/hud/HUDTimer.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDTimer.cc	(revision 10765)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDTimer.cc	(revision 10768)
@@ -42,5 +42,5 @@
         RegisterObject(HUDTimer);
 
-        this->owner_ = 0;
+        this->owner_ = nullptr;
     }
 
Index: code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.cc	(revision 10765)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.cc	(revision 10768)
@@ -40,5 +40,5 @@
         RegisterObject(KillMessage);
 
-        this->owner_ = 0;
+        this->owner_ = nullptr;
 
         this->setDelay(2.0f);
Index: code/branches/cpp11_v2/src/modules/overlays/hud/LastManStandingInfos.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/LastManStandingInfos.cc	(revision 10765)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/LastManStandingInfos.cc	(revision 10768)
@@ -43,6 +43,6 @@
         RegisterObject(LastManStandingInfos);
 
-        this->lms_ = 0;
-        this->player_ = 0;
+        this->lms_ = nullptr;
+        this->player_ = nullptr;
         this->bShowLives_ = false;
         this->bShowPlayers_ = false;
@@ -91,6 +91,6 @@
         else
         {
-            this->player_ = 0;
-            this->lms_ = 0;
+            this->player_ = nullptr;
+            this->lms_ = nullptr;
         }
     }
Index: code/branches/cpp11_v2/src/modules/overlays/hud/LastTeamStandingInfos.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/LastTeamStandingInfos.cc	(revision 10765)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/LastTeamStandingInfos.cc	(revision 10768)
@@ -43,6 +43,6 @@
         RegisterObject(LastTeamStandingInfos);
 
-        this->lts_ = 0;
-        this->player_ = 0;
+        this->lts_ = nullptr;
+        this->player_ = nullptr;
         this->bShowLives_ = false;
         this->bShowTeams_ = false;
@@ -91,6 +91,6 @@
         else
         {
-            this->player_ = 0;
-            this->lts_ = 0;
+            this->player_ = nullptr;
+            this->lts_ = nullptr;
         }
     }
Index: code/branches/cpp11_v2/src/modules/overlays/hud/PauseNotice.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/PauseNotice.cc	(revision 10765)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/PauseNotice.cc	(revision 10768)
@@ -40,5 +40,5 @@
         RegisterObject(PauseNotice);
 
-        this->owner_ = 0;
+        this->owner_ = nullptr;
     }
 
Index: code/branches/cpp11_v2/src/modules/overlays/hud/TeamBaseMatchScore.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/TeamBaseMatchScore.cc	(revision 10765)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/TeamBaseMatchScore.cc	(revision 10768)
@@ -43,5 +43,5 @@
         RegisterObject(TeamBaseMatchScore);
 
-        this->owner_ = 0;
+        this->owner_ = nullptr;
 
         this->bShowBases_ = false;
@@ -120,5 +120,5 @@
             this->owner_ = orxonox_cast<TeamBaseMatch*>(this->getOwner()->getGametype());
         else
-            this->owner_ = 0;
+            this->owner_ = nullptr;
     }
 }
