0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GUI2: removed now-unused dialog_callback helper

Browse source
This commit is contained in:
Charles Dang 2018-03-12 12:56:18 +11:00
parent eabd3743f8
commit e8da0d67cb
31 changed files with 2 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
projectfiles/VC12/wesnoth.vcxproj
View file

@ -3766,7 +3766,6 @@
<ClInclude Include="..\..\src\gui\dialogs\game_save.hpp" />
<ClInclude Include="..\..\src\gui\dialogs\game_stats.hpp" />
<ClInclude Include="..\..\src\gui\dialogs\game_version.hpp" />
<ClInclude Include="..\..\src\gui\dialogs\helper.hpp" />
<ClInclude Include="..\..\src\gui\dialogs\help_browser.hpp" />
<ClInclude Include="..\..\src\gui\dialogs\hotkey_bind.hpp" />
<ClInclude Include="..\..\src\gui\dialogs\label_settings.hpp" />

3
projectfiles/VC12/wesnoth.vcxproj.filters
View file

@ -2023,9 +2023,6 @@
<ClInclude Include="..\..\src\gui\dialogs\help_browser.hpp">
<Filter>Gui\Dialogs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\gui\dialogs\helper.hpp">
<Filter>Gui\Dialogs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\gui\dialogs\hotkey_bind.hpp">
<Filter>Gui\Dialogs</Filter>
</ClInclude>

1
src/gui/dialogs/addon/manager.cpp
View file

@ -27,7 +27,6 @@
#include "gettext.hpp"
#include "gui/auxiliary/filter.hpp"
#include "gui/auxiliary/find_widget.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/dialogs/message.hpp"
#include "gui/dialogs/transient_message.hpp"
#include "gui/widgets/button.hpp"

1
src/gui/dialogs/campaign_selection.cpp
View file

@ -17,7 +17,6 @@
#include "gui/dialogs/campaign_selection.hpp"
#include "gui/auxiliary/find_widget.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/widgets/button.hpp"
#include "gui/widgets/image.hpp"
#ifdef GUI2_EXPERIMENTAL_LISTBOX

1
src/gui/dialogs/chat_log.cpp
View file

@ -17,7 +17,6 @@
#include "gui/dialogs/chat_log.hpp"
#include "gui/auxiliary/find_widget.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/widgets/button.hpp"
#ifdef GUI2_EXPERIMENTAL_LISTBOX
#include "gui/widgets/list.hpp"

1
src/gui/dialogs/core_selection.cpp
View file

@ -17,7 +17,6 @@
#include "gui/dialogs/core_selection.hpp"
#include "gui/auxiliary/find_widget.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/widgets/image.hpp"
#ifdef GUI2_EXPERIMENTAL_LISTBOX
#include "gui/widgets/list.hpp"

1
src/gui/dialogs/editor/custom_tod.cpp
View file

@ -23,7 +23,6 @@
#include "gettext.hpp"
#include "gui/auxiliary/field.hpp"
#include "gui/dialogs/file_dialog.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/widgets/button.hpp"
#include "gui/widgets/image.hpp"
#include "gui/widgets/label.hpp"

2
src/gui/dialogs/editor/generate_map.cpp
View file

@ -16,7 +16,6 @@
#include "gui/dialogs/editor/generate_map.hpp"
#include "gui/auxiliary/find_widget.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/widgets/button.hpp"
#include "gui/widgets/label.hpp"
@ -27,6 +26,7 @@
#endif
#include "gui/widgets/settings.hpp"
#include "gui/widgets/text_box.hpp"
#include "gui/widgets/window.hpp"
#include "generators/map_generator.hpp"
#include "lexical_cast.hpp"

1
src/gui/dialogs/editor/resize_map.cpp
View file

@ -16,7 +16,6 @@
#include "gui/dialogs/editor/resize_map.hpp"
#include "gui/auxiliary/field.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/widgets/toggle_button.hpp"
#include "gui/widgets/settings.hpp"
#include "gui/widgets/slider.hpp"

1
src/gui/dialogs/file_dialog.cpp
View file

