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

Timestamp:

Nov 21, 2015, 7:05:53 PM (10 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/pickup

Files:

• PickupCollection.cc (modified) (6 diffs)
• PickupManager.cc (modified) (1 diff)
• items/MetaPickup.cc (modified) (1 diff)

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

@@ -68 +68 @@
     {
         // Destroy all Pickupables constructing this PickupCollection.
-        for(std::list<CollectiblePickup*>::iterator it = this->pickups_.begin(); it != this->pickups_.end(); ++it)
-        {
-            (*it)->wasRemovedFromCollection();
-            (*it)->destroy();
+        for(auto & elem : this->pickups_)
+        {
+            (elem)->wasRemovedFromCollection();
+            (elem)->destroy();
         }
         this->pickups_.clear();
@@ -99 +99 @@
         this->processingUsed_ = true;
         // Change used for all Pickupables this PickupCollection consists of.
-        for(std::list<CollectiblePickup*>::iterator it = this->pickups_.begin(); it != this->pickups_.end(); ++it)
-            (*it)->setUsed(this->isUsed());
+        for(auto & elem : this->pickups_)
+            (elem)->setUsed(this->isUsed());
 
         this->processingUsed_ = false;
@@ -119 +119 @@
         size_t numPickupsEnabled = 0;
         size_t numPickupsInUse = 0;
-        for(std::list<CollectiblePickup*>::iterator it = this->pickups_.begin(); it != this->pickups_.end(); ++it)
-        {
-            if ((*it)->isEnabled())
+        for(auto & elem : this->pickups_)
+        {
+            if ((elem)->isEnabled())
                 ++numPickupsEnabled;
-            if ((*it)->isUsed())
+            if ((elem)->isUsed())
                 ++numPickupsInUse;
         }
@@ -146 +146 @@
 
         // Change the PickupCarrier for all Pickupables this PickupCollection consists of.
-        for(std::list<CollectiblePickup*>::iterator it = this->pickups_.begin(); it != this->pickups_.end(); ++it)
+        for(auto & elem : this->pickups_)
         {
             if(this->getCarrier() == nullptr)
-                (*it)->setCarrier(nullptr);
+                (elem)->setCarrier(nullptr);
             else
-                (*it)->setCarrier(this->getCarrier()->getTarget(*it));
+                (elem)->setCarrier(this->getCarrier()->getTarget(elem));
         }
     }
@@ -186 +186 @@
         // If at least all the enabled pickups of this PickupCollection are no longer picked up.
         bool isOnePickupEnabledAndPickedUp = false;
-        for(std::list<CollectiblePickup*>::iterator it = this->pickups_.begin(); it != this->pickups_.end(); ++it)
-        {
-            if ((*it)->isEnabled() && (*it)->isPickedUp())
+        for(auto & elem : this->pickups_)
+        {
+            if ((elem)->isEnabled() && (elem)->isPickedUp())
             {
                 isOnePickupEnabledAndPickedUp = true;
@@ -208 +208 @@
     bool PickupCollection::isTarget(const PickupCarrier* carrier) const
     {
-        for(std::list<CollectiblePickup*>::const_iterator it = this->pickups_.begin(); it != this->pickups_.end(); ++it)
-        {
-            if(!carrier->isTarget(*it))
+        for(const auto & elem : this->pickups_)
+        {
+            if(!carrier->isTarget(elem))
                 return false;
         }

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

@@ -91 +91 @@
 
         // Destroying all the PickupInventoryContainers that are still there.
-        for(std::map<uint32_t, PickupInventoryContainer*>::iterator it = this->pickupInventoryContainers_.begin(); it != this->pickupInventoryContainers_.end(); it++)
-            delete it->second;
+        for(auto & elem : this->pickupInventoryContainers_)
+            delete elem.second;
         this->pickupInventoryContainers_.clear();
 

code/branches/cpp11_v2/src/modules/pickup/items/MetaPickup.cc

@@ -118 +118 @@
                 std::set<Pickupable*> pickups = carrier->getPickups();
                 // Iterate over all Pickupables of the PickupCarrier.
-                for(std::set<Pickupable*>::iterator it = pickups.begin(); it != pickups.end(); it++)
+                for(auto pickup : pickups)
                 {
-                    Pickupable* pickup = (*it);
+                    
                     if(pickup == nullptr || pickup == this)
                         continue;