From 5fcdb9d98358967fe1161ba99fa27972f9f818d8 Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Sat, 2 Jan 2021 22:02:21 +1100 Subject: [PATCH] Fake Display Manager: code formatting --- src/tests/utils/fake_display.cpp | 101 +++++++++++++++---------------- 1 file changed, 50 insertions(+), 51 deletions(-) diff --git a/src/tests/utils/fake_display.cpp b/src/tests/utils/fake_display.cpp index b758a878cdee..ab2b94d5881c 100644 --- a/src/tests/utils/fake_display.cpp +++ b/src/tests/utils/fake_display.cpp @@ -19,73 +19,72 @@ #include "game_board.hpp" #include "game_config_view.hpp" #include "game_display.hpp" -#include "terrain/type_data.hpp" #include "reports.hpp" +#include "terrain/type_data.hpp" -namespace wb { - class manager; +namespace wb +{ +class manager; } -namespace test_utils { - - class fake_display_manager { - static fake_display_manager* manager_; +namespace test_utils +{ +class fake_display_manager +{ + static fake_display_manager* manager_; - CVideo video_; - config dummy_cfg_; - config dummy_cfg2_; - game_board dummy_board_; - reports dummy_reports; - const events::event_context main_event_context_; + CVideo video_; + config dummy_cfg_; + config dummy_cfg2_; + game_board dummy_board_; + reports dummy_reports; + const events::event_context main_event_context_; + game_display disp_; - game_display disp_; +public: + static fake_display_manager* get_manager(); + game_display& get_display(); - public: - static fake_display_manager* get_manager(); - game_display& get_display(); + fake_display_manager(); + // ~fake_display_manager(); +}; - fake_display_manager(); -// ~fake_display_manager(); - }; +fake_display_manager* fake_display_manager::manager_ = 0; - fake_display_manager* fake_display_manager::manager_ = 0; - - fake_display_manager* fake_display_manager::get_manager() - { - if (!manager_) - { - manager_ = new fake_display_manager(); - } - return manager_; +fake_display_manager* fake_display_manager::get_manager() +{ + if(!manager_) { + manager_ = new fake_display_manager(); } - fake_display_manager::fake_display_manager() : - video_(CVideo::FAKE_TEST), - dummy_cfg_(), - dummy_cfg2_(), - dummy_board_(dummy_cfg2_), - main_event_context_(), - disp_(dummy_board_, std::shared_ptr (), dummy_reports, dummy_cfg_, dummy_cfg_) - { - } + return manager_; +} - game_display& fake_display_manager::get_display() - { - return disp_; - } +fake_display_manager::fake_display_manager() + : video_(CVideo::FAKE_TEST) + , dummy_cfg_() + , dummy_cfg2_() + , dummy_board_(dummy_cfg2_) + , main_event_context_() + , disp_(dummy_board_, std::shared_ptr(), dummy_reports, dummy_cfg_, dummy_cfg_) +{ +} - game_display& get_fake_display(const int width, const int height) - { - game_display& display = - fake_display_manager::get_manager()->get_display(); +game_display& fake_display_manager::get_display() +{ + return disp_; +} - if(width >= 0 && height >= 0) { - display.video().make_test_fake(width, height); - } +game_display& get_fake_display(const int width, const int height) +{ + game_display& display = fake_display_manager::get_manager()->get_display(); - return display; + if(width >= 0 && height >= 0) { + display.video().make_test_fake(width, height); } - + return display; } + +} // namespace test_utils