@ -22,7 +22,6 @@
#include "formula/string_utils.hpp"
#include "gui/auxiliary/find_widget.hpp"
#include "gui/dialogs/folder_create.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/dialogs/message.hpp"
#include "gui/dialogs/transient_message.hpp"
#include "gui/widgets/button.hpp"

1
src/gui/dialogs/formula_debugger.cpp
View file

@ -17,7 +17,6 @@
#include "gui/dialogs/formula_debugger.hpp"
#include "gui/auxiliary/find_widget.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/widgets/button.hpp"
#include "gui/widgets/scroll_label.hpp"
#include "gui/widgets/settings.hpp"

1
src/gui/dialogs/game_load.cpp
View file

@ -25,7 +25,6 @@
#include "gui/auxiliary/field.hpp"
#include "gui/core/log.hpp"
#include "gui/dialogs/game_delete.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/widgets/button.hpp"
#include "gui/widgets/image.hpp"
#include "gui/widgets/label.hpp"

1
src/gui/dialogs/game_stats.cpp
View file

@ -17,7 +17,6 @@
#include "gui/auxiliary/find_widget.hpp"
#include "gui/core/log.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/dialogs/message.hpp"
#ifdef GUI2_EXPERIMENTAL_LISTBOX
#include "gui/widgets/list.hpp"

1
src/gui/dialogs/game_version.cpp
View file

@ -24,7 +24,6 @@
#include "game_config.hpp"
#include "gettext.hpp"
#include "gui/auxiliary/find_widget.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/widgets/button.hpp"
#include "gui/widgets/styled_widget.hpp"
#ifdef GUI2_EXPERIMENTAL_LISTBOX

1
src/gui/dialogs/gamestate_inspector.cpp
View file

@ -18,7 +18,6 @@
#include "gui/auxiliary/find_widget.hpp"
#include "gui/auxiliary/iterator/walker.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/dialogs/lua_interpreter.hpp"
#include "gui/widgets/button.hpp"
#include "gui/widgets/label.hpp"

42
src/gui/dialogs/helper.hpp
View file

@ -1,42 +0,0 @@
/*
Copyright (C) 2008 - 2018 by Mark de Wever <koraq@xs4all.nl>
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.
*/
#pragma once
#include "gui/widgets/window.hpp"
#include "utils/functional.hpp"
namespace gui2
{
namespace dialogs
{
/**
* Template for dialog callbacks. Example usage:
* widget->set_callback(dialog_callback<my_dialog_class,
* &my_dialog_class::member_function>);
*/
template <class D, void (D::*fptr)(window&)>
void dialog_callback(widget& caller)
{
D* dialog = dynamic_cast<D*>(caller.dialog());
assert(dialog);
window* window = caller.get_window();
assert(window);
(dialog->*fptr)(*window);
}
} // namespace dialogs
} // namespace gui2

1
src/gui/dialogs/lua_interpreter.cpp
View file

@ -19,7 +19,6 @@
#include "gui/auxiliary/field.hpp"
#include "gui/auxiliary/find_widget.hpp"
#include "gui/core/window_builder.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/widgets/button.hpp"
#include "gui/widgets/label.hpp"
#include "gui/widgets/scroll_label.hpp"

1
src/gui/dialogs/multiplayer/faction_select.cpp
View file

@ -18,7 +18,6 @@
#include "gui/auxiliary/find_widget.hpp"
#include "gui/auxiliary/old_markup.hpp"
#include "gui/core/log.hpp"
#include "gui/dialogs/helper.hpp"
#ifdef GUI2_EXPERIMENTAL_LISTBOX
#include "gui/widgets/list.hpp"
#else

1
src/gui/dialogs/multiplayer/lobby.cpp
View file

@ -20,7 +20,6 @@
#include "gui/dialogs/multiplayer/mp_join_game_password_prompt.hpp"
#include "gui/dialogs/multiplayer/player_info.hpp"
#include "gui/dialogs/preferences_dialog.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/core/log.hpp"
#include "gui/core/timer.hpp"

1
src/gui/dialogs/multiplayer/mp_change_control.cpp
View file

@ -24,7 +24,6 @@
#include "game_display.hpp"
#include "preferences/credentials.hpp"
#include "gui/auxiliary/find_widget.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/widgets/label.hpp"
#ifdef GUI2_EXPERIMENTAL_LISTBOX
#include "gui/widgets/list.hpp"

