Changeset 10917 for code/branches/cpp11_v2/src/modules

Timestamp:

Dec 2, 2015, 11:32:08 PM (9 years ago)

Author:

landauf

Message:

made mapEntry const& wherever possible

Location:

code/branches/cpp11_v2/src/modules

Files:

• gametypes/SpaceRaceController.cc (modified) (1 diff)
• gametypes/SpaceRaceManager.cc (modified) (1 diff)
• mini4dgame/Mini4Dgame.cc (modified) (1 diff)
• notifications/NotificationManager.cc (modified) (4 diffs)
• notifications/NotificationQueue.cc (modified) (1 diff)
• overlays/hud/HUDNavigation.cc (modified) (3 diffs)
• overlays/hud/HUDRadar.cc (modified) (1 diff)
• pickup/PickupManager.cc (modified) (1 diff)
• pong/Pong.cc (modified) (1 diff)
• questsystem/QuestManager.cc (modified) (2 diffs)
• tetris/Tetris.cc (modified) (1 diff)

code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceController.cc

@@ -161 +161 @@
 
         std::vector<RaceCheckPoint*> returnVec;
-        for (auto& mapEntry : zaehler)
+        for (const auto& mapEntry : zaehler)
         {
             if (mapEntry.second == maxWays)

code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.cc

@@ -77 +77 @@
         }
 
-        for (auto& mapEntry : players_)
+        for (const auto& mapEntry : players_)
         {
 

code/branches/cpp11_v2/src/modules/mini4dgame/Mini4Dgame.cc

@@ -155 +155 @@
     {
         // first spawn human players to assign always the left bat to the player in singleplayer
-        for (auto& mapEntry : this->players_)
+        for (const auto& mapEntry : this->players_)
             if (mapEntry.first->isHumanPlayer() && (mapEntry.first->isReadyToSpawn() || this->bForceSpawn_))
                 this->spawnPlayer(mapEntry.first);
         // now spawn bots
-        for (auto& mapEntry : this->players_)
+        for (const auto& mapEntry : this->players_)
             if (!mapEntry.first->isHumanPlayer() && (mapEntry.first->isReadyToSpawn() || this->bForceSpawn_))
                 this->spawnPlayer(mapEntry.first);

code/branches/cpp11_v2/src/modules/notifications/NotificationManager.cc

@@ -69 +69 @@
     {
         // Destroys all Notifications.
-        for(auto& mapEntry : this->allNotificationsList_)
+        for(const auto& mapEntry : this->allNotificationsList_)
             mapEntry.second->destroy();
         this->allNotificationsList_.clear();
@@ -152 +152 @@
         bool executed = false;
         // Clear all NotificationQueues that have the input sender as target.
-        for(auto& mapEntry : this->queues_) // Iterate through all NotificationQueues.
+        for(const auto& mapEntry : this->queues_) // Iterate through all NotificationQueues.
         {
             const std::set<std::string>& set = mapEntry.second->getTargetsSet();
@@ -187 +187 @@
 
         // Insert the Notification in all NotificationQueues that have its sender as target.
-        for(auto& mapEntry : this->queues_) // Iterate through all NotificationQueues.
+        for(const auto& mapEntry : this->queues_) // Iterate through all NotificationQueues.
         {
             const std::set<std::string>& set = mapEntry.second->getTargetsSet();
@@ -345 +345 @@
 
         // Iterate through all Notifications to determine whether any of them should belong to the newly registered NotificationQueue.
-        for(auto& mapEntry : this->allNotificationsList_)
+        for(const auto& mapEntry : this->allNotificationsList_)
         {
             if(!bAll && set.find(mapEntry.second->getSender()) != set.end()) // Checks whether the listener has the sender of the current Notification as target.

code/branches/cpp11_v2/src/modules/notifications/NotificationQueue.cc

@@ -206 +206 @@
         {
             // Add all Notifications that have been created after this NotificationQueue was created.
-            for(auto& mapEntry : *notifications)
+            for(const auto& mapEntry : *notifications)
             {
                 if(mapEntry.first >= this->creationTime_)

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

@@ -131 +131 @@
         }
         this->fontName_ = font;
-        for (auto& mapEntry : this->activeObjectList_)
+        for (const auto& mapEntry : this->activeObjectList_)
         {
             if (mapEntry.second.text_ != nullptr)
@@ -151 +151 @@
         }
         this->textSize_ = size;
-        for (auto& mapEntry : this->activeObjectList_)
+        for (const auto& mapEntry : this->activeObjectList_)
         {
             if (mapEntry.second.text_)
@@ -531 +531 @@
         float yScale = this->getActualSize().y;
 
-        for (auto& mapEntry : this->activeObjectList_)
+        for (const auto& mapEntry : this->activeObjectList_)
         {
             if (mapEntry.second.health_ != nullptr)

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

@@ -92 +92 @@
             Ogre::OverlayManager::getSingleton().destroyOverlayElement(this->map3DBack_);
 
-            for (auto& mapEntry : this->radarObjects_)
+            for (const auto& mapEntry : this->radarObjects_)
             {
                 Ogre::OverlayManager::getSingleton().destroyOverlayElement(mapEntry.second);

code/branches/cpp11_v2/src/modules/pickup/PickupManager.cc

@@ -91 +91 @@
 
         // Destroying all the PickupInventoryContainers that are still there.
-        for(auto& mapEntry : this->pickupInventoryContainers_)
+        for(const auto& mapEntry : this->pickupInventoryContainers_)
             delete mapEntry.second;
         this->pickupInventoryContainers_.clear();

code/branches/cpp11_v2/src/modules/pong/Pong.cc

@@ -211 +211 @@
     {
         // first spawn human players to assign always the left bat to the player in singleplayer
-        for (auto& mapEntry : this->players_)
+        for (const auto& mapEntry : this->players_)
             if (mapEntry.first->isHumanPlayer() && (mapEntry.first->isReadyToSpawn() || this->bForceSpawn_))
                 this->spawnPlayer(mapEntry.first);
         // now spawn bots
-        for (auto& mapEntry : this->players_)
+        for (const auto& mapEntry : this->players_)
             if (!mapEntry.first->isHumanPlayer() && (mapEntry.first->isReadyToSpawn() || this->bForceSpawn_))
                 this->spawnPlayer(mapEntry.first);

code/branches/cpp11_v2/src/modules/questsystem/QuestManager.cc

@@ -235 +235 @@
     {
         int numQuests = 0;
-        for(auto& mapEntry : this->questMap_)
+        for(const auto& mapEntry : this->questMap_)
         {
             if(mapEntry.second->getParentQuest() == nullptr && !mapEntry.second->isInactive(player))
@@ -255 +255 @@
     Quest* QuestManager::getRootQuest(PlayerInfo* player, int index)
     {
-        for(auto& mapEntry : this->questMap_)
+        for(const auto& mapEntry : this->questMap_)
         {
             if(mapEntry.second->getParentQuest() == nullptr && !mapEntry.second->isInactive(player) && index-- == 0)

code/branches/cpp11_v2/src/modules/tetris/Tetris.cc

@@ -341 +341 @@
     {
         // Spawn a human player.
-        for (auto& mapEntry : this->players_)
+        for (const auto& mapEntry : this->players_)
             if (mapEntry.first->isHumanPlayer() && (mapEntry.first->isReadyToSpawn() || this->bForceSpawn_))
                 this->spawnPlayer(mapEntry.first);