Changeset 10821 for code/branches/cpp11_v2/src/libraries/core/input/InputManager.cc

Timestamp:

Nov 21, 2015, 7:05:53 PM (8 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

File:

• code/branches/cpp11_v2/src/libraries/core/input/InputManager.cc (modified) (4 diffs)

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

@@ -373 +373 @@
         // check whether a state has changed its EMPTY situation
         bool bUpdateRequired = false;
-        for (std::map<int, InputState*>::iterator it = activeStates_.begin(); it != activeStates_.end(); ++it)
-        {
-            if (it->second->hasExpired())
-            {
-                it->second->resetExpiration();
+        for (auto & elem : activeStates_)
+        {
+            if (elem.second->hasExpired())
+            {
+                elem.second->resetExpiration();
                 bUpdateRequired = true;
             }
@@ -391 +391 @@
 
         // Collect function calls for the update
-        for (unsigned int i = 0; i < activeStatesTicked_.size(); ++i)
-            activeStatesTicked_[i]->update(time.getDeltaTime());
+        for (auto & elem : activeStatesTicked_)
+            elem->update(time.getDeltaTime());
 
         // Execute all cached function calls in order
@@ -401 +401 @@
         // If we delay the calls, then OIS and and the InputStates are not anymore
         // in the call stack and can therefore be edited.
-        for (size_t i = 0; i < this->callBuffer_.size(); ++i)
-            this->callBuffer_[i]();
+        for (auto & elem : this->callBuffer_)
+            elem();
 
         this->callBuffer_.clear();
@@ -437 +437 @@
         // Using an std::set to avoid duplicates
         std::set<InputState*> tempSet;
-        for (unsigned int i = 0; i < devices_.size(); ++i)
-            if (devices_[i] != nullptr)
-                for (unsigned int iState = 0; iState < devices_[i]->getStateListRef().size(); ++iState)
-                    tempSet.insert(devices_[i]->getStateListRef()[iState]);
+        for (auto & elem : devices_)
+            if (elem != nullptr)
+                for (unsigned int iState = 0; iState < elem->getStateListRef().size(); ++iState)
+                    tempSet.insert(elem->getStateListRef()[iState]);
 
         // Copy the content of the std::set back to the actual vector
         activeStatesTicked_.clear();
-        for (std::set<InputState*>::const_iterator it = tempSet.begin();it != tempSet.end(); ++it)
-            activeStatesTicked_.push_back(*it);
+        for (const auto & elem : tempSet)
+            activeStatesTicked_.push_back(elem);
 
         // Check whether we have to change the mouse mode