Modernize client code (#6250)

[oweals/minetest.git] / src / keycode.h

diff --git a/src/keycode.h b/src/keycode.h
index 65f04d8d738aade49277d0748c2114d18dc23ad6..b413d0396f82778ce4577b95531d7804adaae474 100644 (file)
--- a/src/keycode.h
+++ b/src/keycode.h
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define KEYCODE_HEADER
 
 #include "irrlichttypes.h"
+#include "Keycodes.h"
 #include <IEventReceiver.h>
 #include <string>
 
@@ -30,34 +31,32 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 class KeyPress
 {
 public:
-       KeyPress();
+       KeyPress() {}
        KeyPress(const char *name);
 
-       KeyPress(const irr::SEvent::SKeyInput &in, bool prefer_character=false);
+       KeyPress(const irr::SEvent::SKeyInput &in, bool prefer_character = false);
 
        bool operator==(const KeyPress &o) const
        {
-               return (Char > 0 && Char == o.Char) ||
-                       (valid_kcode(Key) && Key == o.Key);
+               return (Char > 0 && Char == o.Char) || (valid_kcode(Key) && Key == o.Key);
        }
 
        const char *sym() const;
        const char *name() const;
 
-       std::string debug() const;
 protected:
        static bool valid_kcode(irr::EKEY_CODE k)
        {
                return k > 0 && k < irr::KEY_KEY_CODES_COUNT;
        }
 
-       irr::EKEY_CODE Key;
-       wchar_t Char;
-       std::string m_name;
+       irr::EKEY_CODE Key = irr::KEY_KEY_CODES_COUNT;
+       wchar_t Char = L'\0';
+       std::string m_name = "";
 };
 
 extern const KeyPress EscapeKey;
-extern const KeyPress NumberKey[10];
+extern const KeyPress CancelKey;
 
 // Key configuration getter
 KeyPress getKeySetting(const char *settingname);
@@ -65,5 +64,6 @@ KeyPress getKeySetting(const char *settingname);
 // Clear fast lookup cache
 void clearKeyCache();
 
-#endif
+irr::EKEY_CODE keyname_to_keycode(const char *name);
 
+#endif