Changeset 10821 for code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.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/KeyBinder.cc (modified) (6 diffs)

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

@@ -153 +153 @@
     void KeyBinder::buttonThresholdChanged()
     {
-        for (unsigned int i = 0; i < allHalfAxes_.size(); i++)
-            if (!allHalfAxes_[i]->bButtonThresholdUser_)
-                allHalfAxes_[i]->buttonThreshold_ = this->buttonThreshold_;
+        for (auto & elem : allHalfAxes_)
+            if (!elem->bButtonThresholdUser_)
+                elem->buttonThreshold_ = this->buttonThreshold_;
     }
 
@@ -383 +383 @@
             it->second->clear();
 
-        for (unsigned int i = 0; i < paramCommandBuffer_.size(); i++)
-            delete paramCommandBuffer_[i];
+        for (auto & elem : paramCommandBuffer_)
+            delete elem;
         paramCommandBuffer_.clear();
     }
@@ -394 +394 @@
     {
         // iterate over all buttons
-        for (std::map<std::string, Button*>::iterator it = this->allButtons_.begin(); it != this->allButtons_.end(); ++it)
-        {
-            Button* button = it->second;
+        for (const auto & elem : this->allButtons_)
+        {
+            Button* button = elem.second;
 
             // iterate over all modes
@@ -465 +465 @@
         this->mousePosition_[1] = 0.0f;
 
-        for (unsigned int i = 0; i < MouseAxisCode::numberOfAxes * 2; i++)
-            mouseAxes_[i].reset();
+        for (auto & elem : mouseAxes_)
+            elem.reset();
     }
 
@@ -505 +505 @@
         }
 
-        for (unsigned int i = 0; i < MouseAxisCode::numberOfAxes * 2; i++)
+        for (auto & elem : mouseAxes_)
         {
             // Why dividing relative value by dt? The reason lies in the simple fact, that when you
@@ -515 +515 @@
             {
                 // just ignore if dt == 0.0 because we have multiplied by 0.0 anyway..
-                mouseAxes_[i].relVal_ /= dt;
-            }
-
-            tickHalfAxis(mouseAxes_[i]);
+                elem.relVal_ /= dt;
+            }
+
+            tickHalfAxis(elem);
         }
     }