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

Timestamp:

Dec 2, 2015, 11:22:03 PM (9 years ago)

Author:

landauf

Message:

use actual types instead of 'auto'. only exception is for complicated template types, e.g. when iterating over a map

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 (auto & elem : this->objects_)
-            (elem)->setActive(this->isActive());
+        for (WorldEntity* object : this->objects_)
+            object->setActive(this->isActive());
     }
 
@@ -69 +69 @@
         SUPER(Attacher, changedVisibility);
 
-        for (auto & elem : this->objects_)
-            (elem)->setVisible(this->isVisible());
+        for (WorldEntity* object : this->objects_)
+            object->setVisible(this->isVisible());
     }
 
@@ -83 +83 @@
     {
         unsigned int i = 0;
-        for (const auto & elem : this->objects_)
+        for (WorldEntity* object : this->objects_)
         {
             if (i == index)
-                return (elem);
+                return object;
 
             ++i;

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

@@ -196 +196 @@
             {
                 const std::map<unsigned int, PlayerInfo*> clients = PlayerManager::getInstance().getClients();
-                for(const auto & client : clients)
+                for(const auto& mapEntry : clients)
                 {
-                    callStaticNetworkFunction(&Script::executeHelper, client.first, this->getCode(), this->getMode(), this->getNeedsGraphics());
+                    callStaticNetworkFunction(&Script::executeHelper, mapEntry.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(auto & elem : this->billboards_)
+            for(BillboardAdministration& billboard : this->billboards_)
             {
-                if( elem.billy != nullptr)
-                {
-                    delete elem.billy;
+                if( billboard.billy != nullptr)
+                {
+                    delete billboard.billy;
                 }
             }
@@ -138 +138 @@
     void SpaceBoundaries::removeAllBillboards()
     {
-        for(auto & elem : this->billboards_)
-        {
-            elem.usedYet = false;
-            elem.billy->setVisible(false);
+        for(BillboardAdministration& billboard : this->billboards_)
+        {
+            billboard.usedYet = false;
+            billboard.billy->setVisible(false);
         }
     }
@@ -208 +208 @@
         float distance;
         bool humanItem;
-        for(auto currentPawn : pawnsIn_)
-        {
-            
+        for(Pawn* currentPawn : pawnsIn_)
+        {
             if( currentPawn && currentPawn->getNode() ) 
             {

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

@@ -45 +45 @@
     {
         if (this->isInitialized())
-            for (auto & elem : this->targets_)
-                (elem)->destroy();
+            for (BaseObject* target : this->targets_)
+                target->destroy();
     }
 
@@ -61 +61 @@
     void EventDispatcher::processEvent(Event& event)
     {
-        for (auto & elem : this->targets_)
-            (elem)->processEvent(event);
+        for (BaseObject* target : this->targets_)
+            target->processEvent(event);
     }
 
@@ -73 +73 @@
     {
         unsigned int i = 0;
-        for (const auto & elem : this->targets_)
+        for (BaseObject* target : this->targets_)
         {
             if (i == index)
-                return (elem);
+                return target;
             ++i;
         }

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

@@ -96 +96 @@
     {
         unsigned int i = 0;
-        for (const auto & elem : this->sources_)
+        for (BaseObject* source : this->sources_)
         {
             if (i == index)
-                return (elem);
+                return source;
             ++i;
         }
@@ -113 +113 @@
     {
         unsigned int i = 0;
-        for (const auto & elem : this->names_)
+        for (EventName* name : this->names_)
         {
             if (i == index)
-                return (elem);
+                return name;
             ++i;
         }

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

@@ -158 +158 @@
             {
                 
-                const std::set<WorldEntity*> attached = entity->getAttachedObjects();
+                const std::set<WorldEntity*> attachedObjects = entity->getAttachedObjects();
                 bool found = false;
-                for(const auto & elem : attached)
+                for(WorldEntity* attachedObject : attachedObjects)
                 {
-                    if((elem)->isA(ClassIdentifier<DistanceTriggerBeacon>::getIdentifier()) && static_cast<DistanceTriggerBeacon*>(elem)->getName() == this->targetName_)
+                    if(attachedObject->isA(ClassIdentifier<DistanceTriggerBeacon>::getIdentifier()) && static_cast<DistanceTriggerBeacon*>(attachedObject)->getName() == this->targetName_)
                     {
                         found = true;

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

@@ -180 +180 @@
             {
 
-                const std::set<WorldEntity*> attached = entity->getAttachedObjects();
+                const std::set<WorldEntity*> attachedObjects = entity->getAttachedObjects();
                 bool found = false;
-                for(const auto & elem : attached)
+                for(WorldEntity* attachedObject : attachedObjects)
                 {
-                    if((elem)->isA(ClassIdentifier<DistanceTriggerBeacon>::getIdentifier()) && static_cast<DistanceTriggerBeacon*>(elem)->getName() == this->targetName_)
+                    if(attachedObject->isA(ClassIdentifier<DistanceTriggerBeacon>::getIdentifier()) && static_cast<DistanceTriggerBeacon*>(attachedObject)->getName() == this->targetName_)
                     {
                         found = true;

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

@@ -504 +504 @@
     bool MultiTrigger::checkAnd(BaseObject* triggerer)
     {
-        for(auto trigger : this->children_)
-        {
-            
+        for(TriggerBase* trigger : this->children_)
+        {
             if(trigger->isMultiTrigger())
             {
@@ -531 +530 @@
     bool MultiTrigger::checkOr(BaseObject* triggerer)
     {
-        for(auto trigger : this->children_)
-        {
-            
+        for(TriggerBase* trigger : this->children_)
+        {
             if(trigger->isMultiTrigger())
             {
@@ -559 +557 @@
     {
         bool triggered = false;
-        for(auto trigger : this->children_)
-        {
-            
+        for(TriggerBase* trigger : this->children_)
+        {
             if(triggered)
             {

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

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