upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-28 18:49:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Preferences: made lobby_joins a scoped enum

Browse Source 
Also used it for relevant function return types/argument types instead of int
This commit is contained in:
Charles Dang 2021-11-14 22:03:03 -05:00
parent f40a39eae1
commit 049bfc113b
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/dialogs/preferences_dialog.cpp
View File

@ -498,11 +498,11 @@ void preferences_dialog::post_build(window& window)
whisper_friends_only, set_whisper_friends_only); whisper_friends_only, set_whisper_friends_only);
/* LOBBY JOIN NOTIFICATIONS */ /* LOBBY JOIN NOTIFICATIONS */
lobby_joins_group.add_member(find_widget<toggle_button>(&window, "lobby_joins_none", false, true), SHOW_NONE); lobby_joins_group.add_member(find_widget<toggle_button>(&window, "lobby_joins_none", false, true), lobby_joins::show_none);
lobby_joins_group.add_member(find_widget<toggle_button>(&window, "lobby_joins_friends", false, true), SHOW_FRIENDS); lobby_joins_group.add_member(find_widget<toggle_button>(&window, "lobby_joins_friends", false, true), lobby_joins::show_friends);
lobby_joins_group.add_member(find_widget<toggle_button>(&window, "lobby_joins_all", false, true), SHOW_ALL); lobby_joins_group.add_member(find_widget<toggle_button>(&window, "lobby_joins_all", false, true), lobby_joins::show_all);
lobby_joins_group.set_member_states(static_cast<LOBBY_JOINS>(lobby_joins())); lobby_joins_group.set_member_states(get_lobby_joins());
lobby_joins_group.set_callback_on_value_change([&](widget&) { lobby_joins_group.set_callback_on_value_change([&](widget&) {
_set_lobby_joins(lobby_joins_group.get_active_member_value()); _set_lobby_joins(lobby_joins_group.get_active_member_value());

2
src/gui/dialogs/preferences_dialog.hpp
View File

@ -114,7 +114,7 @@ private:
void default_hotkey_callback(); void default_hotkey_callback();
void hotkey_filter_callback() const; void hotkey_filter_callback() const;
group<preferences::LOBBY_JOINS> lobby_joins_group; group<preferences::lobby_joins> lobby_joins_group;
const preferences::advanced_pref_list& adv_preferences_; const preferences::advanced_pref_list& adv_preferences_;

24
src/preferences/game.cpp
View File

@ -330,39 +330,39 @@ bool parse_should_show_lobby_join(const std::string& sender, const std::string&
} }
} }
int lj = lobby_joins(); lobby_joins lj = get_lobby_joins();
if(lj == SHOW_NONE) { if(lj == lobby_joins::show_none) {
return false; return false;
} }
if(lj == SHOW_ALL) { if(lj == lobby_joins::show_all) {
return true; return true;
} }
return is_friend(message.substr(0, pos)); return is_friend(message.substr(0, pos));
} }
int lobby_joins() lobby_joins get_lobby_joins()
{ {
std::string pref = preferences::get("lobby_joins"); std::string pref = preferences::get("lobby_joins");
if(pref == "friends") { if(pref == "friends") {
return SHOW_FRIENDS; return lobby_joins::show_friends;
} else if(pref == "all") { } else if(pref == "all") {
return SHOW_ALL; return lobby_joins::show_all;
} else if(pref == "none") { } else if(pref == "none") {
return SHOW_NONE; return lobby_joins::show_none;
} else { } else {
return SHOW_FRIENDS; return lobby_joins::show_friends;
} }
} }
void _set_lobby_joins(int show) void _set_lobby_joins(lobby_joins show)
{ {
if(show == SHOW_FRIENDS) { if(show == lobby_joins::show_friends) {
preferences::set("lobby_joins", "friends"); preferences::set("lobby_joins", "friends");
} else if(show == SHOW_ALL) { } else if(show == lobby_joins::show_all) {
preferences::set("lobby_joins", "all"); preferences::set("lobby_joins", "all");
} else if(show == SHOW_NONE) { } else if(show == lobby_joins::show_none) {
preferences::set("lobby_joins", "none"); preferences::set("lobby_joins", "none");
} }
} }

8
src/preferences/game.hpp
View File

@ -75,11 +75,11 @@ private:
std::string notes_; std::string notes_;
}; };
bool parse_should_show_lobby_join(const std::string& sender, const std::string& message); enum class lobby_joins { show_none, show_friends, show_all };
int lobby_joins();
void _set_lobby_joins(int show);
enum LOBBY_JOINS { SHOW_NONE, SHOW_FRIENDS, SHOW_ALL }; bool parse_should_show_lobby_join(const std::string& sender, const std::string& message);
lobby_joins get_lobby_joins();
void _set_lobby_joins(lobby_joins show);
void load_game_prefs(); void load_game_prefs();
const std::map<std::string, acquaintance>& get_acquaintances(); const std::map<std::string, acquaintance>& get_acquaintances();