Changeset 6394 for code/branches/presentation2/src/libraries/core/input/KeyBinder.cc

Timestamp:

Dec 22, 2009, 2:07:44 PM (16 years ago)

Author:

rgrieder

Message:

std::string tweaks:

• Declared BLANKSTRING in UtilPrereqs.h as well (removed obsolete StringUtils.h includes to avoid dependencies)
• Using BLANKSTRING if const std::string& return type is possible
• Replaced a few (const) std::string arguments with const std::string&
• if (str == "") —> if (str.empty())
• std::string msg = name + "adsf"; —> const std::string& msg = name + "asdf";
• std::string asdf = object→getFooBar(); —> const std::string& asdf = object→getFooBar();
• std::string asdf = "asdf"; —> std::string asdf("asdf");
• ostream << "."; and name + "." —> ostream << '.'; and name + '.'
• str = ""; —> str.clear()
• std::string asdf = ""; —> std::string asdf;
• asdf_ = ""; (in c'tor) —> delete line

File:

• code/branches/presentation2/src/libraries/core/input/KeyBinder.cc (modified) (11 diffs)

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

@@ -61 +61 @@
         for (unsigned int i = 0; i < KeyCode::numberOfKeys; i++)
         {
-            std::string keyname = KeyCode::ByString[i];
+            const std::string& keyname = KeyCode::ByString[i];
             if (!keyname.empty())
                 keys_[i].name_ = std::string("Key") + keyname;
             else
-                keys_[i].name_ = "";
+                keys_[i].name_.clear();
             keys_[i].paramCommandBuffer_ = &paramCommandBuffer_;
             keys_[i].groupName_ = "Keys";
@@ -188 +188 @@
         this->joyStickButtons_.resize(joySticks_.size());
 
-        // reinitialise all joy stick binings (doesn't overwrite the old ones)
+        // reinitialise all joy stick bindings (doesn't overwrite the old ones)
         for (unsigned int iDev = 0; iDev < joySticks_.size(); iDev++)
         {
-            std::string deviceName = joySticks_[iDev]->getDeviceName();
+            const std::string& deviceName = joySticks_[iDev]->getDeviceName();
             // joy stick buttons
             for (unsigned int i = 0; i < JoyStickButtonCode::numberOfButtons; i++)
@@ -221 +221 @@
         for (unsigned int i = 0; i < KeyCode::numberOfKeys; i++)
             if (!keys_[i].name_.empty())
-                allButtons_[keys_[i].groupName_ + "." + keys_[i].name_] = keys_ + i;
+                allButtons_[keys_[i].groupName_ + '.' + keys_[i].name_] = keys_ + i;
         for (unsigned int i = 0; i < numberOfMouseButtons_; i++)
-            allButtons_[mouseButtons_[i].groupName_ + "." + mouseButtons_[i].name_] = mouseButtons_ + i;
+            allButtons_[mouseButtons_[i].groupName_ + '.' + mouseButtons_[i].name_] = mouseButtons_ + i;
         for (unsigned int i = 0; i < MouseAxisCode::numberOfAxes * 2; i++)
         {
-            allButtons_[mouseAxes_[i].groupName_ + "." + mouseAxes_[i].name_] = mouseAxes_ + i;
+            allButtons_[mouseAxes_[i].groupName_ + '.' + mouseAxes_[i].name_] = mouseAxes_ + i;
             allHalfAxes_.push_back(mouseAxes_ + i);
         }
@@ -232 +232 @@
         {
             for (unsigned int i = 0; i < JoyStickButtonCode::numberOfButtons; i++)
-                allButtons_[(*joyStickButtons_[iDev])[i].groupName_ + "." + (*joyStickButtons_[iDev])[i].name_] = &((*joyStickButtons_[iDev])[i]);
+                allButtons_[(*joyStickButtons_[iDev])[i].groupName_ + '.' + (*joyStickButtons_[iDev])[i].name_] = &((*joyStickButtons_[iDev])[i]);
             for (unsigned int i = 0; i < JoyStickAxisCode::numberOfAxes * 2; i++)
             {
-                allButtons_[(*joyStickAxes_[iDev])[i].groupName_ + "." + (*joyStickAxes_[iDev])[i].name_] = &((*joyStickAxes_[iDev])[i]);
+                allButtons_[(*joyStickAxes_[iDev])[i].groupName_ + '.' + (*joyStickAxes_[iDev])[i].name_] = &((*joyStickAxes_[iDev])[i]);
                 allHalfAxes_.push_back(&((*joyStickAxes_[iDev])[i]));
             }
@@ -284 +284 @@
     }
 
-     void KeyBinder::addButtonToCommand(std::string command, Button* button)
+     void KeyBinder::addButtonToCommand(const std::string& command, Button* button)
      {
         std::ostringstream stream;
-        stream << button->groupName_  << "." << button->name_;
+        stream << button->groupName_  << '.' << button->name_;
 
         std::vector<std::string>& oldKeynames = this->allCommands_[button->bindingString_];
@@ -296 +296 @@
         }
 
-        if(command != "")
+        if (!command.empty())
         {
             std::vector<std::string>& keynames = this->allCommands_[command];
@@ -310 +310 @@
         Return the first key name for a specific command
     */
-    std::string KeyBinder::getBinding(std::string commandName)
+    const std::string& KeyBinder::getBinding(const std::string& commandName)
     {
         if( this->allCommands_.find(commandName) != this->allCommands_.end())
@@ -318 +318 @@
         }
 
-        return "";
+        return BLANKSTRING;
     }
 
@@ -329 +329 @@
         The index at which the key name is returned for.
     */
-    std::string KeyBinder::getBinding(std::string commandName, unsigned int index)
+    const std::string& KeyBinder::getBinding(const std::string& commandName, unsigned int index)
     {
         if( this->allCommands_.find(commandName) != this->allCommands_.end())
@@ -339 +339 @@
             }
 
-            return "";
-        }
-
-        return "";
+            return BLANKSTRING;
+        }
+
+        return BLANKSTRING;
     }
 
@@ -351 +351 @@
         The command.
     */
-    unsigned int KeyBinder::getNumberOfBindings(std::string commandName)
+    unsigned int KeyBinder::getNumberOfBindings(const std::string& commandName)
     {
         if( this->allCommands_.find(commandName) != this->allCommands_.end())