Mercurial > hg > orthanc-stone
diff Framework/Messages/ICallable.h @ 643:f0008c55e5f7
getting rid of MessageType enumeration
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 10 May 2019 17:34:48 +0200 |
parents | b70fcc134ba4 |
children | 38409549db43 |
line wrap: on
line diff
--- a/Framework/Messages/ICallable.h Fri May 10 14:54:03 2019 +0200 +++ b/Framework/Messages/ICallable.h Fri May 10 17:34:48 2019 +0200 @@ -41,7 +41,8 @@ virtual void Apply(const IMessage& message) = 0; - virtual MessageType GetMessageType() const = 0; + virtual const MessageIdentifier& GetMessageIdentifier() = 0; + virtual IObserver* GetObserver() const = 0; }; @@ -58,8 +59,8 @@ private: typedef void (TObserver::* MemberFunction) (const TMessage&); - TObserver& observer_; - MemberFunction function_; + TObserver& observer_; + MemberFunction function_; public: Callable(TObserver& observer, @@ -79,9 +80,9 @@ ApplyInternal(dynamic_cast<const TMessage&>(message)); } - virtual MessageType GetMessageType() const + virtual const MessageIdentifier& GetMessageIdentifier() { - return static_cast<MessageType>(TMessage::Type); + return TMessage::GetStaticIdentifier(); } virtual IObserver* GetObserver() const @@ -115,11 +116,6 @@ lambda_(dynamic_cast<const TMessage&>(message)); } - virtual MessageType GetMessageType() const - { - return static_cast<MessageType>(TMessage::Type); - } - virtual IObserver* GetObserver() const { return &observer_;