diff OrthancServer/SQLiteDatabaseWrapper.h @ 3084:195ba4cbac3f db-changes

reorganization
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 04 Jan 2019 16:42:55 +0100
parents 683d572424b6
children 476cba12c2b0
line wrap: on
line diff
--- a/OrthancServer/SQLiteDatabaseWrapper.h	Fri Jan 04 15:52:19 2019 +0100
+++ b/OrthancServer/SQLiteDatabaseWrapper.h	Fri Jan 04 16:42:55 2019 +0100
@@ -36,7 +36,7 @@
 #include "IDatabaseWrapper.h"
 
 #include "../Core/SQLite/Connection.h"
-#include "Search/Compatibility/ICompatibilityCreateInstance.h"
+#include "Search/Compatibility/ICreateInstance.h"
 #include "Search/Compatibility/ISetResourcesContent.h"
 #include "ServerToolbox.h"
 
@@ -53,7 +53,8 @@
    * exclusion MUST be implemented at a higher level.
    **/
   class SQLiteDatabaseWrapper :
-    public Compatibility::ICompatibilityCreateInstance,
+    public IDatabaseWrapper,
+    public Compatibility::ICreateInstance,
     public Compatibility::ISetResourcesContent
   {
   private:
@@ -331,10 +332,15 @@
                                 const std::string& patient,
                                 const std::string& study,
                                 const std::string& series,
-                                const std::string& instance)
+                                const std::string& instance)  ORTHANC_OVERRIDE
     {
-      return ICompatibilityCreateInstance::Apply
-        (result, instanceId, *this, *this, patient, study, series, instance);
+      return ICreateInstance::Apply
+        (*this, *this, result, instanceId, patient, study, series, instance);
+    }
+
+    virtual void SetResourcesContent(const Orthanc::ResourcesContent& content)  ORTHANC_OVERRIDE
+    {
+      ISetResourcesContent::Apply(*this, content);
     }
   };
 }