Changeset 7635 in orxonox.OLD for branches

Timestamp:

May 17, 2006, 10:12:33 AM (18 years ago)

Author:

bensch

Message:

orxonox/qt_gui: less debug

Location:

branches/qt_gui/src/lib

Files:

• event/key_mapper.cc (modified) (3 diffs)
• event/key_mapper.h (modified) (3 diffs)
• gui/gui_saveable.cc (modified) (1 diff)
• util/preferences.cc (modified) (1 diff)

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

@@ -71 +71 @@
  * and you do not have to care about The namings, as they might change
  */
-orxKeyMapping map[] = {
+KeyMapper::KeyMapping KeyMapper::map[] = {
   {&KeyMapper::PEV_FORWARD,              CONFIG_NAME_PLAYER_FORWARD},
   {&KeyMapper::PEV_BACKWARD,             CONFIG_NAME_PLAYER_BACKWARD},
@@ -104 +104 @@
   {&KeyMapper::PEV_PAUSE,                CONFIG_NAME_PAUSE},
   {&KeyMapper::PEV_QUIT,                 CONFIG_NAME_QUIT},
-  {NULL, NULL}
+  {NULL, ""}
 };
 
@@ -266 +266 @@
   for(int i = 0; map[i].pValue != NULL; ++i)
     {
-      PRINT(0)("%s = %i\n",map[i].pName, *map[i].pValue);
+      PRINT(0)("%s = %i\n",map[i].pName.c_str(), *map[i].pValue);
     }
   PRINT(0)("=======================================================\n");

branches/qt_gui/src/lib/event/key_mapper.h

@@ -10 +10 @@
 
 #include "base_object.h"
-//#include "event_def.h"
-
+#include <string>
 class IniParser;
 
-//! A mapping from key-name to key-id
-typedef struct orxKeyMapping
+//! The map class functionalities
+class KeyMapper : public BaseObject
 {
-  int* pValue;
-  char* pName;
-};
+public:
+  //! A mapping from key-name to key-id
+  typedef struct KeyMapping
+  {
+    int* pValue;
+    const std::string pName;
+  };
 
-
-//! The map class functionalities
-class KeyMapper : public BaseObject {
-
- public:
+public:
   KeyMapper();
   virtual ~KeyMapper();
@@ -33 +32 @@
   void loadKeyBindings(IniParser* iniParser);
 
+  static const KeyMapping* const getKeyMapping() { return KeyMapper::map; };
+
   void debug();
 
- private:
+private:
   int* nameToIndex (const std::string& name);
   void mapKeys(const std::string& name, int* index);
 
- public:
+public:
   static int PEV_FORWARD;           //!< forward button
   static int PEV_BACKWARD;          //!< backward buttton
@@ -73 +74 @@
   static int PEV_QUIT;              //!< quit button
 
- private:
-  int         coord[2];              //!< temp place to save variables in nameToIndex() function
+private:
+  int                coord[2];      //!< temp place to save variables in nameToIndex() function
+  static KeyMapping  map[];         //!< The KeyMapping that maps strings to ID's and Vice Versa
 };
 

branches/qt_gui/src/lib/gui/gui_saveable.cc

@@ -14 +14 @@
 */
 
-//#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GUI
 
 #include "gui_saveable.h"

branches/qt_gui/src/lib/util/preferences.cc

@@ -274 +274 @@
     }
   }
-
+  /// HACK DO WE HAVE TO CHECK THIS??
   //if ( didChanges )
   {
-    iniParser.debug();
     iniParser.writeFile( this->fileName );
   }