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

Remove comments so doxygen will use the parent class's comment.

Browse source
This commit is contained in:
Pentarctagon 2021-04-04 02:36:39 -05:00
parent 6579f073c1
commit 139370b0a8
No known key found for this signature in database
GPG key ID: 9456BC54A21DBFA0
83 changed files with 1 additions and 198 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gui/dialogs/addon/addon_auth.hpp
View file

@ -35,13 +35,10 @@ public:
DEFINE_SIMPLE_EXECUTE_WRAPPER(addon_auth)
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
config& cfg_;

3
src/gui/dialogs/addon/connect.hpp
View file

@ -51,13 +51,10 @@ private:
void help_button_callback();
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
};

2
src/gui/dialogs/addon/install_dependencies.hpp
View file

@ -31,10 +31,8 @@ public:
DEFINE_SIMPLE_EXECUTE_WRAPPER(install_dependencies)
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
addons_list addons_;

1
src/gui/dialogs/addon/license_prompt.hpp
View file

@ -32,7 +32,6 @@ public:
DEFINE_SIMPLE_EXECUTE_WRAPPER(addon_license_prompt)
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
};

2
src/gui/dialogs/addon/manager.hpp
View file

@ -83,10 +83,8 @@ private:
void on_addon_select();
void toggle_details(button& btn, stacked_widget& stk);
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
void fetch_addons_list();

3
src/gui/dialogs/addon/uninstall_list.hpp
View file

@ -54,13 +54,10 @@ private:
std::vector<std::string> ids_;
std::map<std::string, bool> selections_;
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
};

2
src/gui/dialogs/attack_predictions.hpp
View file

@ -39,10 +39,8 @@ public:
DEFINE_SIMPLE_DISPLAY_WRAPPER(attack_predictions)
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
struct combatant_data

3
src/gui/dialogs/campaign_difficulty.hpp
View file

@ -63,13 +63,10 @@ private:
std::string campaign_id_;
std::string selected_difficulty_;
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
};
} // namespace dialogs

3
src/gui/dialogs/campaign_selection.hpp
View file

@ -93,13 +93,10 @@ private:
/** Called when the difficulty selection changes. */
void difficulty_selected();
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
void sort_campaigns(CAMPAIGN_ORDER order, bool ascending);

2
src/gui/dialogs/chat_log.hpp
View file

@ -32,13 +32,11 @@ public:
DEFINE_SIMPLE_DISPLAY_WRAPPER(chat_log)
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
std::shared_ptr<view> get_view() const;
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
std::shared_ptr<view> view_;

3
src/gui/dialogs/core_selection.hpp
View file

@ -53,13 +53,10 @@ private:
/** Called when another core is selected. */
void core_selected() const;
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
/** Contains the config objects for all cores. */

3
src/gui/dialogs/debug_clock.hpp
View file

@ -137,13 +137,10 @@ private:
*/
time time_;
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(CVideo& video);
/**

1
src/gui/dialogs/depcheck_confirm_change.hpp
View file

@ -51,7 +51,6 @@ public:
DEFINE_SIMPLE_EXECUTE_WRAPPER(depcheck_confirm_change)
protected:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
};

3
src/gui/dialogs/depcheck_select_new.hpp
View file

@ -57,13 +57,10 @@ public:
}
protected:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog */
virtual void post_show(window& window) override;
private:

3
src/gui/dialogs/drop_down_menu.hpp
View file

@ -102,13 +102,10 @@ private:
* */
bool mouse_down_happened_;
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
void mouse_up_callback(bool&, bool&, const point& coordinate);

1
src/gui/dialogs/edit_label.hpp
View file

@ -52,7 +52,6 @@ public:
DEFINE_SIMPLE_EXECUTE_WRAPPER(edit_label)
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
};
} // namespace dialogs

1
src/gui/dialogs/edit_text.hpp
View file

@ -61,7 +61,6 @@ public:
DEFINE_SIMPLE_EXECUTE_WRAPPER(edit_text)
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
virtual void pre_show(window& window) override;

3
src/gui/dialogs/editor/custom_tod.hpp
View file

@ -56,13 +56,10 @@ public:
using tod_attribute_getter = std::function<string_pair(const time_of_day&)>;
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
/** Callback for the next tod button */

2
src/gui/dialogs/editor/edit_label.hpp
View file

@ -62,9 +62,7 @@ private:
int load_color_component(uint8_t color_t::* component);
void save_color_component(uint8_t color_t::* component, const int value);
void register_color_component(std::string widget_id, uint8_t color_t::* component);
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
};
} // namespace dialogs

3
src/gui/dialogs/editor/edit_scenario.hpp
View file

