diff --git a/projectfiles/CodeBlocks/wesnoth.cbp b/projectfiles/CodeBlocks/wesnoth.cbp index 5c0cea605f1..676b0365c6a 100644 --- a/projectfiles/CodeBlocks/wesnoth.cbp +++ b/projectfiles/CodeBlocks/wesnoth.cbp @@ -616,8 +616,6 @@ - - diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 99f99d8dbb8..a3fadc5359b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -798,7 +798,6 @@ set(wesnoth-main_SRC gui/dialogs/multiplayer/mp_cmd_wrapper.cpp gui/dialogs/multiplayer/mp_connect.cpp gui/dialogs/multiplayer/mp_create_game.cpp - gui/dialogs/multiplayer/mp_create_game_set_password.cpp gui/dialogs/multiplayer/mp_host_game_prompt.cpp gui/dialogs/multiplayer/mp_join_game.cpp gui/dialogs/multiplayer/mp_join_game_password_prompt.cpp diff --git a/src/SConscript b/src/SConscript index 2f323c30d7a..55386c3586a 100644 --- a/src/SConscript +++ b/src/SConscript @@ -396,7 +396,6 @@ wesnoth_sources = Split(""" gui/dialogs/multiplayer/mp_change_control.cpp gui/dialogs/multiplayer/mp_cmd_wrapper.cpp gui/dialogs/multiplayer/mp_connect.cpp - gui/dialogs/multiplayer/mp_create_game_set_password.cpp gui/dialogs/multiplayer/mp_create_game.cpp gui/dialogs/multiplayer/mp_host_game_prompt.cpp gui/dialogs/multiplayer/mp_join_game.cpp diff --git a/src/gui/dialogs/multiplayer/mp_create_game_set_password.cpp b/src/gui/dialogs/multiplayer/mp_create_game_set_password.cpp deleted file mode 100644 index c65253f64bd..00000000000 --- a/src/gui/dialogs/multiplayer/mp_create_game_set_password.cpp +++ /dev/null @@ -1,52 +0,0 @@ -/* - Copyright (C) 2010 - 2016 by Ignacio Riquelme Morelle - Part of the Battle for Wesnoth Project http://www.wesnoth.org/ - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY. - - See the COPYING file for more details. -*/ - -#define GETTEXT_DOMAIN "wesnoth-lib" - -#include "gui/dialogs/multiplayer/mp_create_game_set_password.hpp" - -//#include "gui/dialogs/field.hpp" -#include "gui/widgets/settings.hpp" - -namespace gui2 -{ -namespace dialogs -{ - -/*WIKI - * @page = GUIWindowDefinitionWML - * @order = 2_mp_create_game_set_password - * - * == Create Game: Set Password == - * - * Dialog for setting a join password for MP games. - * - * @begin{table}{dialog_widgets} - * - * password & & text_box & m & - * Input field for the game password. $ - * - * @end{table} - */ - -REGISTER_DIALOG(mp_create_game_set_password) - -mp_create_game_set_password::mp_create_game_set_password( - std::string& password) -{ - register_text("password", true, password, true); -} - -} // namespace dialogs -} // namespace gui2 diff --git a/src/gui/dialogs/multiplayer/mp_create_game_set_password.hpp b/src/gui/dialogs/multiplayer/mp_create_game_set_password.hpp deleted file mode 100644 index 25a5c0dc21a..00000000000 --- a/src/gui/dialogs/multiplayer/mp_create_game_set_password.hpp +++ /dev/null @@ -1,53 +0,0 @@ -/* - Copyright (C) 2010 - 2016 by Ignacio Riquelme Morelle - Part of the Battle for Wesnoth Project http://www.wesnoth.org/ - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY. - - See the COPYING file for more details. -*/ - -#ifndef GUI_DIALOGS_MP_CREATE_GAME_SET_PASSWORD_HPP_INCLUDED -#define GUI_DIALOGS_MP_CREATE_GAME_SET_PASSWORD_HPP_INCLUDED - -#include "gui/dialogs/dialog.hpp" - -namespace gui2 -{ -namespace dialogs -{ - -class mp_create_game_set_password : public modal_dialog -{ -public: - /** - * Constructor. - * - * @param [in, out] password The parameter's usage is: - * - Input: The initial value for the password. - * - Output: The password selected by the user - * if the dialog returns @ref window::OK - * undefined otherwise. - */ - explicit mp_create_game_set_password(std::string& password); - - /** The excute function see @ref modal_dialog for more information. */ - static bool execute(std::string& password, CVideo& video) - { - return mp_create_game_set_password(password).show(video); - } - -private: - /** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */ - virtual const std::string& window_id() const; -}; - -} // namespace dialogs -} // namespace gui2 - -#endif /* ! GUI_DIALOGS_MP_CREATE_GAME_SET_PASSWORD_HPP_INCLUDED */ diff --git a/src/tests/gui/test_gui2.cpp b/src/tests/gui/test_gui2.cpp index 71c8f9419d3..b7b0cf2d33c 100644 --- a/src/tests/gui/test_gui2.cpp +++ b/src/tests/gui/test_gui2.cpp @@ -75,7 +75,6 @@ #include "gui/dialogs/multiplayer/mp_cmd_wrapper.hpp" #include "gui/dialogs/multiplayer/mp_connect.hpp" #include "gui/dialogs/multiplayer/mp_create_game.hpp" -#include "gui/dialogs/multiplayer/mp_create_game_set_password.hpp" #include "gui/dialogs/multiplayer/mp_join_game.hpp" #include "gui/dialogs/multiplayer/mp_join_game_password_prompt.hpp" #include "gui/dialogs/multiplayer/mp_staging.hpp" @@ -429,7 +428,6 @@ BOOST_AUTO_TEST_CASE(test_gui2) test(); test(); //test(); - test(); //test(); test(); test(); @@ -883,16 +881,6 @@ struct dialog_tester } }; -template<> -struct dialog_tester -{ - std::string password; - mp_create_game_set_password* create() - { - return new mp_create_game_set_password(password); - } -}; - template<> struct dialog_tester {