diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2017-08-18 08:21:01 +0200 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2017-08-18 08:21:01 +0200 |
| commit | 951f1201c413c1137cfbef771bdd575c9c7e01bb (patch) | |
| tree | ed026ec17a71e46232a87f8ee95e599503f335cb /src/keycode.cpp | |
| parent | 1d086aee7cc193bed2f8ca09cc2e020f509378f1 (diff) | |
| download | minetest-951f1201c413c1137cfbef771bdd575c9c7e01bb.tar.gz minetest-951f1201c413c1137cfbef771bdd575c9c7e01bb.tar.bz2 minetest-951f1201c413c1137cfbef771bdd575c9c7e01bb.zip | |
Modernize various files (src/k*, src/l*)
* range-based for loops
* code style
* C++ headers instead of C headers
* Default operators
Diffstat (limited to 'src/keycode.cpp')
| -rw-r--r-- | src/keycode.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/keycode.cpp b/src/keycode.cpp index 3551c385a..cedd0803b 100644 --- a/src/keycode.cpp +++ b/src/keycode.cpp @@ -246,9 +246,9 @@ static const struct table_key table[] = { struct table_key lookup_keyname(const char *name) { - for (u16 i = 0; i < ARRLEN(table); i++) { - if (strcmp(table[i].Name, name) == 0) - return table[i]; + for (const auto &table_key : table) { + if (strcmp(table_key.Name, name) == 0) + return table_key; } throw UnknownKeycode(name); @@ -256,9 +256,9 @@ struct table_key lookup_keyname(const char *name) struct table_key lookup_keykey(irr::EKEY_CODE key) { - for (u16 i = 0; i < ARRLEN(table); i++) { - if (table[i].Key == key) - return table[i]; + for (const auto &table_key : table) { + if (table_key.Key == key) + return table_key; } std::ostringstream os; @@ -268,9 +268,9 @@ struct table_key lookup_keykey(irr::EKEY_CODE key) struct table_key lookup_keychar(wchar_t Char) { - for (u16 i = 0; i < ARRLEN(table); i++) { - if (table[i].Char == Char) - return table[i]; + for (const auto &table_key : table) { + if (table_key.Char == Char) + return table_key; } std::ostringstream os; @@ -285,7 +285,9 @@ KeyPress::KeyPress(const char *name) Char = L'\0'; m_name = ""; return; - } else if (strlen(name) <= 4) { + } + + if (strlen(name) <= 4) { // Lookup by resulting character int chars_read = mbtowc(&Char, name, 1); FATAL_ERROR_IF(chars_read != 1, "Unexpected multibyte character"); @@ -339,7 +341,7 @@ const char *KeyPress::sym() const const char *KeyPress::name() const { - if (m_name == "") + if (m_name.empty()) return ""; const char *ret; if (valid_kcode(Key)) |