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

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/overlays

Files:

• hud/AnnounceMessage.cc (modified) (1 diff)
• hud/CountDown.cc (modified) (1 diff)
• hud/DeathMessage.cc (modified) (1 diff)
• hud/GametypeFadingMessage.cc (modified) (1 diff)
• hud/GametypeStaticMessage.cc (modified) (1 diff)
• hud/HUDBar.cc (modified) (1 diff)
• hud/HUDBoostBar.cc (modified) (1 diff)
• hud/HUDEnemyHealthBar.cc (modified) (1 diff)
• hud/HUDHealthBar.cc (modified) (2 diffs)
• hud/HUDNavigation.cc (modified) (1 diff)
• hud/HUDRadar.cc (modified) (1 diff)
• hud/HUDSpeedBar.cc (modified) (1 diff)
• hud/HUDTimer.cc (modified) (1 diff)
• hud/KillMessage.cc (modified) (1 diff)
• hud/LastManStandingInfos.cc (modified) (2 diffs)
• hud/LastTeamStandingInfos.cc (modified) (2 diffs)
• hud/PauseNotice.cc (modified) (1 diff)
• hud/TeamBaseMatchScore.cc (modified) (2 diffs)
• stats/CreateLines.cc (modified) (1 diff)
• stats/Stats.cc (modified) (1 diff)

code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.cc

@@ -40 +40 @@
         RegisterObject(AnnounceMessage);
 
-        this->owner_ = 0;
+        this->owner_ = nullptr;
 
         this->setDelay(3.0f);

code/branches/cpp11_v2/src/modules/overlays/hud/CountDown.cc

@@ -71 +71 @@
         RegisterObject(CountDown);
 
-        this->owner_ = 0;
+        this->owner_ = nullptr;
         this->hasStopped_ = false;
     }

code/branches/cpp11_v2/src/modules/overlays/hud/DeathMessage.cc

@@ -40 +40 @@
         RegisterObject(DeathMessage);
 
-        this->owner_ = 0;
+        this->owner_ = nullptr;
 
         this->setDelay(2.0f);

code/branches/cpp11_v2/src/modules/overlays/hud/GametypeFadingMessage.cc

@@ -40 +40 @@
         RegisterObject(GametypeFadingMessage);
 
-        this->owner_ = 0;
+        this->owner_ = nullptr;
         this->setDelay(2.0f);
         this->setFadeouttime(0.5f);

code/branches/cpp11_v2/src/modules/overlays/hud/GametypeStaticMessage.cc

@@ -42 +42 @@
     {
         RegisterObject(GametypeStaticMessage);
-        this->owner_ = 0;
+        this->owner_ = nullptr;
     }
 

code/branches/cpp11_v2/src/modules/overlays/hud/HUDBar.cc

@@ -191 +191 @@
             return barColours_[index];
         else
-            return 0;
+            return nullptr;
     }
 

code/branches/cpp11_v2/src/modules/overlays/hud/HUDBoostBar.cc

@@ -42 +42 @@
         RegisterObject(HUDBoostBar);
 
-        this->owner_ = 0;
+        this->owner_ = nullptr;
         this->flashInterval_ = 0.25f;
         this->flashDt_ = 0.0f;

code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.cc

@@ -41 +41 @@
 
         this->setConfigValues();
-        this->owner_ = 0;
+        this->owner_ = nullptr;
     }
 

code/branches/cpp11_v2/src/modules/overlays/hud/HUDHealthBar.cc

@@ -43 +43 @@
         RegisterObject(HUDHealthBar);
 
-        this->owner_ = 0;
+        this->owner_ = nullptr;
         this->bUseBarColour_ = false;
 
@@ -58 +58 @@
         {
             this->textoverlay_->destroy();
-            this->textoverlay_ = 0;
+            this->textoverlay_ = nullptr;
         }
     }

code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc

@@ -69 +69 @@
     RegisterClass ( HUDNavigation );
 
-    HUDNavigation* HUDNavigation::localHUD_s = 0;
+    HUDNavigation* HUDNavigation::localHUD_s = nullptr;
 
     HUDNavigation::HUDNavigation(Context* context) :

code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.cc

@@ -68 +68 @@
         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()

code/branches/cpp11_v2/src/modules/overlays/hud/HUDSpeedBar.cc

@@ -43 +43 @@
         RegisterObject(HUDSpeedBar);
 
