summaryrefslogtreecommitdiff
path: root/src/hotkeys.cpp
diff options
context:
space:
mode:
authorHenry Wilson <m3henry@googlemail.com>2019-02-17 11:20:52 +0000
committerPeterN <peter@fuzzle.org>2019-03-26 20:15:57 +0000
commitab711e6942757d775c08c31a6c32d488feba1dba (patch)
treed102dc6d0e6b9c33e7205b63e3360ebd720a3ebb /src/hotkeys.cpp
parent297fd3dda3abe353ebe2fe77c67b011e24d403bc (diff)
downloadopenttd-ab711e6942757d775c08c31a6c32d488feba1dba.tar.xz
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
Diffstat (limited to 'src/hotkeys.cpp')
-rw-r--r--src/hotkeys.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/hotkeys.cpp b/src/hotkeys.cpp
index 39cf4c0a1..0acc11c47 100644
--- a/src/hotkeys.cpp
+++ b/src/hotkeys.cpp
@@ -316,11 +316,11 @@ static void SaveLoadHotkeys(bool save)
IniFile *ini = new IniFile();
ini->LoadFromDisk(_hotkeys_file, NO_DIRECTORY);
- for (HotkeyList **list = _hotkey_lists->Begin(); list != _hotkey_lists->End(); ++list) {
+ for (HotkeyList *list : *_hotkey_lists) {
if (save) {
- (*list)->Save(ini);
+ list->Save(ini);
} else {
- (*list)->Load(ini);
+ list->Load(ini);
}
}
@@ -343,11 +343,11 @@ void SaveHotkeysToConfig()
void HandleGlobalHotkeys(WChar key, uint16 keycode)
{
- for (HotkeyList **list = _hotkey_lists->Begin(); list != _hotkey_lists->End(); ++list) {
- if ((*list)->global_hotkey_handler == NULL) continue;
+ for (HotkeyList *list : *_hotkey_lists) {
+ if (list->global_hotkey_handler == NULL) continue;
- int hotkey = (*list)->CheckMatch(keycode, true);
- if (hotkey >= 0 && ((*list)->global_hotkey_handler(hotkey) == ES_HANDLED)) return;
+ int hotkey = list->CheckMatch(keycode, true);
+ if (hotkey >= 0 && (list->global_hotkey_handler(hotkey) == ES_HANDLED)) return;
}
}