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

Timestamp:

Nov 21, 2015, 7:05:53 PM (9 years ago)

Author:

muemart

Message:

Run clang-modernize -loop-convert

• Again, not all possible loops were converted
• It can do pretty cool transformations, but I had to fix a few compile errors, so there might be some runtime errors lurking around too

Location:

code/branches/cpp11_v2/src/modules/overlays

Files:

• hud/ChatOverlay.cc (modified) (2 diffs)
• hud/HUDNavigation.cc (modified) (5 diffs)
• hud/HUDRadar.cc (modified) (1 diff)
• stats/Scoreboard.cc (modified) (2 diffs)

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

@@ -58 +58 @@
     ChatOverlay::~ChatOverlay()
     {
-        for (std::set<Timer*>::iterator it = this->timers_.begin(); it != this->timers_.end(); ++it)
-            delete (*it);
+        for (const auto & elem : this->timers_)
+            delete (elem);
     }
 
@@ -92 +92 @@
         this->text_->setCaption("");
 
-        for (std::list<Ogre::DisplayString>::iterator it = this->messages_.begin(); it != this->messages_.end(); ++it)
+        for (auto & elem : this->messages_)
         {
-            this->text_->setCaption(this->text_->getCaption() + "\n" + (*it));
+            this->text_->setCaption(this->text_->getCaption() + "\n" + (elem));
         }
     }

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

@@ -131 +131 @@
         }
         this->fontName_ = font;
-        for (std::map<RadarViewable*, ObjectInfo>::iterator it = this->activeObjectList_.begin(); it != this->activeObjectList_.end(); ++it)
-        {
-            if (it->second.text_ != nullptr)
-                it->second.text_->setFontName(this->fontName_);
+        for (auto & elem : this->activeObjectList_)
+        {
+            if (elem.second.text_ != nullptr)
+                elem.second.text_->setFontName(this->fontName_);
         }
     }
@@ -151 +151 @@
         }
         this->textSize_ = size;
-        for (std::map<RadarViewable*, ObjectInfo>::iterator it = this->activeObjectList_.begin(); it!=this->activeObjectList_.end(); ++it)
-        {
-            if (it->second.text_)
-                it->second.text_->setCharHeight(size);
+        for (auto & elem : this->activeObjectList_)
+        {
+            if (elem.second.text_)
+                elem.second.text_->setCharHeight(size);
         }
     }
@@ -186 +186 @@
         const Matrix4& camTransform = cam->getOgreCamera()->getProjectionMatrix() * cam->getOgreCamera()->getViewMatrix();
 
-        for (std::list<std::pair<RadarViewable*, unsigned int>>::iterator listIt = this->sortedObjectList_.begin(); listIt != this->sortedObjectList_.end(); ++listIt)
-        listIt->second = (int)((listIt->first->getRVWorldPosition() - HumanController::getLocalControllerSingleton()->getControllableEntity()->getWorldPosition()).length() + 0.5f);
+        for (auto & elem : this->sortedObjectList_)
+        elem.second = (int)((elem.first->getRVWorldPosition() - HumanController::getLocalControllerSingleton()->getControllableEntity()->getWorldPosition()).length() + 0.5f);
 
         this->sortedObjectList_.sort(compareDistance);
@@ -531 +531 @@
         float yScale = this->getActualSize().y;
 
-        for (std::map<RadarViewable*, ObjectInfo>::iterator it = this->activeObjectList_.begin(); it != this->activeObjectList_.end(); ++it)
-        {
-            if (it->second.health_ != nullptr)
-                it->second.health_->setDimensions(this->healthMarkerSize_ * xScale, this->healthMarkerSize_ * yScale);
-            if (it->second.healthLevel_ != nullptr)
-                it->second.healthLevel_->setDimensions(this->healthLevelMarkerSize_ * xScale, this->healthLevelMarkerSize_ * yScale);
-            if (it->second.panel_ != nullptr)
-                it->second.panel_->setDimensions(this->navMarkerSize_ * xScale, this->navMarkerSize_ * yScale);
-            if (it->second.text_ != nullptr)
-                it->second.text_->setCharHeight(this->textSize_ * yScale);
-            if (it->second.target_ != nullptr)
-                it->second.target_->setDimensions(this->aimMarkerSize_ * xScale, this->aimMarkerSize_ * yScale);
+        for (auto & elem : this->activeObjectList_)
+        {
+            if (elem.second.health_ != nullptr)
+                elem.second.health_->setDimensions(this->healthMarkerSize_ * xScale, this->healthMarkerSize_ * yScale);
+            if (elem.second.healthLevel_ != nullptr)
+                elem.second.healthLevel_->setDimensions(this->healthLevelMarkerSize_ * xScale, this->healthLevelMarkerSize_ * yScale);
+            if (elem.second.panel_ != nullptr)
+                elem.second.panel_->setDimensions(this->navMarkerSize_ * xScale, this->navMarkerSize_ * yScale);
+            if (elem.second.text_ != nullptr)
+                elem.second.text_->setCharHeight(this->textSize_ * yScale);
+            if (elem.second.target_ != nullptr)
+                elem.second.target_->setDimensions(this->aimMarkerSize_ * xScale, this->aimMarkerSize_ * yScale);
         }
     }
@@ -670 +670 @@
     {
         const std::set<RadarViewable*>& respawnObjects = this->getOwner()->getScene()->getRadar()->getRadarObjects();
-        for (std::set<RadarViewable*>::const_iterator it = respawnObjects.begin(); it != respawnObjects.end(); ++it)
-        {
-            if (!(*it)->isHumanShip_)
-            this->addObject(*it);
+        for (const auto & respawnObject : respawnObjects)
+        {
+            if (!(respawnObject)->isHumanShip_)
+            this->addObject(respawnObject);
         }
     }

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

@@ -92 +92 @@
             Ogre::OverlayManager::getSingleton().destroyOverlayElement(this->map3DBack_);
 
-            for (std::map<RadarViewable*,Ogre::PanelOverlayElement*>::iterator it = this->radarObjects_.begin();
-                it != this->radarObjects_.end(); ++it)
-            {
-                Ogre::OverlayManager::getSingleton().destroyOverlayElement(it->second);
+            for (auto & elem : this->radarObjects_)
+            {
+                Ogre::OverlayManager::getSingleton().destroyOverlayElement(elem.second);
             }
         }

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

@@ -60 +60 @@
         SUPER(Scoreboard, changedVisibility);
 
-        for (unsigned int i = 0; i < this->lines_.size(); ++i)
-            this->lines_[i]->changedVisibility();
+        for (auto & elem : this->lines_)
+            elem->changedVisibility();
     }
 
@@ -94 +94 @@
 
         unsigned int index = 0;
-        for (std::map<PlayerInfo*, Player>::const_iterator it = playerList.begin(); it != playerList.end(); ++it)
+        for (const auto & elem : playerList)
         {
-            this->lines_[index]->setPlayerName(multi_cast<std::string>(it->first->getName()));
-            this->lines_[index]->setScore(multi_cast<std::string>(it->second.frags_));
-            this->lines_[index]->setDeaths(multi_cast<std::string>(it->second.killed_));
+            this->lines_[index]->setPlayerName(multi_cast<std::string>(elem.first->getName()));
+            this->lines_[index]->setScore(multi_cast<std::string>(elem.second.frags_));
+            this->lines_[index]->setDeaths(multi_cast<std::string>(elem.second.killed_));
             index++;
         }