diff options
author | Kozoriz <kozorizandriy@gmail.com> | 2016-04-26 12:41:54 +0300 |
---|---|---|
committer | Kozoriz <kozorizandriy@gmail.com> | 2016-04-26 15:50:21 +0300 |
commit | 4ecdb2a83871784f34430ed09d5ef6a2c0855506 (patch) | |
tree | dc36b449e5d32ac3e493e16865cf9d88d9991817 /src/components/hmi_message_handler/include/hmi_message_handler/hmi_message_handler_impl.h | |
parent | cf58bb97d09c536dce3b492d1517da0b837bc8eb (diff) | |
download | sdl_core-4ecdb2a83871784f34430ed09d5ef6a2c0855506.tar.gz |
Format all code in project
Formated all code in appMain, components, plugins to correct coding-style
Used clang-format-3.6
Used 2 commands :
find src/appMain/ -name "*.h" -o -name "*.cc" -o -name "*.hpp" -o -name "*.cpp" | xargs clang-format-3.6 -i -style=file
find src/components/ -name "*.h" -o -name "*.cc" -o -name "*.hpp" -o -name "*.cpp" | xargs clang-format-3.6 -i -style=file
find src/plugins/ -name "*.h" -o -name "*.cc" -o -name "*.hpp" -o -name "*.cpp" | xargs clang-format-3.6 -i -style=file
Diffstat (limited to 'src/components/hmi_message_handler/include/hmi_message_handler/hmi_message_handler_impl.h')
-rw-r--r-- | src/components/hmi_message_handler/include/hmi_message_handler/hmi_message_handler_impl.h | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/src/components/hmi_message_handler/include/hmi_message_handler/hmi_message_handler_impl.h b/src/components/hmi_message_handler/include/hmi_message_handler/hmi_message_handler_impl.h index 2f235aa968..3b829b0f27 100644 --- a/src/components/hmi_message_handler/include/hmi_message_handler/hmi_message_handler_impl.h +++ b/src/components/hmi_message_handler/include/hmi_message_handler/hmi_message_handler_impl.h @@ -45,7 +45,6 @@ namespace hmi_message_handler { - namespace impl { /* * These dummy classes are here to locally impose strong typing on different @@ -54,35 +53,38 @@ namespace impl { * TODO(ik): replace these with globally defined message types * when we have them. */ -struct MessageFromHmi: public MessageSharedPointer { +struct MessageFromHmi : public MessageSharedPointer { MessageFromHmi() {} explicit MessageFromHmi(const MessageSharedPointer& message) : MessageSharedPointer(message) {} // PrioritizedQueue requres this method to decide which priority to assign - size_t PriorityOrder() const { return (*this)->Priority().OrderingValue(); } + size_t PriorityOrder() const { + return (*this)->Priority().OrderingValue(); + } }; -struct MessageToHmi: public MessageSharedPointer { +struct MessageToHmi : public MessageSharedPointer { MessageToHmi() {} explicit MessageToHmi(const MessageSharedPointer& message) : MessageSharedPointer(message) {} // PrioritizedQueue requres this method to decide which priority to assign - size_t PriorityOrder() const { return (*this)->Priority().OrderingValue(); } + size_t PriorityOrder() const { + return (*this)->Priority().OrderingValue(); + } }; -typedef threads::MessageLoopThread< - utils::PrioritizedQueue<MessageFromHmi> > FromHmiQueue; -typedef threads::MessageLoopThread< - utils::PrioritizedQueue<MessageToHmi> > ToHmiQueue; +typedef threads::MessageLoopThread<utils::PrioritizedQueue<MessageFromHmi> > + FromHmiQueue; +typedef threads::MessageLoopThread<utils::PrioritizedQueue<MessageToHmi> > + ToHmiQueue; } class ToHMIThreadImpl; class FromHMIThreadImpl; -class HMIMessageHandlerImpl - : public HMIMessageHandler, - public impl::FromHmiQueue::Handler, - public impl::ToHmiQueue::Handler { +class HMIMessageHandlerImpl : public HMIMessageHandler, + public impl::FromHmiQueue::Handler, + public impl::ToHmiQueue::Handler { public: explicit HMIMessageHandlerImpl(const HMIMessageHandlerSettings& settings); @@ -98,13 +100,13 @@ class HMIMessageHandlerImpl #ifdef BUILD_TESTS std::set<HMIMessageAdapter*> message_adapters() const { - return message_adapters_; + return message_adapters_; } HMIMessageObserver* observer() const { - return observer_; + return observer_; } -#endif // BUILD_TESTS +#endif // BUILD_TESTS private: // threads::MessageLoopThread<*>::Handler implementations @@ -113,6 +115,7 @@ class HMIMessageHandlerImpl virtual void Handle(const impl::MessageFromHmi message) OVERRIDE; // CALLED ON messages_to_hmi_ THREAD! virtual void Handle(const impl::MessageToHmi message) OVERRIDE; + private: const HMIMessageHandlerSettings& settings_; HMIMessageObserver* observer_; |