Streamline iterators and loop constructs

[libs/gui.git] / source / input / controlscheme.cpp

diff --git a/source/input/controlscheme.cpp b/source/input/controlscheme.cpp
index fe1c0ebfa25803de3ce8ff372a81fe03c356a700..4e5e8deba376c109ea693aebd464d3924d9defe2 100644 (file)
--- a/source/input/controlscheme.cpp
+++ b/source/input/controlscheme.cpp
@@ -19,14 +19,14 @@ Control &ControlScheme::get(const string &name) const
 
 Control *ControlScheme::find(const string &name) const
 {
-       map<string, Control *>::const_iterator i = controls.find(name);
+       auto i = controls.find(name);
        return (i!=controls.end() ? i->second : 0);
 }
 
 void ControlScheme::reset_edges()
 {
-       for(map<string, Control *>::const_iterator i=controls.begin(); i!=controls.end(); ++i)
-               i->second->reset_edges();
+       for(const auto &kvp: controls)
+               kvp.second->reset_edges();
 }
 
 } // namespace Input