1
src/gui/dialogs/multiplayer/mp_create_game.cpp
View file

@ -20,7 +20,6 @@
#include "game_initialization/lobby_data.hpp"
#include "gettext.hpp"
#include "gui/auxiliary/field.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/dialogs/message.hpp"
#include "gui/dialogs/simple_item_selector.hpp"
#include "gui/dialogs/transient_message.hpp"

1
src/gui/dialogs/multiplayer/mp_join_game.cpp
View file

@ -24,7 +24,6 @@
#include "preferences/credentials.hpp"
#include "gettext.hpp"
#include "gui/auxiliary/find_widget.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/dialogs/loading_screen.hpp"
#include "gui/dialogs/multiplayer/faction_select.hpp"
#include "gui/dialogs/transient_message.hpp"

1
src/gui/dialogs/multiplayer/mp_staging.cpp
View file

@ -20,7 +20,6 @@
#include "game_config.hpp"
#include "gettext.hpp"
#include "gui/auxiliary/find_widget.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/dialogs/multiplayer/faction_select.hpp"
#include "gui/widgets/button.hpp"
#include "gui/widgets/chatbox.hpp"

2
src/gui/dialogs/multiplayer/player_info.cpp
View file

@ -15,11 +15,11 @@
#include "gui/dialogs/multiplayer/player_info.hpp"
#include "gui/auxiliary/find_widget.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/widgets/button.hpp"
#include "gui/widgets/label.hpp"
#include "gui/widgets/settings.hpp"
#include "gui/widgets/text_box.hpp"
#include "gui/widgets/window.hpp"
#include "preferences/game.hpp"
#include "gettext.hpp"

1
src/gui/dialogs/preferences_dialog.cpp
View file

@ -41,7 +41,6 @@
#include "gui/dialogs/select_orb_colors.hpp"
#include "gui/auxiliary/find_widget.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/dialogs/message.hpp"
#include "gui/dialogs/transient_message.hpp"
#include "gui/widgets/button.hpp"

1
src/gui/dialogs/statistics_dialog.cpp
View file

@ -19,7 +19,6 @@
#include "formatter.hpp"
#include "gettext.hpp"
#include "gui/auxiliary/find_widget.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/widgets/label.hpp"
#ifdef GUI2_EXPERIMENTAL_LISTBOX
#include "gui/widgets/list.hpp"

1
src/gui/dialogs/unit_advance.cpp
View file

@ -16,7 +16,6 @@
#include "gui/dialogs/unit_advance.hpp"
#include "gui/auxiliary/find_widget.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/widgets/button.hpp"
#include "gui/widgets/image.hpp"
#include "gui/widgets/label.hpp"

1
src/gui/dialogs/unit_create.cpp
View file

@ -18,7 +18,6 @@
#include "gui/auxiliary/find_widget.hpp"
#include "gui/core/log.hpp"
#include "gui/dialogs/helper.hpp"
#ifdef GUI2_EXPERIMENTAL_LISTBOX
#include "gui/widgets/list.hpp"
#else

1
src/gui/dialogs/unit_list.cpp
View file

@ -17,7 +17,6 @@
#include "gui/auxiliary/find_widget.hpp"
#include "gui/core/log.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/dialogs/message.hpp"
#ifdef GUI2_EXPERIMENTAL_LISTBOX
#include "gui/widgets/list.hpp"

1
src/gui/dialogs/unit_recall.cpp
View file

@ -18,7 +18,6 @@
#include "font/text_formatting.hpp"
#include "gui/auxiliary/find_widget.hpp"
#include "gui/core/log.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/dialogs/message.hpp"
#ifdef GUI2_EXPERIMENTAL_LISTBOX
#include "gui/widgets/list.hpp"

1
src/gui/dialogs/unit_recruit.cpp
View file

@ -14,7 +14,6 @@
#define GETTEXT_DOMAIN "wesnoth-lib"
#include "gui/auxiliary/find_widget.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/dialogs/unit_recruit.hpp"
#include "gui/widgets/button.hpp"
#include "gui/widgets/image.hpp"