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

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.h (modified) (2 diffs)

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

@@ -66 +66 @@
         void clearBindings();
         bool setBinding(const std::string& binding, const std::string& name, bool bTemporary = false);
-        std::string getBinding(std::string commandName); //tolua_export
-        std::string getBinding(std::string commandName, unsigned int index); //tolua_export
-        unsigned int getNumberOfBindings(std::string commandName); //tolua_export
+        const std::string& getBinding(const std::string& commandName); //tolua_export
+        const std::string& getBinding(const std::string& commandName, unsigned int index); //tolua_export
+        unsigned int getNumberOfBindings(const std::string& commandName); //tolua_export
 
         const std::string& getBindingsFilename()
@@ -160 +160 @@
 
     private:
-        void addButtonToCommand(std::string command, Button* button);
+        void addButtonToCommand(const std::string& command, Button* button);
 
         //##### ConfigValues #####