Changeset 10778

Timestamp:

Nov 8, 2015, 3:12:17 PM (8 years ago)

Author:

landauf

Message:

use range-based-for-loop instead of BOOST_FOREACH

Location:

code/branches/cpp11_v2/src/libraries/core/input

Files:

• InputManager.cc (modified) (6 diffs)
• JoyStick.cc (modified) (4 diffs)

code/branches/cpp11_v2/src/libraries/core/input/InputManager.cc

@@ -39 +39 @@
 #include <ois/OISException.h>
 #include <ois/OISInputManager.h>
-#include <boost/foreach.hpp>
 #include <loki/ScopeGuard.h>
 
@@ -310 +309 @@
         orxout(verbose, context::input) << "InputManager: Destroying devices..." << endl;
 
-        BOOST_FOREACH(InputDevice*& device, devices_)
+        for (InputDevice*& device : devices_)
         {
             if (device == nullptr)
@@ -387 +386 @@
         // Capture all the input and collect the function calls
         // No event gets triggered here yet!
-        BOOST_FOREACH(InputDevice* device, devices_)
+        for  (InputDevice* device : devices_)
             if (device != nullptr)
                 device->update(time);
@@ -466 +465 @@
     void InputManager::clearBuffers()
     {
-        BOOST_FOREACH(InputDevice* device, devices_)
+        for (InputDevice* device : devices_)
             if (device != nullptr)
                 device->clearBuffers();
@@ -476 +475 @@
                         << "When done, put the axex in the middle position and press enter." << endl;
 
-        BOOST_FOREACH(InputDevice* device, devices_)
+        for (InputDevice* device : devices_)
             if (device != nullptr)
                 device->startCalibration();
@@ -487 +486 @@
     void InputManager::stopCalibration()
     {
-        BOOST_FOREACH(InputDevice* device, devices_)
+        for (InputDevice* device : devices_)
             if (device != nullptr)
                 device->stopCalibration();

code/branches/cpp11_v2/src/libraries/core/input/JoyStick.cc

@@ -31 +31 @@
 #include <climits>
 #include <ois/OISJoyStick.h>
-#include <boost/foreach.hpp>
 
 #include "util/StringUtils.h"
@@ -73 +72 @@
         //deviceName_ += multi_cast<std::string>(oisDevice_->getNumberOfComponents(OIS::OIS_Vector3));
 
-        BOOST_FOREACH(std::string& idString, deviceNames_s)
+        for (const std::string& idString : deviceNames_s)
         {
             if (deviceName_ == idString)
@@ -128 +127 @@
     {
         // Set initial values
-        BOOST_FOREACH(int& minVal, configMinValues_)
+        for (int& minVal : configMinValues_)
             minVal = INT_MAX;
-        BOOST_FOREACH(int& minVal, configMaxValues_)
+        for (int& minVal : configMaxValues_)
             minVal = INT_MIN;
-        BOOST_FOREACH(int& zeroVal, configZeroValues_)
+        for (int& zeroVal : configZeroValues_)
             zeroVal = 0;
     }
@@ -209 +208 @@
                 fValue *= negativeCoeffs_[axis];
 
-            BOOST_FOREACH(InputState* state, inputStates_)
+            for (InputState* state : inputStates_)
                 state->joyStickAxisMoved(this->getDeviceID(), axis, fValue);
         }