From 457d42f200e0e9ded91ba9f0c53a17750dc5f8ce Mon Sep 17 00:00:00 2001
From: Charles Dang <exodia339@gmail.com>
Date: Fri, 10 Nov 2017 14:31:32 +1100
Subject: [PATCH] Removed unused sort_list and iconize_list MP preferences

These have no effect in the GUI2 lobby, nor do I intend to make use of them (plus the lobby has
its own sort controls anyway). I'm assuming they were for the GUI1 lobby.
---
 .../gui/window/preferences/05_multiplayer.cfg | 34 ++-----------------
 src/gui/dialogs/preferences_dialog.cpp        |  8 -----
 src/preferences/lobby.cpp                     | 20 -----------
 src/preferences/lobby.hpp                     |  6 ----
 4 files changed, 3 insertions(+), 65 deletions(-)

diff --git a/data/gui/window/preferences/05_multiplayer.cfg b/data/gui/window/preferences/05_multiplayer.cfg
index 75a46de0d2f..ef417866776 100644
--- a/data/gui/window/preferences/05_multiplayer.cfg
+++ b/data/gui/window/preferences/05_multiplayer.cfg
@@ -73,34 +73,6 @@
 
 	{_GUI_PREFERENCES_SPACER_ROW}
 
-	[row]
-		[column]
-			border = "all"
-			border_size = 5
-			horizontal_alignment = "left"
-
-			[toggle_button]
-				id = "lobby_sort_players"
-				label = _ "Sort lobby list"
-				tooltip= _ "Sort the player list in the lobby by player groups"
-			[/toggle_button]
-		[/column]
-	[/row]
-
-	[row]
-		[column]
-			border = "all"
-			border_size = 5
-			horizontal_alignment = "left"
-
-			[toggle_button]
-				id = "lobby_player_icons"
-				label = _ "Iconize lobby list"
-				tooltip= _ "Show icons in front of the player names in the lobby"
-			[/toggle_button]
-		[/column]
-	[/row]
-
 	[row]
 		[column]
 			border = "top,left,right"
@@ -327,7 +299,7 @@
 				{_GUI_PREFERENCES_SPACER_ROW}
 
 				[row]
-					
+
 					[column]
 						horizontal_grow = true
 						border = "left,right"
@@ -338,9 +310,9 @@
 							definition = "default_small"
 							label = _ "You have not befriended or ignored any other players."
 						[/label]
-					
+
 					[/column]
-				
+
 				[/row]
 
 				[row]
diff --git a/src/gui/dialogs/preferences_dialog.cpp b/src/gui/dialogs/preferences_dialog.cpp
index 19324dbea85..01e025a2225 100644
--- a/src/gui/dialogs/preferences_dialog.cpp
+++ b/src/gui/dialogs/preferences_dialog.cpp
@@ -489,14 +489,6 @@ void preferences_dialog::post_build(window& window)
 	register_bool("remember_password", true,
 		remember_password, set_remember_password);
 
-	/* SORT LOBBY LIST */
-	register_bool("lobby_sort_players", true,
-		sort_list, _set_sort_list);
-
-	/* ICONIZE LOBBY LIST */
-	register_bool("lobby_player_icons", true,
-		iconize_list, _set_iconize_list);
-
 	/* WHISPERS FROM FRIENDS ONLY */
 	register_bool("lobby_whisper_friends_only", true,
 		whisper_friends_only, set_whisper_friends_only);
diff --git a/src/preferences/lobby.cpp b/src/preferences/lobby.cpp
index e9381ab00d8..4113ec6ca5f 100644
--- a/src/preferences/lobby.cpp
+++ b/src/preferences/lobby.cpp
@@ -18,26 +18,6 @@
 
 namespace preferences {
 
-bool sort_list()
-{
-	return preferences::get("sort_list", true);
-}
-
-void _set_sort_list(bool sort)
-{
-	preferences::set("sort_list", sort);
-}
-
-bool iconize_list()
-{
-	return preferences::get("iconize_list", true);
-}
-
-void _set_iconize_list(bool sort)
-{
-	preferences::set("iconize_list", sort);
-}
-
 bool whisper_friends_only()
 {
 	return preferences::get("lobby_whisper_friends_only", false);
diff --git a/src/preferences/lobby.hpp b/src/preferences/lobby.hpp
index cb83d391fc5..49a4aa0435a 100644
--- a/src/preferences/lobby.hpp
+++ b/src/preferences/lobby.hpp
@@ -18,12 +18,6 @@
 
 namespace preferences {
 
-	bool sort_list();
-	void _set_sort_list(bool show);
-
-	bool iconize_list();
-	void _set_iconize_list(bool show);
-
 	bool whisper_friends_only();
 	void set_whisper_friends_only(bool v);