@ -44,9 +44,8 @@ public:
DEFINE_SIMPLE_EXECUTE_WRAPPER(editor_edit_scenario)
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
};
} // namespace dialogs

1
src/gui/dialogs/editor/edit_side.hpp
View file

@ -53,7 +53,6 @@ private:
team::SHARE_VISION& share_vision_;
group<team::SHARE_VISION> vision_group;
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
};
} // namespace dialogs

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

@ -55,10 +55,8 @@ public:
std::optional<uint32_t> get_seed();
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Callback for generator list selection changes. */

1
src/gui/dialogs/editor/generator_settings.hpp
View file

@ -37,7 +37,6 @@ private:
void adjust_minimum_size_by_players();
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** We need to own these fields to access the underlying widget */

1
src/gui/dialogs/editor/new_map.hpp
View file

@ -53,7 +53,6 @@ public:
DEFINE_SIMPLE_EXECUTE_WRAPPER(editor_new_map)
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
};

2
src/gui/dialogs/editor/resize_map.hpp
View file

@ -124,10 +124,8 @@ private:
void set_direction_icon(int index, std::string icon);
/** Inherited from modal_dialog */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
};

2
src/gui/dialogs/end_credits.hpp
View file

@ -36,10 +36,8 @@ public:
DEFINE_SIMPLE_DISPLAY_WRAPPER(end_credits)
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
void timer_callback();

2
src/gui/dialogs/file_dialog.hpp
View file

@ -204,10 +204,8 @@ private:
int current_bookmark_;
int user_bookmarks_begin_;
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Handles dialog exit events and decides whether to proceed or not. */

2
src/gui/dialogs/folder_create.hpp
View file

@ -57,10 +57,8 @@ private:
return *this;
}
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
};

2
src/gui/dialogs/formula_debugger.hpp
View file

@ -48,10 +48,8 @@ public:
DEFINE_SIMPLE_DISPLAY_WRAPPER(formula_debugger)
private:
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/***** ***** button callbacks ***** *****/

3
src/gui/dialogs/game_cache_options.hpp
View file

@ -69,13 +69,10 @@ private:
void update_cache_size_display();
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
};

1
src/gui/dialogs/game_delete.hpp
View file

@ -36,7 +36,6 @@ public:
DEFINE_SIMPLE_EXECUTE_WRAPPER(game_delete)
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
};
} // namespace dialogs

2
src/gui/dialogs/game_load.hpp
View file

@ -53,10 +53,8 @@ public:
static bool execute(const game_config_view& cache_config, savegame::load_game_metadata& data);
private:
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
void set_save_dir_list(menu_button& dir_list);

3
src/gui/dialogs/game_save.hpp
View file

@ -36,7 +36,6 @@ public:
DEFINE_SIMPLE_EXECUTE_WRAPPER(game_save)
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
};
@ -50,7 +49,6 @@ public:
DEFINE_SIMPLE_EXECUTE_WRAPPER(game_save_message)
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
};
@ -65,7 +63,6 @@ public:
DEFINE_SIMPLE_EXECUTE_WRAPPER(game_save_oos)
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
};
} // namespace dialogs

3
src/gui/dialogs/game_stats.hpp
View file

@ -59,13 +59,10 @@ private:
void on_tab_select();
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
};

2
src/gui/dialogs/game_version_dialog.hpp
View file

@ -77,10 +77,8 @@ private:
void generate_plain_text_report();
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
//

2
src/gui/dialogs/gamestate_inspector.hpp
View file

@ -45,10 +45,8 @@ public:
DEFINE_SIMPLE_DISPLAY_WRAPPER(gamestate_inspector);
private:
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
std::shared_ptr<view> view_;

2
src/gui/dialogs/help_browser.hpp
View file

@ -33,10 +33,8 @@ private:
const config& help_cfg_;
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
void on_topic_select();

2
src/gui/dialogs/hotkey_bind.hpp
View file

@ -40,10 +40,8 @@ private:
void sdl_event_callback(const SDL_Event& event);
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
};

3
src/gui/dialogs/label_settings.hpp
View file

@ -36,13 +36,10 @@ private:
display_context& viewer_;
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
/** Callback for toggling a checkbox state. */

3
src/gui/dialogs/language_selection.hpp
View file

@ -40,13 +40,10 @@ public:
DEFINE_SIMPLE_EXECUTE_WRAPPER(language_selection)
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
};

3
src/gui/dialogs/loading_screen.hpp
View file

@ -84,13 +84,10 @@ public:
static void progress(loading_stage stage = loading_stage::none);
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
/** Inherited from events::pump_monitor. */

3
src/gui/dialogs/log_settings.hpp
View file

