GUI2: removed CVideo argument from tdialog::post_build

Like with pre_show, any uses of this parameter could be replaced by twindow::video().
wesnoth · Mar 14, 2016 · 3f58231 · 3f58231
1 parent 11b941a
commit 3f58231
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/src/gui/dialogs/dialog.cpp b/src/gui/dialogs/dialog.cpp
@@ -41,7 +41,7 @@ bool tdialog::show(CVideo& video, const unsigned auto_close_time)
 	std::auto_ptr<twindow> window(build_window(video));
 	assert(window.get());
 
-	post_build(video, *window);
+	post_build(*window);
 
 	window->set_owner(this);
 
@@ -174,7 +174,7 @@ twindow* tdialog::build_window(CVideo& video) const
 	return build(video, window_id());
 }
 
-void tdialog::post_build(CVideo& /*video*/, twindow& /*window*/)
+void tdialog::post_build(twindow& /*window*/)
 {
 	/* DO NOTHING */
 }

diff --git a/src/gui/dialogs/dialog.hpp b/src/gui/dialogs/dialog.hpp
@@ -361,7 +361,7 @@ class tdialog
 	 *                            upon.
 	 * @param window              The window just created.
 	 */
-	virtual void post_build(CVideo& video, twindow& window);
+	virtual void post_build(twindow& window);
 
 	/**
 	 * Actions to be taken before showing the window.

diff --git a/src/gui/dialogs/lobby_main.cpp b/src/gui/dialogs/lobby_main.cpp
@@ -412,11 +412,11 @@ static bool fullscreen(CVideo& video)
 	return true;
 }
 
-void tlobby_main::post_build(CVideo& video, twindow& window)
+void tlobby_main::post_build(twindow& window)
 {
 	/** @todo Should become a global hotkey after 1.8, then remove it here. */
 	window.register_hotkey(hotkey::HOTKEY_FULLSCREEN,
-			boost::bind(fullscreen, boost::ref(video)));
+			boost::bind(fullscreen, boost::ref(window.video())));
 
 	/*** Local hotkeys. ***/
 	preferences_wrapper_

diff --git a/src/gui/dialogs/lobby_main.hpp b/src/gui/dialogs/lobby_main.hpp
@@ -355,7 +355,7 @@ class tlobby_main : public tdialog, private events::chat_handler
 	virtual const std::string& window_id() const;
 
 	/** Inherited from tdialog. */
-	virtual void post_build(CVideo& video, twindow& window);
+	virtual void post_build(twindow& window);
 
 	/** Inherited from tdialog. */
 	void pre_show(twindow& window);

diff --git a/src/gui/dialogs/popup.cpp b/src/gui/dialogs/popup.cpp
@@ -43,7 +43,7 @@ void tpopup::show(CVideo& video,
 
 	window_ = build_window(video);
 
-	post_build(video, *window_);
+	post_build(*window_);
 
 	pre_show(*window_);
 
@@ -68,7 +68,7 @@ twindow* tpopup::build_window(CVideo& video) const
 	return build(video, window_id());
 }
 
-void tpopup::post_build(CVideo& /*video*/, twindow& /*window*/)
+void tpopup::post_build(twindow& /*window*/)
 {
 	/* DO NOTHING */
 }

diff --git a/src/gui/dialogs/popup.hpp b/src/gui/dialogs/popup.hpp
@@ -106,7 +106,7 @@ class tpopup
 	 *                            upon.
 	 * @param window              The window just created.
 	 */
-	virtual void post_build(CVideo& video, twindow& window);
+	virtual void post_build(twindow& window);
 
 	/**
 	 * Actions to be taken before showing the window.

diff --git a/src/gui/dialogs/title_screen.cpp b/src/gui/dialogs/title_screen.cpp
@@ -155,15 +155,15 @@ static bool launch_lua_console(twindow & window)
 	return true;
 }
 
-void ttitle_screen::post_build(CVideo& video, twindow& window)
+void ttitle_screen::post_build(twindow& window)
 {
 	/** @todo Should become a title screen hotkey. */
 	window.register_hotkey(
 			hotkey::TITLE_SCREEN__RELOAD_WML,
 			boost::bind(&hotkey, boost::ref(window), RELOAD_GAME_DATA));
 
 	window.register_hotkey(hotkey::HOTKEY_FULLSCREEN,
-			boost::bind(fullscreen, boost::ref(video)));
+			boost::bind(fullscreen, boost::ref(window.video())));
 
 	window.register_hotkey(
 			hotkey::HOTKEY_LANGUAGE,

diff --git a/src/gui/dialogs/title_screen.hpp b/src/gui/dialogs/title_screen.hpp
@@ -86,7 +86,7 @@ class ttitle_screen : public tdialog
 	virtual const std::string& window_id() const;
 
 	/** Inherited from tdialog. */
-	virtual void post_build(CVideo& video, twindow& window);
+	virtual void post_build(twindow& window);
 
 	/** Inherited from tdialog. */
 	void pre_show(twindow& window);