diff Samples/Sdl/Loader.cpp @ 643:f0008c55e5f7

getting rid of MessageType enumeration
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 10 May 2019 17:34:48 +0200
parents 7ca8dc7ec17b
children b4fe9642e83b
line wrap: on
line diff
--- a/Samples/Sdl/Loader.cpp	Fri May 10 14:54:03 2019 +0200
+++ b/Samples/Sdl/Loader.cpp	Fri May 10 17:34:48 2019 +0200
@@ -139,9 +139,10 @@
 
 
 
-  class OracleCommandExceptionMessage :
-    public OrthancStone::BaseMessage<OrthancStone::MessageType_OracleCommandExceptionMessage>
+  class OracleCommandExceptionMessage : public OrthancStone::IMessage
   {
+    ORTHANC_STONE_MESSAGE(__FILE__, __LINE__);
+
   private:
     const IOracleCommand&       command_;
     Orthanc::OrthancException   exception_;
@@ -178,9 +179,10 @@
   class OrthancRestApiCommand : public OracleCommandWithPayload
   {
   public:
-    class SuccessMessage : public OrthancStone::OriginMessage<OrthancStone::MessageType_OrthancRestApiCommand,
-                                                              OrthancRestApiCommand>
+    class SuccessMessage : public OrthancStone::OriginMessage<OrthancRestApiCommand>
     {
+      ORTHANC_STONE_MESSAGE(__FILE__, __LINE__);
+      
     private:
       HttpHeaders   headers_;
       std::string   answer_;
@@ -316,9 +318,10 @@
   class GetOrthancImageCommand : public OracleCommandWithPayload
   {
   public:
-    class SuccessMessage : public OrthancStone::OriginMessage<OrthancStone::MessageType_GetOrthancImageCommand,
-                                                              GetOrthancImageCommand>
+    class SuccessMessage : public OrthancStone::OriginMessage<GetOrthancImageCommand>
     {
+      ORTHANC_STONE_MESSAGE(__FILE__, __LINE__);
+      
     private:
       std::auto_ptr<Orthanc::ImageAccessor>  image_;
       Orthanc::MimeType                      mime_;
@@ -461,9 +464,10 @@
   class GetOrthancWebViewerJpegCommand : public OracleCommandWithPayload
   {
   public:
-    class SuccessMessage : public OrthancStone::OriginMessage<OrthancStone::MessageType_GetOrthancWebViewerJpegCommand,
-                                                              GetOrthancWebViewerJpegCommand>
+    class SuccessMessage : public OrthancStone::OriginMessage<GetOrthancWebViewerJpegCommand>
     {
+      ORTHANC_STONE_MESSAGE(__FILE__, __LINE__);
+      
     private:
       std::auto_ptr<Orthanc::ImageAccessor>  image_;