Fix OSX builds (closes #6289, fixes #6270) (#6306)

[dragonfireclient.git] / src / keycode.h

diff --git a/src/keycode.h b/src/keycode.h
index 4cd0b707e5e015fee3dd0a79549e0dc4cbc44d07..7036705d16a486dcf8d0673b386b11c27001c3d8 100644 (file)
--- a/src/keycode.h
+++ b/src/keycode.h
@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef KEYCODE_HEADER
-#define KEYCODE_HEADER
+#pragma once
 
 #include "irrlichttypes.h"
 #include "Keycodes.h"
@@ -31,7 +30,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 class KeyPress
 {
 public:
-       KeyPress();
+       KeyPress() = default;
+
        KeyPress(const char *name);
 
        KeyPress(const irr::SEvent::SKeyInput &in, bool prefer_character = false);
@@ -50,14 +50,13 @@ class KeyPress
                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);
@@ -66,5 +65,3 @@ KeyPress getKeySetting(const char *settingname);
 void clearKeyCache();
 
 irr::EKEY_CODE keyname_to_keycode(const char *name);
-
-#endif