Changeset 9869 in orxonox.OLD for trunk/src/lib/event/key_mapper.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/lib/event/key_mapper.cc (modified) (3 diffs)

trunk/src/lib/event/key_mapper.cc

@@ -25 +25 @@
 #include "globals.h"
 #include "parser/ini_parser/ini_parser.h"
-#include "util/preferences.h"
+#include "parser/preferences/preferences.h"
 #include "key_names.h"
 #include "event_def.h"
@@ -32 +32 @@
 
 
-
+ObjectListDefinition(KeyMapper);
 
 /* initialize all variables to a reasonable value*/
@@ -116 +116 @@
 KeyMapper::KeyMapper ()
 {
-   this->setClassID(CL_KEY_MAPPER, "KeyMapper");
+  this->registerObject(this, KeyMapper::_objectList);
 }