Modernize client code (#6250)

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

diff --git a/src/keycode.h b/src/keycode.h
index 4d66cf7b5df2a02545030665e9f897293de83646..b413d0396f82778ce4577b95531d7804adaae474 100644 (file)
--- a/src/keycode.h
+++ b/src/keycode.h
@@ -31,33 +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;
+
 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 CancelKey;
-extern const KeyPress NumberKey[10];
 
 // Key configuration getter
 KeyPress getKeySetting(const char *settingname);
@@ -68,4 +67,3 @@ void clearKeyCache();
 irr::EKEY_CODE keyname_to_keycode(const char *name);
 
 #endif
-