@ -43,13 +43,10 @@ private:
std::map<std::string, group<std::string>> groups_;
std::vector<std::string> domain_list_, widget_id_;
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
void filter_text_changed(const std::string& text);

2
src/gui/dialogs/lua_interpreter.hpp
View file

@ -31,7 +31,6 @@ public:
lua_interpreter(lua_kernel_base & lk);
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
enum WHICH_KERNEL { APP, GAME };
@ -40,7 +39,6 @@ public:
private:
const std::unique_ptr<controller> controller_;
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
};

3
src/gui/dialogs/message.hpp
View file

@ -110,10 +110,8 @@ public:
}
protected:
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
private:
@ -155,7 +153,6 @@ private:
/** Holds a pointer to the buttons. */
std::vector<button_status> buttons_;
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
};
} // namespace dialogs

1
src/gui/dialogs/modal_dialog.hpp
View file

@ -59,7 +59,6 @@ namespace gui2::dialogs
* Call this function to register a window. In the header of the class it adds
* the following code:
*@code
* // Inherited from modal_dialog, implemented by REGISTER_DIALOG.
* virtual const std::string& id() const;
*@endcode
* Then use this macro in the implementation, inside the gui2 namespace.

3
src/gui/dialogs/multiplayer/faction_select.hpp
View file

@ -42,13 +42,10 @@ private:
const int last_faction_, last_leader_, last_gender_;
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
/** Callbacks */

4
src/gui/dialogs/multiplayer/lobby.hpp
View file

@ -160,16 +160,12 @@ private:
static bool logout_prompt();
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void post_build(window& window) override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
const game_config_view& game_config_;

2
src/gui/dialogs/multiplayer/match_history.hpp
View file

@ -38,10 +38,8 @@ public:
DEFINE_SIMPLE_DISPLAY_WRAPPER(mp_match_history)
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
void request_history(int offset);

3
src/gui/dialogs/multiplayer/mp_alerts_options.hpp
View file

@ -44,13 +44,10 @@ public:
DEFINE_SIMPLE_DISPLAY_WRAPPER(mp_alerts_options)
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
};

3
src/gui/dialogs/multiplayer/mp_change_control.hpp
View file

@ -44,13 +44,10 @@ public:
DEFINE_SIMPLE_DISPLAY_WRAPPER(mp_change_control)
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
void handle_sides_list_item_clicked();

2
src/gui/dialogs/multiplayer/mp_connect.hpp
View file

@ -50,10 +50,8 @@ public:
DEFINE_SIMPLE_EXECUTE_WRAPPER(mp_connect)
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
// Signal handlers

3
src/gui/dialogs/multiplayer/mp_create_game.hpp
View file

@ -44,13 +44,10 @@ public:
DEFINE_SIMPLE_EXECUTE_WRAPPER(mp_create_game);
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
ng::create_engine create_engine_;

1
src/gui/dialogs/multiplayer/mp_host_game_prompt.hpp
View file

@ -37,7 +37,6 @@ public:
DEFINE_SIMPLE_EXECUTE_WRAPPER(mp_host_game_prompt)
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
};
} // namespace dialogs

3
src/gui/dialogs/multiplayer/mp_join_game.hpp
View file

@ -40,13 +40,10 @@ public:
bool fetch_game_config();
bool started() const { return level_["started"].to_bool(); }
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
/** @returns false if an error ocurred. */

1
src/gui/dialogs/multiplayer/mp_join_game_password_prompt.hpp
View file

@ -45,7 +45,6 @@ public:
DEFINE_SIMPLE_EXECUTE_WRAPPER(mp_join_game_password_prompt)
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
};

3
src/gui/dialogs/multiplayer/mp_login.hpp
View file

@ -42,13 +42,10 @@ public:
mp_login(const std::string& host, const std::string& label, const bool focus_password);
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
void load_password() const;

3
src/gui/dialogs/multiplayer/mp_method_selection.hpp
View file

@ -55,13 +55,10 @@ private:
/** The selected method to `connect' to the MP server. */
choice choice_;
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
};

3
src/gui/dialogs/multiplayer/mp_staging.hpp
View file

@ -45,13 +45,10 @@ public:
DEFINE_SIMPLE_EXECUTE_WRAPPER(mp_staging)
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
template<typename... T>

3
src/gui/dialogs/multiplayer/player_info.hpp
View file

@ -43,13 +43,10 @@ public:
}
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
void update_relation();

2
src/gui/dialogs/multiplayer/synced_choice_wait.hpp
View file

@ -35,10 +35,8 @@ private:
user_choice_manager& mgr_;
label* message_;
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
virtual void handle_generic_event(const std::string& event_name) override;

