Refactored out preferences display manager

wesnoth · Mar 20, 2016 · d2bec9e · d2bec9e
1 parent 15db95f
commit d2bec9e
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 50 deletions.
diff --git a/src/editor/controller/editor_controller.cpp b/src/editor/controller/editor_controller.cpp
@@ -72,7 +72,6 @@ editor_controller::editor_controller(const config &game_config, CVideo& video)
 	, tods_()
 	, context_manager_(new context_manager(*gui_.get(), game_config_))
 	, toolkit_(NULL)
-	, prefs_disp_manager_(NULL)
 	, tooltip_manager_(video)
 	, floating_label_manager_(NULL)
 	, help_manager_(NULL)
@@ -99,7 +98,6 @@ void editor_controller::init_gui()
 {
 	gui_->change_display_context(&context_manager_->get_map_context());
 	gui_->set_grid(preferences::grid());
-	prefs_disp_manager_.reset(new preferences::display_manager(&gui()));
 	gui_->add_redraw_observer(boost::bind(&editor_controller::display_redraw_callback, this, _1));
 	floating_label_manager_.reset(new font::floating_label_context());
 	gui().set_draw_coordinates(preferences::editor::draw_hex_coordinates());

diff --git a/src/editor/controller/editor_controller.hpp b/src/editor/controller/editor_controller.hpp
@@ -40,10 +40,6 @@ namespace font {
 struct floating_label_context;
 }
 
-namespace preferences {
-	struct display_manager;
-} // namespace preferences
-
 namespace editor {
 
 class editor_map;
@@ -235,7 +231,6 @@ class editor_controller : public controller_base,
 		boost::scoped_ptr<context_manager> context_manager_;
 	private:
 		boost::scoped_ptr<editor_toolkit> toolkit_;
-		boost::scoped_ptr<preferences::display_manager> prefs_disp_manager_;
 		tooltips::manager tooltip_manager_;
 		boost::scoped_ptr<font::floating_label_context> floating_label_manager_;
 

diff --git a/src/play_controller.cpp b/src/play_controller.cpp
@@ -157,7 +157,6 @@ play_controller::play_controller(const config& level, saved_game& state_of_game,
 	, gamestate_()
 	, level_()
 	, saved_game_(state_of_game)
-	, prefs_disp_manager_()
 	, tooltips_manager_()
 	, whiteboard_manager_()
 	, plugins_context_()
@@ -355,7 +354,6 @@ void play_controller::reset_gamestate(const config& level, int replay_pos)
 void play_controller::init_managers()
 {
 	LOG_NG << "initializing managers... " << (SDL_GetTicks() - ticks()) << std::endl;
-	prefs_disp_manager_.reset(new preferences::display_manager(gui_.get()));
 	tooltips_manager_.reset(new tooltips::manager(gui_->video()));
 	soundsources_manager_.reset(new soundsource::manager(*gui_));
 

diff --git a/src/play_controller.hpp b/src/play_controller.hpp
@@ -53,10 +53,6 @@ namespace game_events {
 	class wml_menu_item;
 } // namespace game_events
 
-namespace preferences {
-	struct display_manager;
-}
-
 namespace soundsource {
 	class manager;
 } // namespace soundsource
@@ -313,7 +309,6 @@ class play_controller : public controller_base, public events::observer, public
 	saved_game& saved_game_;
 
 	//managers
-	boost::scoped_ptr<preferences::display_manager> prefs_disp_manager_;
 	boost::scoped_ptr<tooltips::manager> tooltips_manager_;
 
 	//whiteboard manager

diff --git a/src/preferences_display.cpp b/src/preferences_display.cpp
@@ -41,26 +41,6 @@
 
 namespace preferences {
 
-static display* disp = NULL;
-
-display_manager::display_manager(display* d)
-{
-	disp = d;
-
-	load_hotkeys();
-
-	set_grid(grid());
-	set_turbo(turbo());
-	set_turbo_speed(turbo_speed());
-	set_scroll_to_action(scroll_to_action());
-	set_color_cursors(preferences::get("color_cursors", false));
-}
-
-display_manager::~display_manager()
-{
-	disp = NULL;
-}
-
 void show_preferences_dialog(CVideo& video, const config& game_cfg, const DIALOG_OPEN_TO initial_view)
 {
 	gui2::tpreferences dlg(video, game_cfg);
@@ -87,17 +67,17 @@ void set_turbo(bool ison)
 {
 	_set_turbo(ison);
 
-	if(disp != NULL) {
-		disp->set_turbo(ison);
+	if(display::get_singleton()) {
+		display::get_singleton()->set_turbo(ison);
 	}
 }
 
 void set_turbo_speed(double speed)
 {
 	save_turbo_speed(speed);
 
-	if(disp != NULL) {
-		disp->set_turbo_speed(speed);
+	if(display::get_singleton()) {
+		display::get_singleton()->set_turbo_speed(speed);
 	}
 }
 
@@ -110,8 +90,8 @@ void set_grid(bool ison)
 {
 	_set_grid(ison);
 
-	if(disp != NULL) {
-		disp->set_grid(ison);
+	if(display::get_singleton()) {
+		display::get_singleton()->set_grid(ison);
 	}
 }
 
@@ -124,15 +104,17 @@ void set_color_cursors(bool value)
 
 void set_idle_anim(bool ison) {
 	_set_idle_anim(ison);
-	if(disp != NULL) {
-		disp->set_idle_anim(ison);
+
+	if(display::get_singleton()) {
+		display::get_singleton()->set_idle_anim(ison);
 	}
 }
 
 void set_idle_anim_rate(int rate) {
 	_set_idle_anim_rate(rate);
-	if(disp != NULL) {
-		disp->set_idle_anim_rate(rate);
+
+	if(display::get_singleton()) {
+		display::get_singleton()->set_idle_anim_rate(rate);
 	}
 }
 

diff --git a/src/preferences_display.hpp b/src/preferences_display.hpp
@@ -27,12 +27,6 @@ namespace preferences {
 		VIEW_FRIENDS
 	};
 
-	struct display_manager
-	{
-		display_manager(display* disp);
-		~display_manager();
-	};
-
 	void set_scroll_to_action(bool ison);
 
 	void set_turbo(bool ison);