Changeset 10920 for code/branches/cpp11_v2/src/orxonox/Radar.cc

Timestamp:

Dec 6, 2015, 2:51:14 PM (8 years ago)

Author:

landauf

Message:

no static functions anymore in ObjectList. you need to instantiate an ObjectList to use it.
this allows for prettier for-loop syntax when iterating over an ObjectList of a specific context: for (T* object : ObjectList<T>(context)) { … }

File:

• code/branches/cpp11_v2/src/orxonox/Radar.cc (modified) (2 diffs)

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

@@ -138 +138 @@
     void Radar::cycleFocus()
     {
-        if (ObjectList<RadarViewable>::begin() == ObjectList<RadarViewable>::end())
+        ObjectList<RadarViewable> listRadarViewable;
+        if (listRadarViewable.size() == 0)
         {
             // list is empty
@@ -158 +159 @@
             ObjectList<RadarViewable>::iterator itFallback = nullptr;
 
-            for (ObjectList<RadarViewable>::iterator it = ObjectList<RadarViewable>::begin(); it; ++it)
+            for (ObjectList<RadarViewable>::iterator it = listRadarViewable.begin(); it; ++it)
             {
                 if (*it == static_cast<RadarViewable*>(HumanController::getLocalControllerEntityAsPawn()))