From 604376fb171bb11687013d2fa9104eb37a5f2fbf Mon Sep 17 00:00:00 2001 From: ExMix Date: Thu, 21 Nov 2013 12:00:01 +0300 Subject: [PATCH] review fix --- drape_frontend/backend_renderer.cpp | 3 +- drape_frontend/drape_frontend.pro | 10 +--- drape_frontend/drop_coverage_message.hpp | 15 ----- drape_frontend/drop_tile_message.cpp | 15 ----- drape_frontend/drop_tile_message.hpp | 18 ------ drape_frontend/impl/backend_renderer_impl.cpp | 6 +- drape_frontend/message_subclasses.hpp | 59 +++++++++++++++++++ drape_frontend/resize_message.cpp | 21 ------- drape_frontend/resize_message.hpp | 20 ------- drape_frontend/task_finish_message.cpp | 15 ----- drape_frontend/task_finish_message.hpp | 19 ------ drape_frontend/threads_commutator.cpp | 3 +- drape_frontend/update_coverage_message.cpp | 15 ----- drape_frontend/update_coverage_message.hpp | 18 ------ 14 files changed, 63 insertions(+), 174 deletions(-) delete mode 100644 drape_frontend/drop_coverage_message.hpp delete mode 100644 drape_frontend/drop_tile_message.cpp delete mode 100644 drape_frontend/drop_tile_message.hpp create mode 100644 drape_frontend/message_subclasses.hpp delete mode 100644 drape_frontend/resize_message.cpp delete mode 100644 drape_frontend/resize_message.hpp delete mode 100644 drape_frontend/task_finish_message.cpp delete mode 100644 drape_frontend/task_finish_message.hpp delete mode 100644 drape_frontend/update_coverage_message.cpp delete mode 100644 drape_frontend/update_coverage_message.hpp diff --git a/drape_frontend/backend_renderer.cpp b/drape_frontend/backend_renderer.cpp index a1ff6ca46f..d260fd9b81 100644 --- a/drape_frontend/backend_renderer.cpp +++ b/drape_frontend/backend_renderer.cpp @@ -1,8 +1,7 @@ #include "backend_renderer.hpp" #include "threads_commutator.hpp" -#include "update_coverage_message.hpp" -#include "resize_message.hpp" +#include "message_subclasses.hpp" #include "impl/backend_renderer_impl.hpp" #include "../std/bind.hpp" diff --git a/drape_frontend/drape_frontend.pro b/drape_frontend/drape_frontend.pro index 3381e033c5..8e5466baed 100644 --- a/drape_frontend/drape_frontend.pro +++ b/drape_frontend/drape_frontend.pro @@ -14,11 +14,7 @@ SOURCES += \ message.cpp \ threads_commutator.cpp \ message_acceptor.cpp \ - drop_tile_message.cpp \ impl/backend_renderer_impl.cpp \ - update_coverage_message.cpp \ - resize_message.cpp \ - task_finish_message.cpp \ read_mwm_task.cpp HEADERS += \ @@ -31,10 +27,6 @@ HEADERS += \ message.hpp \ threads_commutator.hpp \ message_acceptor.hpp \ - drop_tile_message.hpp \ impl/backend_renderer_impl.hpp \ - update_coverage_message.hpp \ - resize_message.hpp \ - task_finish_message.hpp \ read_mwm_task.hpp \ - drop_coverage_message.hpp + message_subclasses.hpp diff --git a/drape_frontend/drop_coverage_message.hpp b/drape_frontend/drop_coverage_message.hpp deleted file mode 100644 index e732a80cb8..0000000000 --- a/drape_frontend/drop_coverage_message.hpp +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "message.hpp" - -namespace df -{ - class DropCoverageMessage : public Message - { - public: - DropCoverageMessage() - { - SetType(DropCoverage); - } - }; -} diff --git a/drape_frontend/drop_tile_message.cpp b/drape_frontend/drop_tile_message.cpp deleted file mode 100644 index 0171230ab4..0000000000 --- a/drape_frontend/drop_tile_message.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include "drop_tile_message.hpp" - -namespace df -{ - DropTileMessage::DropTileMessage(const TileKey & tileKey) - : m_tileKey(tileKey) - { - SetType(DropTile); - } - - const TileKey & DropTileMessage::GetKey() const - { - return m_tileKey; - } -} diff --git a/drape_frontend/drop_tile_message.hpp b/drape_frontend/drop_tile_message.hpp deleted file mode 100644 index 42e1e70230..0000000000 --- a/drape_frontend/drop_tile_message.hpp +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "message.hpp" -#include "tile_info.hpp" - -namespace df -{ - class DropTileMessage : public Message - { - public: - DropTileMessage(const TileKey & tileKey); - - const TileKey & GetKey() const; - - private: - TileKey m_tileKey; - }; -} diff --git a/drape_frontend/impl/backend_renderer_impl.cpp b/drape_frontend/impl/backend_renderer_impl.cpp index 1ef5f0c2e5..825af435a7 100644 --- a/drape_frontend/impl/backend_renderer_impl.cpp +++ b/drape_frontend/impl/backend_renderer_impl.cpp @@ -7,11 +7,7 @@ #include "read_mwm_task.hpp" #include "message.hpp" -#include "update_coverage_message.hpp" -#include "resize_message.hpp" -#include "task_finish_message.hpp" -#include "drop_tile_message.hpp" -#include "drop_coverage_message.hpp" +#include "message_subclasses.hpp" #include "../geometry/screenbase.hpp" diff --git a/drape_frontend/message_subclasses.hpp b/drape_frontend/message_subclasses.hpp new file mode 100644 index 0000000000..9d4580eb22 --- /dev/null +++ b/drape_frontend/message_subclasses.hpp @@ -0,0 +1,59 @@ +#pragma once + +#include "message.hpp" +#include "tile_info.hpp" + +#include "../geometry/rect2d.hpp" +#include "../geometry/screenbase.hpp" + +namespace threads { class IRoutine; } + +namespace df +{ + class DropCoverageMessage : public Message + { + public: + DropCoverageMessage() { SetType(DropCoverage); } + }; + + class DropTileMessage : public Message + { + public: + DropTileMessage(const TileKey & tileKey) : m_tileKey(tileKey) {} + const TileKey & GetKey() const { return m_tileKey; } + + private: + TileKey m_tileKey; + }; + + class ResizeMessage : public Message + { + public: + ResizeMessage(int x, int y, int w, int h) : m_rect(x, y, x + w, y + h) {} + ResizeMessage(m2::RectI const & rect) : m_rect(rect) {} + const m2::RectI & GetRect() const { return m_rect; } + + private: + m2::RectI m_rect; + }; + + class TaskFinishMessage : public Message + { + public: + TaskFinishMessage(threads::IRoutine * routine) : m_routine(routine) {} + threads::IRoutine * GetRoutine() const { return m_routine; } + + private: + threads::IRoutine * m_routine; + }; + + class UpdateCoverageMessage : public Message + { + public: + UpdateCoverageMessage(ScreenBase const & screen) : m_screen(screen) {} + const ScreenBase & GetScreen() const { return m_screen; } + + private: + ScreenBase m_screen; + }; +} diff --git a/drape_frontend/resize_message.cpp b/drape_frontend/resize_message.cpp deleted file mode 100644 index 25b9d4fd60..0000000000 --- a/drape_frontend/resize_message.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "resize_message.hpp" - -namespace df -{ - ResizeMessage::ResizeMessage(int x, int y, int w, int h) - : m_rect(x, y, x + w, y + h) - { - SetType(Resize); - } - - ResizeMessage::ResizeMessage(m2::RectI const & rect) - : m_rect(rect) - { - SetType(Resize); - } - - const m2::RectI & ResizeMessage::GetRect() const - { - return m_rect; - } -} diff --git a/drape_frontend/resize_message.hpp b/drape_frontend/resize_message.hpp deleted file mode 100644 index a3cfa18c20..0000000000 --- a/drape_frontend/resize_message.hpp +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "message.hpp" - -#include "../geometry/rect2d.hpp" - -namespace df -{ - class ResizeMessage : public Message - { - public: - ResizeMessage(int x, int y, int w, int h); - ResizeMessage(m2::RectI const & rect); - - const m2::RectI & GetRect() const; - - private: - m2::RectI m_rect; - }; -} diff --git a/drape_frontend/task_finish_message.cpp b/drape_frontend/task_finish_message.cpp deleted file mode 100644 index 68da076e21..0000000000 --- a/drape_frontend/task_finish_message.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include "task_finish_message.hpp" - -namespace df -{ - TaskFinishMessage::TaskFinishMessage(threads::IRoutine * routine) - : m_routine(routine) - { - SetType(TaskFinish); - } - - threads::IRoutine * TaskFinishMessage::GetRoutine() const - { - return m_routine; - } -} diff --git a/drape_frontend/task_finish_message.hpp b/drape_frontend/task_finish_message.hpp deleted file mode 100644 index ef5ff3f97b..0000000000 --- a/drape_frontend/task_finish_message.hpp +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "message.hpp" - -namespace threads { class IRoutine; } - -namespace df -{ - class TaskFinishMessage : public Message - { - public: - TaskFinishMessage(threads::IRoutine * routine); - - threads::IRoutine * GetRoutine() const; - - private: - threads::IRoutine * m_routine; - }; -} diff --git a/drape_frontend/threads_commutator.cpp b/drape_frontend/threads_commutator.cpp index 8b352fc2e5..66e382666d 100644 --- a/drape_frontend/threads_commutator.cpp +++ b/drape_frontend/threads_commutator.cpp @@ -8,8 +8,7 @@ namespace df { void ThreadsCommutator::RegisterThread(ThreadName name, MessageAcceptor * acceptor) { - ASSERT(m_acceptors.find(name) == m_acceptors.end(), ()); - m_acceptors[name] = acceptor; + VERIFY(m_acceptors.insert(make_pair(name, acceptor)).second, ()); } void ThreadsCommutator::PostMessage(ThreadName name, Message * message) diff --git a/drape_frontend/update_coverage_message.cpp b/drape_frontend/update_coverage_message.cpp deleted file mode 100644 index 35ff4d1ad5..0000000000 --- a/drape_frontend/update_coverage_message.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include "update_coverage_message.hpp" - -namespace df -{ - UpdateCoverageMessage::UpdateCoverageMessage(ScreenBase const & screen) - : m_screen(screen) - { - SetType(UpdateCoverage); - } - - const ScreenBase & UpdateCoverageMessage::GetScreen() const - { - return m_screen; - } -} diff --git a/drape_frontend/update_coverage_message.hpp b/drape_frontend/update_coverage_message.hpp deleted file mode 100644 index d44a00d17f..0000000000 --- a/drape_frontend/update_coverage_message.hpp +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "message.hpp" -#include "../geometry/screenbase.hpp" - -namespace df -{ - class UpdateCoverageMessage : public Message - { - public: - UpdateCoverageMessage(ScreenBase const & screen); - - const ScreenBase & GetScreen() const; - - private: - ScreenBase m_screen; - }; -}