Changeset 6422 for code/trunk/src/libraries/core/input

Timestamp:

Dec 26, 2009, 11:18:13 AM (15 years ago)

Author:

rgrieder

Message:

Uniform code-styling per file. As if I didn't know what to do

Location:

code/trunk/src/libraries/core/input

Files:

• InputManager.cc (modified) (1 diff)
• KeyBinder.cc (modified) (4 diffs)
• Keyboard.cc (modified) (2 diffs)

code/trunk/src/libraries/core/input/InputManager.cc

@@ -404 +404 @@
                 {
                     // Get smallest possible priority between 1 and maxStateStackSize_s
-                    for(std::map<int, InputState*>::reverse_iterator rit = activeStates_.rbegin();
+                    for (std::map<int, InputState*>::reverse_iterator rit = activeStates_.rbegin();
                         rit != activeStates_.rend(); ++rit)
                     {

code/trunk/src/libraries/core/input/KeyBinder.cc

@@ -291 +291 @@
         std::vector<std::string>& oldKeynames = this->allCommands_[button->bindingString_];
         std::vector<std::string>::iterator it = std::find(oldKeynames.begin(), oldKeynames.end(), stream.str());
-        if(it != oldKeynames.end())
-        {
+        if (it != oldKeynames.end())
             oldKeynames.erase(it);
-        }
 
         if (!command.empty())
         {
             std::vector<std::string>& keynames = this->allCommands_[command];
-            if( std::find(keynames.begin(), keynames.end(), stream.str()) == keynames.end())
-            {
+            if (std::find(keynames.begin(), keynames.end(), stream.str()) == keynames.end())
                 this->allCommands_[command].push_back(stream.str());
-            }
         }
      }
@@ -312 +308 @@
     const std::string& KeyBinder::getBinding(const std::string& commandName)
     {
-        if( this->allCommands_.find(commandName) != this->allCommands_.end())
+        if (this->allCommands_.find(commandName) != this->allCommands_.end())
         {
             std::vector<std::string>& keynames = this->allCommands_[commandName];
@@ -331 +327 @@
     const std::string& KeyBinder::getBinding(const std::string& commandName, unsigned int index)
     {
-        if( this->allCommands_.find(commandName) != this->allCommands_.end())
+        if (this->allCommands_.find(commandName) != this->allCommands_.end())
         {
             std::vector<std::string>& keynames = this->allCommands_[commandName];
-            if(index < keynames.size())
-            {
+            if (index < keynames.size())
                 return keynames[index];
-            }
 
             return BLANKSTRING;
@@ -353 +347 @@
     unsigned int KeyBinder::getNumberOfBindings(const std::string& commandName)
     {
-        if( this->allCommands_.find(commandName) != this->allCommands_.end())
+        if (this->allCommands_.find(commandName) != this->allCommands_.end())
         {
             std::vector<std::string>& keynames = this->allCommands_[commandName];

code/trunk/src/libraries/core/input/Keyboard.cc

@@ -36 +36 @@
     {
         // update modifiers
-        if(arg.key == OIS::KC_RMENU    || arg.key == OIS::KC_LMENU)
+        if (arg.key == OIS::KC_RMENU    || arg.key == OIS::KC_LMENU)
             modifiers_ |= KeyboardModifier::Alt;   // alt key
-        if(arg.key == OIS::KC_RCONTROL || arg.key == OIS::KC_LCONTROL)
+        if (arg.key == OIS::KC_RCONTROL || arg.key == OIS::KC_LCONTROL)
             modifiers_ |= KeyboardModifier::Ctrl;  // ctrl key
-        if(arg.key == OIS::KC_RSHIFT   || arg.key == OIS::KC_LSHIFT)
+        if (arg.key == OIS::KC_RSHIFT   || arg.key == OIS::KC_LSHIFT)
             modifiers_ |= KeyboardModifier::Shift; // shift key
 
@@ -56 +56 @@
     {
         // update modifiers
-        if(arg.key == OIS::KC_RMENU    || arg.key == OIS::KC_LMENU)
+        if (arg.key == OIS::KC_RMENU    || arg.key == OIS::KC_LMENU)
             modifiers_ &= ~KeyboardModifier::Alt;   // alt key
-        if(arg.key == OIS::KC_RCONTROL || arg.key == OIS::KC_LCONTROL)
+        if (arg.key == OIS::KC_RCONTROL || arg.key == OIS::KC_LCONTROL)
             modifiers_ &= ~KeyboardModifier::Ctrl;  // ctrl key
-        if(arg.key == OIS::KC_RSHIFT   || arg.key == OIS::KC_LSHIFT)
+        if (arg.key == OIS::KC_RSHIFT   || arg.key == OIS::KC_LSHIFT)
             modifiers_ &= ~KeyboardModifier::Shift; // shift key