cpp/openttd-patchpack/source Changeset - r27399:588375abeca3

Changeset - r27399:588375abeca3

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Rubidium - 13 months ago 2023-05-18 09:02:36
rubidium@openttd.org

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

2 files changed with 5 insertions and 6 deletions:

src/hotkeys.cpp

src/hotkeys.h

0 comments (0 inline, 0 general)

src/hotkeys.cpp

➞

Show inline comments

@@ @@ -213,9 +213,9 @@ static std::string KeycodeToString(uint1 @@
 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_key @@
  */
 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) :

src/hotkeys.h

➞

Show inline comments

@@ @@ -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)

0 comments (0 inline, 0 general)