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

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

Files:

• Attacher.cc (modified) (3 diffs)
• Script.cc (modified) (1 diff)
• SpaceBoundaries.cc (modified) (3 diffs)
• eventsystem/EventDispatcher.cc (modified) (3 diffs)
• eventsystem/EventFilter.cc (modified) (2 diffs)
• triggers/DistanceMultiTrigger.cc (modified) (1 diff)
• triggers/DistanceTrigger.cc (modified) (1 diff)
• triggers/MultiTrigger.cc (modified) (3 diffs)
• triggers/Trigger.cc (modified) (3 diffs)

code/branches/cpp11_v2/src/modules/objects/Attacher.cc

@@ -61 +61 @@
         SUPER(Attacher, changedActivity);
 
-        for (std::list<WorldEntity*>::iterator it = this->objects_.begin(); it != this->objects_.end(); ++it)
-            (*it)->setActive(this->isActive());
+        for (auto & elem : this->objects_)
+            (elem)->setActive(this->isActive());
     }
 
@@ -69 +69 @@
         SUPER(Attacher, changedVisibility);
 
-        for (std::list<WorldEntity*>::iterator it = this->objects_.begin(); it != this->objects_.end(); ++it)
-            (*it)->setVisible(this->isVisible());
+        for (auto & elem : this->objects_)
+            (elem)->setVisible(this->isVisible());
     }
 
