Changeset 7221 in orxonox.OLD for trunk/src/lib/event/key_mapper.h

Timestamp:

Mar 15, 2006, 3:10:45 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge ​https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

File:

• trunk/src/lib/event/key_mapper.h (modified) (2 diffs)

trunk/src/lib/event/key_mapper.h

@@ -29 +29 @@
   virtual ~KeyMapper();
 
-  void loadKeyBindings(const char* fileName = NULL);
+  void loadKeyBindings(const std::string& fileName = "" );
   void loadKeyBindings(IniParser* iniParser);
 
@@ -35 +35 @@
 
  private:
-  int* nameToIndex (const char* name);
-  void mapKeys(const char* name, int* index);
+  int* nameToIndex (const std::string& name);
+  void mapKeys(const std::string& name, int* index);
 
  public: