Changeset 10916 for code/branches/cpp11_v2/src/orxonox/Level.cc

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

File:

• code/branches/cpp11_v2/src/orxonox/Level.cc (modified) (3 diffs)

code/branches/cpp11_v2/src/orxonox/Level.cc

@@ -106 +106 @@
     void Level::networkCallbackTemplatesChanged()
     {
-        for(const auto & elem : this->networkTemplateNames_)
-        {
-            assert(Template::getTemplate(elem));
-            Template::getTemplate(elem)->applyOn(this);
+        for(const std::string& name : this->networkTemplateNames_)
+        {
+            assert(Template::getTemplate(name));
+            Template::getTemplate(name)->applyOn(this);
         }
     }
@@ -135 +135 @@
         //       objects alive when ~Level is called. This is the reason why we cannot directly destroy() the Plugins - instead we need
         //       to call destroyLater() to ensure that no instances from this plugin exist anymore.
-        for (auto & elem : this->plugins_)
-            (elem)->destroyLater();
+        for (PluginReference* plugin : this->plugins_)
+            plugin->destroyLater();
         this->plugins_.clear();
     }
@@ -173 +173 @@
     {
         unsigned int i = 0;
-        for (const auto & elem : this->objects_)
+        for (BaseObject* object : this->objects_)
         {
             if (i == index)
-                return (elem);
+                return object;
             ++i;
         }