Changeset 7203 in orxonox.OLD for branches/std/src/lib/event/key_mapper.cc

Timestamp:

Mar 9, 2006, 5:28:10 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: compiles again, BUT well…. i do not expect it to run anymore

File:

• branches/std/src/lib/event/key_mapper.cc (modified) (5 diffs)

branches/std/src/lib/event/key_mapper.cc

@@ -129 +129 @@
  * @param filename: The path and name of the file to load the bindings from
 */
-void KeyMapper::loadKeyBindings (const char* fileName)
+void KeyMapper::loadKeyBindings (const std::string& fileName)
 {
   IniParser parser(fileName);
@@ -145 +145 @@
 
   iniParser->firstVar();
-  while(iniParser->getCurrentName())
+  while(iniParser->getCurrentName() != "")
   {
     PRINTF(3)("Keys: Parsing %s, %s now.\n", iniParser->getCurrentName(), iniParser->getCurrentValue());
@@ -164 +164 @@
 
   iniParser->firstVar();
-  while(iniParser->getCurrentName())
+  while(iniParser->getCurrentName() != "")
   {
     PRINTF(3)("MISC: Parsing %s, %s now.\n", iniParser->getCurrentName(), iniParser->getCurrentValue());
@@ -177 +177 @@
  * @param the name of the button
 */
-int* KeyMapper::nameToIndex (const char* name)
+int* KeyMapper::nameToIndex (const std::string& name)
 {
   coord[0] = -1;
@@ -199 +199 @@
  * @param id of the key
 */
-void KeyMapper::mapKeys(const char* name, int* index)
+void KeyMapper::mapKeys(const std::string& name, int* index)
 {
   for( int i = 0; map[i].pValue != NULL; ++i )
     {
-      if( !strcmp (name, map[i].pName))
+      if( name == map[i].pName)
       {
         if( index[0] == 0)