@@ -83 +83 @@
     {
         unsigned int i = 0;
-        for (std::list<WorldEntity*>::const_iterator it = this->objects_.begin(); it != this->objects_.end(); ++it)
+        for (const auto & elem : this->objects_)
         {
             if (i == index)
-                return (*it);
+                return (elem);
 
             ++i;

code/branches/cpp11_v2/src/modules/objects/Script.cc

@@ -196 +196 @@
             {
                 const std::map<unsigned int, PlayerInfo*> clients = PlayerManager::getInstance().getClients();
-                for(std::map<unsigned int, PlayerInfo*>::const_iterator it = clients.begin(); it != clients.end(); it++)
+                for(const auto & client : clients)
                 {
-                    callStaticNetworkFunction(&Script::executeHelper, it->first, this->getCode(), this->getMode(), this->getNeedsGraphics());
+                    callStaticNetworkFunction(&Script::executeHelper, client.first, this->getCode(), this->getMode(), this->getNeedsGraphics());
                     if(this->times_ != Script::INF) // Decrement the number of remaining executions.
                     {

code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.cc

@@ -59 +59 @@
             this->pawnsIn_.clear();
 
-            for( std::vector<BillboardAdministration>::iterator current = this->billboards_.begin(); current != this->billboards_.end(); current++)
+            for(auto & elem : this->billboards_)
             {
-                if( current->billy != nullptr)
-                {
-                    delete current->billy;
+                if( elem.billy != nullptr)
+                {
+                    delete elem.billy;
                 }
             }
@@ -138 +138 @@
     void SpaceBoundaries::removeAllBillboards()
     {
-        for( std::vector<BillboardAdministration>::iterator current = this->billboards_.begin(); current != this->billboards_.end(); current++ )
-        {
-            current->usedYet = false;
-            current->billy->setVisible(false);
+        for(auto & elem : this->billboards_)
+        {
+            elem.usedYet = false;
+            elem.billy->setVisible(false);
         }
     }
@@ -208 +208 @@
         float distance;
         bool humanItem;
-        for( std::list<WeakPtr<Pawn>>::iterator current = pawnsIn_.begin(); current != pawnsIn_.end(); current++ )
-        {
-            Pawn* currentPawn = *current;
+        for(auto currentPawn : pawnsIn_)
+        {
+            
             if( currentPawn && currentPawn->getNode() ) 
             {

code/branches/cpp11_v2/src/modules/objects/eventsystem/EventDispatcher.cc

@@ -45 +45 @@
     {
         if (this->isInitialized())
-            for (std::list<BaseObject*>::iterator it = this->targets_.begin(); it != this->targets_.end(); ++it)
-                (*it)->destroy();
+            for (auto & elem : this->targets_)
+                (elem)->destroy();
     }
 
@@ -61 +61 @@
     void EventDispatcher::processEvent(Event& event)
     {
-        for (std::list<BaseObject*>::iterator it = this->targets_.begin(); it != this->targets_.end(); ++it)
-            (*it)->processEvent(event);
+        for (auto & elem : this->targets_)
+            (elem)->processEvent(event);
     }
 
@@ -73 +73 @@
     {
         unsigned int i = 0;
-        for (std::list<BaseObject*>::const_iterator it = this->targets_.begin(); it != this->targets_.end(); ++it)
+        for (const auto & elem : this->targets_)
         {
             if (i == index)
-                return (*it);
+                return (elem);
             ++i;
         }

code/branches/cpp11_v2/src/modules/objects/eventsystem/EventFilter.cc

@@ -96 +96 @@
     {
         unsigned int i = 0;
-        for (std::list<BaseObject*>::const_iterator it = this->sources_.begin(); it != this->sources_.end(); ++it)
+        for (const auto & elem : this->sources_)
         {
             if (i == index)
-                return (*it);
+                return (elem);
             ++i;
         }
@@ -113 +113 @@
     {
         unsigned int i = 0;
-        for (std::list<EventName*>::const_iterator it = this->names_.begin(); it != this->names_.end(); ++it)
+        for (const auto & elem : this->names_)
         {
             if (i == index)
-                return (*it);
+                return (elem);
             ++i;
         }

code/branches/cpp11_v2/src/modules/objects/triggers/DistanceMultiTrigger.cc

@@ -160 +160 @@
                 const std::set<WorldEntity*> attached = entity->getAttachedObjects();
                 bool found = false;
-                for(std::set<WorldEntity*>::const_iterator it = attached.begin(); it != attached.end(); it++)
+                for(const auto & elem : attached)
                 {
-                    if((*it)->isA(ClassIdentifier<DistanceTriggerBeacon>::getIdentifier()) && static_cast<DistanceTriggerBeacon*>(*it)->getName() == this->targetName_)
+                    if((elem)->isA(ClassIdentifier<DistanceTriggerBeacon>::getIdentifier()) && static_cast<DistanceTriggerBeacon*>(elem)->getName() == this->targetName_)
                     {
                         found = true;

code/branches/cpp11_v2/src/modules/objects/triggers/DistanceTrigger.cc

@@ -182 +182 @@
                 const std::set<WorldEntity*> attached = entity->getAttachedObjects();
                 bool found = false;
-                for(std::set<WorldEntity*>::const_iterator it = attached.begin(); it != attached.end(); it++)
+                for(const auto & elem : attached)
                 {
-                    if((*it)->isA(ClassIdentifier<DistanceTriggerBeacon>::getIdentifier()) && static_cast<DistanceTriggerBeacon*>(*it)->getName() == this->targetName_)
+                    if((elem)->isA(ClassIdentifier<DistanceTriggerBeacon>::getIdentifier()) && static_cast<DistanceTriggerBeacon*>(elem)->getName() == this->targetName_)
                     {
                         found = true;

code/branches/cpp11_v2/src/modules/objects/triggers/MultiTrigger.cc

@@ -504 +504 @@
     bool MultiTrigger::checkAnd(BaseObject* triggerer)
     {
-        for(std::set<TriggerBase*>::iterator it = this->children_.begin(); it != this->children_.end(); ++it)
-        {
-            TriggerBase* trigger = *it;
+        for(auto trigger : this->children_)
+        {
+            
             if(trigger->isMultiTrigger())
             {
@@ -531 +531 @@
     bool MultiTrigger::checkOr(BaseObject* triggerer)
     {
-        for(std::set<TriggerBase*>::iterator it = this->children_.begin(); it != this->children_.end(); ++it)
-        {
-            TriggerBase* trigger = *it;
+        for(auto trigger : this->children_)
+        {
+            
             if(trigger->isMultiTrigger())
             {
@@ -559 +559 @@
     {
         bool triggered = false;
-        for(std::set<TriggerBase*>::iterator it = this->children_.begin(); it != this->children_.end(); ++it)
-        {
-            TriggerBase* trigger = *it;
+        for(auto trigger : this->children_)
+        {
+            
             if(triggered)
             {

code/branches/cpp11_v2/src/modules/objects/triggers/Trigger.cc

@@ -234 +234 @@
     {
         // Iterate over all sub-triggers.
-        for (std::set<TriggerBase*>::iterator it = this->children_.begin(); it != this->children_.end(); ++it)
-        {
-            if (!(*it)->isActive())
+        for (const auto & elem : this->children_)
+        {
+            if (!(elem)->isActive())
                 return false;
         }
@@ -252 +252 @@
     {
         // Iterate over all sub-triggers.
-        for (std::set<TriggerBase*>::iterator it = this->children_.begin(); it != this->children_.end(); ++it)
-        {
-            if ((*it)->isActive())
+        for (const auto & elem : this->children_)
+        {
+            if ((elem)->isActive())
                 return true;
         }
@@ -270 +270 @@
     {
         bool test = false;
-        for (std::set<TriggerBase*>::iterator it = this->children_.begin(); it != this->children_.end(); ++it)
-        {
-            if (test && (*it)->isActive())
+        for (const auto & elem : this->children_)
+        {
+            if (test && (elem)->isActive())
                 return false;
-            if ((*it)->isActive())
+            if ((elem)->isActive())
                 test = true;
         }