dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: Removed SmallVector completely

Browse Source
This commit is contained in:
Henry Wilson
2019-03-03 17:30:09 +00:00
committed by PeterN
parent 6570f7989f
commit c01a2e2a81
69 changed files with 109 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/hotkeys.cpp
View File

@@ -24,7 +24,7 @@ char *_hotkeys_file;
* List of all HotkeyLists.
* This is a pointer to ensure initialisation order with the various static HotkeyList instances.
*/
static SmallVector<HotkeyList*, 16> *_hotkey_lists = NULL;
static std::vector<HotkeyList*> *_hotkey_lists = NULL;
/** String representation of a keycode */
struct KeycodeNames {
@@ -254,7 +254,7 @@ void Hotkey::AddKeycode(uint16 keycode)
HotkeyList::HotkeyList(const char *ini_group, Hotkey *items, GlobalHotkeyHandlerFunc global_hotkey_handler) :
global_hotkey_handler(global_hotkey_handler), ini_group(ini_group), items(items)
{
if (_hotkey_lists == NULL) _hotkey_lists = new SmallVector<HotkeyList*, 16>();
if (_hotkey_lists == NULL) _hotkey_lists = new std::vector<HotkeyList*>();
_hotkey_lists->push_back(this);
}