3
src/gui/dialogs/network_transmission.hpp
View file

@ -73,10 +73,8 @@ public:
const std::string& subtitle);
protected:
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
private:
@ -88,7 +86,6 @@ private:
*/
std::string subtitle_;
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
};

3
src/gui/dialogs/outro.hpp
View file

@ -38,13 +38,10 @@ public:
DEFINE_SIMPLE_DISPLAY_WRAPPER(outro)
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
void draw_callback();

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

@ -77,10 +77,8 @@ public:
typedef std::vector<const hotkey::hotkey_command*> visible_hotkeys_t;
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void post_build(window& window) override;
virtual void pre_show(window& window) override;
virtual void post_show(window& /*window*/) override;

2
src/gui/dialogs/screenshot_notification.hpp
View file

@ -58,10 +58,8 @@ private:
void save_screenshot();
void keypress_callback(bool& handled, const SDL_Keycode key);
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
};
} // namespace dialogs

3
src/gui/dialogs/select_orb_colors.hpp
View file

@ -51,13 +51,10 @@ private:
std::map<std::string, group<std::string>> groups_;
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
};

2
src/gui/dialogs/server_info_dialog.hpp
View file

@ -40,10 +40,8 @@ public:
}
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
void tab_switch_callback();

3
src/gui/dialogs/simple_item_selector.hpp
View file

@ -98,13 +98,10 @@ private:
std::string ok_label_, cancel_label_;
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
};
} // namespace dialogs

3
src/gui/dialogs/sp_options_configure.hpp
View file

@ -68,13 +68,10 @@ public:
}
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
ng::create_engine& create_engine_;

2
src/gui/dialogs/statistics_dialog.hpp
View file

@ -32,10 +32,8 @@ public:
DEFINE_SIMPLE_DISPLAY_WRAPPER(statistics_dialog)
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/**

2
src/gui/dialogs/story_viewer.hpp
View file

@ -42,10 +42,8 @@ public:
}
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
void clear_image_timer();

1
src/gui/dialogs/surrender_quit.hpp
View file

@ -33,7 +33,6 @@ public:
DEFINE_SIMPLE_EXECUTE_WRAPPER(surrender_quit)
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
};
} // namespace dialogs

2
src/gui/dialogs/terrain_layers.hpp
View file

@ -33,10 +33,8 @@ public:
DEFINE_SIMPLE_DISPLAY_WRAPPER(terrain_layers)
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
terrain_builder::tile* tile_;

3
src/gui/dialogs/theme_list.hpp
View file

@ -57,13 +57,10 @@ private:
std::vector<theme_info> themes_;
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
};
} // namespace dialogs

2
src/gui/dialogs/title_screen.hpp
View file

@ -87,10 +87,8 @@ public:
};
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/***** ***** ***** ***** Callbacks ***** ***** ****** *****/

2
src/gui/dialogs/transient_message.hpp
View file

@ -37,10 +37,8 @@ private:
bool hide_title_;
bool hide_image_;
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
};
} // namespace dialogs

3
src/gui/dialogs/unit_advance.hpp
View file

@ -30,10 +30,7 @@ public:
}
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
virtual void post_show(window& window) override;

3
src/gui/dialogs/unit_attack.hpp
View file

@ -53,13 +53,10 @@ public:
}
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
void damage_calc_callback();

3
src/gui/dialogs/unit_create.hpp
View file

@ -85,13 +85,10 @@ private:
std::vector<std::string> last_words_;
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
/** Callbacks */

3
src/gui/dialogs/unit_list.hpp
View file

@ -52,13 +52,10 @@ private:
/** Callbacks */
void list_item_clicked();
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
};

3
src/gui/dialogs/unit_recall.hpp
View file

@ -59,13 +59,10 @@ private:
void dismiss_unit();
void show_help();
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
};

2
src/gui/dialogs/unit_recruit.hpp
View file

@ -37,10 +37,8 @@ public:
}
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
virtual void post_show(window& window) override;

2
src/gui/dialogs/wml_error.hpp
View file

@ -69,10 +69,8 @@ private:
bool have_post_summary_;
std::string report_; // Plain text report for copying to clipboard.
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
void copy_report_callback();

6
src/gui/dialogs/wml_message.hpp
View file

@ -122,11 +122,9 @@ private:
int* chosen_option_;
protected:
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
private:
/** Inherited from modal_dialog. */
virtual void post_show(window& window) override;
};
@ -143,7 +141,6 @@ public:
}
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
};
@ -160,7 +157,6 @@ public:
}
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
};
@ -181,10 +177,8 @@ public:
}
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;
/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;
std::string second_portrait_;