Removed wesnothd_connection::fetch_data_with_loading_screen

No need to keep a loading screen dependency in wesnothd_connection.

src/gui/dialogs/multiplayer/mp_join_game.cpp

@@ -93,8 +93,13 @@ bool mp_join_game::fetch_game_config()
 	bool has_scenario_and_controllers = false;
 	while(!has_scenario_and_controllers) {
 		config revc;
-		const bool data_res =
-			network_connection_.fetch_data_with_loading_screen(revc, loading_stage::download_level_data);
+		bool data_res = false;
+
+		gui2::dialogs::loading_screen::display([&]() {
+			gui2::dialogs::loading_screen::progress(loading_stage::download_level_data);
+
+			data_res = network_connection_.wait_and_receive_data(revc);
+		});
 
 		if(!data_res) {
 			return false;

src/playmp_controller.cpp

@@ -287,19 +287,18 @@ void playmp_controller::wait_for_upload()
 	network_reader_.set_source(playturn_network_adapter::get_source_from_config(cfg));
 	while(true) {
 		try {
-			const bool res =
-				mp_info_->connection.fetch_data_with_loading_screen(cfg, loading_stage::next_scenario);
+			bool res = false;
+			gui2::dialogs::loading_screen::display([&]() {
+				gui2::dialogs::loading_screen::progress(loading_stage::next_scenario);
 
-			if(res) {
-				if (turn_data_.process_network_data_from_reader() == turn_info::PROCESS_END_LINGER) {
-					break;
-				}
-			}
-			else
-			{
+				res = mp_info_->connection.wait_and_receive_data(cfg);
+			});
+
+			if(res && turn_data_.process_network_data_from_reader() == turn_info::PROCESS_END_LINGER) {
+				break;
+			} else {
 				throw_quit_game_exception();
 			}
-
 		} catch(const quit_game_exception&) {
 			network_reader_.set_source([this](config& cfg) { return receive_from_wesnothd(cfg);});
 			turn_data_.send_data();

src/wesnothd_connection.cpp

@@ -14,14 +14,11 @@
 
 #include "wesnothd_connection.hpp"
 
-#include "gui/dialogs/loading_screen.hpp"
 #include "gettext.hpp"
 #include "log.hpp"
 #include "serialization/parser.hpp"
 #include "utils/functional.hpp"
 
-#include <SDL2/SDL_timer.h>
-
 #include <cstdint>
 #include <deque>
 
@@ -44,7 +41,6 @@ struct mptest_log
 	}
 };
 }
-
 #define MPTEST_LOG mptest_log mptest_log__(__func__)
 #else
 #define MPTEST_LOG ((void)0)
@@ -434,17 +430,3 @@ bool wesnothd_connection::wait_and_receive_data(config& data)
 
 	return receive_data(data);
 };
-
-bool wesnothd_connection::fetch_data_with_loading_screen(config& cfg, loading_stage stage)
-{
-	assert(stage != loading_stage::none);
-
-	bool res = false;
-	gui2::dialogs::loading_screen::display([&]() {
-		gui2::dialogs::loading_screen::progress(stage);
-
-		res = wait_and_receive_data(cfg);
-	});
-
-	return res;
-}

src/wesnothd_connection.hpp

@@ -44,7 +44,6 @@
 #include <queue>
 
 class config;
-enum class loading_stage;
 
 union data_union {
 	char binary[4];
@@ -71,8 +70,6 @@ class wesnothd_connection
 	 */
 	wesnothd_connection(const std::string& host, const std::string& service);
 
-	bool fetch_data_with_loading_screen(config& cfg, loading_stage stage);
-
 	void send_data(const configr_of& request);
 
 	bool receive_data(config& result);