diff Plugins/Samples/Common/SimplifiedOrthancDataset.cpp @ 2237:403d92d8df83

cont
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 16 Dec 2016 14:45:40 +0100
parents 71b8bec8ca91
children a3a65de1840f
line wrap: on
line diff
--- a/Plugins/Samples/Common/SimplifiedOrthancDataset.cpp	Fri Dec 16 14:36:27 2016 +0100
+++ b/Plugins/Samples/Common/SimplifiedOrthancDataset.cpp	Fri Dec 16 14:45:40 2016 +0100
@@ -32,7 +32,7 @@
 
 #include "SimplifiedOrthancDataset.h"
 
-#include "OrthancPluginCppWrapper.h"
+#include "OrthancPluginException.h"
 
 namespace OrthancPlugins
 {
@@ -45,7 +45,7 @@
       const char* name = path.GetPrefixTag(depth).GetName();
       if (content->type() != Json::objectValue)
       {
-        ORTHANC_PLUGINS_THROW_EXCEPTION(OrthancPluginErrorCode_BadFileFormat);
+        ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
       }
 
       if (!content->isMember(name))
@@ -56,7 +56,7 @@
       const Json::Value& sequence = (*content) [name];
       if (sequence.type() != Json::arrayValue)
       {
-        ORTHANC_PLUGINS_THROW_EXCEPTION(OrthancPluginErrorCode_BadFileFormat);
+        ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
       }
 
       size_t index = path.GetPrefixIndex(depth);
@@ -74,7 +74,7 @@
 
     if (content->type() != Json::objectValue)
     {
-      ORTHANC_PLUGINS_THROW_EXCEPTION(OrthancPluginErrorCode_BadFileFormat);
+      ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
     }
     if (!content->isMember(name))
     {
@@ -91,7 +91,7 @@
   {
     if (root_.type() != Json::objectValue)
     {
-      ORTHANC_PLUGINS_THROW_EXCEPTION(OrthancPluginErrorCode_BadFileFormat);
+      ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
     }
   }
 
@@ -122,7 +122,7 @@
     }
     else if (value->type() != Json::stringValue)
     {
-      ORTHANC_PLUGINS_THROW_EXCEPTION(OrthancPluginErrorCode_BadFileFormat);
+      ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
     }
     else
     {
@@ -145,7 +145,7 @@
     else if (sequence->type() != Json::arrayValue)
     {
       // Not a sequence
-      ORTHANC_PLUGINS_THROW_EXCEPTION(OrthancPluginErrorCode_BadFileFormat);
+      ORTHANC_PLUGINS_THROW_EXCEPTION(BadFileFormat);
     }
     else
     {