mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Codechange: replace std::vector + duplicate preventing include with std::set

This commit is contained in:
Rubidium 2023-05-18 11:02:36 +02:00 committed by rubidium42
parent 07860e67e2
commit 80d8c01814
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hotkeys.cpp
View File

@ -213,9 +213,9 @@ static std::string KeycodeToString(uint16 keycode)
std::string SaveKeycodes(const Hotkey *hotkey)
{
std::string str;
for (uint i = 0; i < hotkey->keycodes.size(); i++) {
if (i > 0) str += ",";
str += KeycodeToString(hotkey->keycodes[i]);
for (auto keycode : hotkey->keycodes) {
if (!str.empty()) str += ",";
str += KeycodeToString(keycode);
}
return str;
}
@ -257,7 +257,7 @@ Hotkey::Hotkey(const uint16 *default_keycodes, const char *name, int num) :
*/
void Hotkey::AddKeycode(uint16 keycode)
{
include(this->keycodes, keycode);
this->keycodes.insert(keycode);
}
HotkeyList::HotkeyList(const char *ini_group, Hotkey *items, GlobalHotkeyHandlerFunc global_hotkey_handler) :

3
src/hotkeys.h
View File

@ -10,7 +10,6 @@
#ifndef HOTKEYS_H
#define HOTKEYS_H
#include "core/smallvec_type.hpp"
#include "gfx_type.h"
#include "window_type.h"
#include "string_type.h"
@ -27,7 +26,7 @@ struct Hotkey {
const char *name;
int num;
std::vector<uint16> keycodes;
std::set<uint16> keycodes;
};
#define HOTKEY_LIST_END Hotkey((uint16)0, nullptr, -1)