-        this->owner_ = 0;
+        this->owner_ = nullptr;
     }
 

code/branches/cpp11_v2/src/modules/overlays/hud/HUDTimer.cc

@@ -42 +42 @@
         RegisterObject(HUDTimer);
 
-        this->owner_ = 0;
+        this->owner_ = nullptr;
     }
 

code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.cc

@@ -40 +40 @@
         RegisterObject(KillMessage);
 
-        this->owner_ = 0;
+        this->owner_ = nullptr;
 
         this->setDelay(2.0f);

code/branches/cpp11_v2/src/modules/overlays/hud/LastManStandingInfos.cc

@@ -43 +43 @@
         RegisterObject(LastManStandingInfos);
 
-        this->lms_ = 0;
-        this->player_ = 0;
+        this->lms_ = nullptr;
+        this->player_ = nullptr;
         this->bShowLives_ = false;
         this->bShowPlayers_ = false;
@@ -91 +91 @@
         else
         {
-            this->player_ = 0;
-            this->lms_ = 0;
+            this->player_ = nullptr;
+            this->lms_ = nullptr;
         }
     }

code/branches/cpp11_v2/src/modules/overlays/hud/LastTeamStandingInfos.cc

@@ -43 +43 @@
         RegisterObject(LastTeamStandingInfos);
 
-        this->lts_ = 0;
-        this->player_ = 0;
+        this->lts_ = nullptr;
+        this->player_ = nullptr;
         this->bShowLives_ = false;
         this->bShowTeams_ = false;
@@ -91 +91 @@
         else
         {
-            this->player_ = 0;
-            this->lts_ = 0;
+            this->player_ = nullptr;
+            this->lts_ = nullptr;
         }
     }

code/branches/cpp11_v2/src/modules/overlays/hud/PauseNotice.cc

@@ -40 +40 @@
         RegisterObject(PauseNotice);
 
-        this->owner_ = 0;
+        this->owner_ = nullptr;
     }
 

code/branches/cpp11_v2/src/modules/overlays/hud/TeamBaseMatchScore.cc

@@ -43 +43 @@
         RegisterObject(TeamBaseMatchScore);
 
-        this->owner_ = 0;
+        this->owner_ = nullptr;
 
         this->bShowBases_ = false;
@@ -120 +120 @@
             this->owner_ = orxonox_cast<TeamBaseMatch*>(this->getOwner()->getGametype());
         else
-            this->owner_ = 0;
+            this->owner_ = nullptr;
     }
 }

code/branches/cpp11_v2/src/modules/overlays/stats/CreateLines.cc

@@ -37 +37 @@
     CreateLines::CreateLines(float leftOffset, float topOffset, float width, float height)
     {
-        playerNameText_ = new OverlayText(0);
+        playerNameText_ = new OverlayText(nullptr);
         playerNameText_->setTextSize(0.04f);
         playerNameText_->setColour(ColourValue(0.0f, 0.75f, 0.2f, 1.0f));
         playerNameText_->setPosition(Vector2(0.1f, topOffset + 0.01f));
 
-        scoreText_ = new OverlayText(0);
+        scoreText_ = new OverlayText(nullptr);
         scoreText_->setTextSize(0.04f);
         scoreText_->setColour(ColourValue(0.0f, 0.75f, 0.2f, 1.0f));
         scoreText_->setPosition(Vector2(0.6f, topOffset + 0.01f));
 
-        deathsText_ = new OverlayText(0);
+        deathsText_ = new OverlayText(nullptr);
         deathsText_->setTextSize(0.04f);
         deathsText_->setColour(ColourValue(0, 0.75f, 0.2f, 1.0f));
         deathsText_->setPosition(Vector2(0.8f, topOffset + 0.01f));
 
-        background_ = new Stats(0);
+        background_ = new Stats(nullptr);
         background_->setPosition(Vector2(leftOffset, topOffset));
         background_->setSize(Vector2(width, height));

code/branches/cpp11_v2/src/modules/overlays/stats/Stats.cc

@@ -46 +46 @@
     Stats::Stats(Context* context)
         : OrxonoxOverlay(context)
-        , statsOverlayNoise_(0)
-        , statsOverlayBorder_(0)
+        , statsOverlayNoise_(nullptr)
+        , statsOverlayBorder_(nullptr)
     {
         RegisterObject(Stats);