Mercurial > hg > orthanc

changeset 3763:5ff5d5a0fd28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
adding missing ORTHANC_OVERRIDE
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 16 Mar 2020 14:12:20 +0100
parents 1a346a4dc1b4
children c6658187e4b1
files OrthancServer/ServerJobs/ArchiveJob.h OrthancServer/ServerJobs/DicomModalityStoreJob.h OrthancServer/ServerJobs/DicomMoveScuJob.cpp OrthancServer/ServerJobs/StorageCommitmentScpJob.cpp Plugins/Engine/OrthancPlugins.h Plugins/Engine/PluginsJob.h
diffstat 6 files changed, 33 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancServer/ServerJobs/ArchiveJob.h	Mon Mar 16 12:33:28 2020 +0100
+++ b/OrthancServer/ServerJobs/ArchiveJob.h	Mon Mar 16 14:12:20 2020 +0100
@@ -95,7 +95,7 @@
 
     virtual JobStepResult Step(const std::string& jobId) ORTHANC_OVERRIDE;
 
-    virtual void Stop(JobStopReason reason)
+    virtual void Stop(JobStopReason reason) ORTHANC_OVERRIDE
     {
     }
 
--- a/OrthancServer/ServerJobs/DicomModalityStoreJob.h	Mon Mar 16 12:33:28 2020 +0100
+++ b/OrthancServer/ServerJobs/DicomModalityStoreJob.h	Mon Mar 16 14:12:20 2020 +0100
@@ -62,9 +62,9 @@
     void ResetStorageCommitment();
 
   protected:
-    virtual bool HandleInstance(const std::string& instance);
+    virtual bool HandleInstance(const std::string& instance) ORTHANC_OVERRIDE;
     
-    virtual bool HandleTrailingStep();
+    virtual bool HandleTrailingStep() ORTHANC_OVERRIDE;
 
   public:
     DicomModalityStoreJob(ServerContext& context);
@@ -100,14 +100,14 @@
 
     virtual void Stop(JobStopReason reason) ORTHANC_OVERRIDE;
 
-    virtual void GetJobType(std::string& target)
+    virtual void GetJobType(std::string& target) ORTHANC_OVERRIDE
     {
       target = "DicomModalityStore";
     }
 
-    virtual void GetPublicContent(Json::Value& value);
+    virtual void GetPublicContent(Json::Value& value) ORTHANC_OVERRIDE;
 
-    virtual bool Serialize(Json::Value& target);
+    virtual bool Serialize(Json::Value& target) ORTHANC_OVERRIDE;
 
     virtual void Reset() ORTHANC_OVERRIDE;
 
--- a/OrthancServer/ServerJobs/DicomMoveScuJob.cpp	Mon Mar 16 12:33:28 2020 +0100
+++ b/OrthancServer/ServerJobs/DicomMoveScuJob.cpp	Mon Mar 16 14:12:20 2020 +0100
@@ -63,7 +63,7 @@
       return true;
     }
 
-    virtual void Serialize(Json::Value& target) const
+    virtual void Serialize(Json::Value& target) const ORTHANC_OVERRIDE
     {
       findAnswer_->Serialize(target);
     }
--- a/OrthancServer/ServerJobs/StorageCommitmentScpJob.cpp	Mon Mar 16 12:33:28 2020 +0100
+++ b/OrthancServer/ServerJobs/StorageCommitmentScpJob.cpp	Mon Mar 16 14:12:20 2020 +0100
@@ -75,7 +75,7 @@
     {
     }
 
-    virtual CommandType GetType() const
+    virtual CommandType GetType() const ORTHANC_OVERRIDE
     {
       return CommandType_Setup;
     }
@@ -86,7 +86,7 @@
       return true;
     }
 
-    virtual void Serialize(Json::Value& target) const
+    virtual void Serialize(Json::Value& target) const ORTHANC_OVERRIDE
     {
       target = Json::objectValue;
       target[TYPE] = SETUP;
@@ -111,7 +111,7 @@
     {
     }
 
-    virtual CommandType GetType() const
+    virtual CommandType GetType() const ORTHANC_OVERRIDE
     {
       return CommandType_Lookup;
     }
@@ -140,7 +140,7 @@
       }
     }
 
-    virtual void Serialize(Json::Value& target) const
+    virtual void Serialize(Json::Value& target) const ORTHANC_OVERRIDE
     {
       target = Json::objectValue;
       target[TYPE] = LOOKUP;
@@ -168,7 +168,7 @@
       }
     }
 
-    virtual CommandType GetType() const
+    virtual CommandType GetType() const ORTHANC_OVERRIDE
     {
       return CommandType_Answer;
     }
@@ -179,7 +179,7 @@
       return true;
     }
 
-    virtual void Serialize(Json::Value& target) const
+    virtual void Serialize(Json::Value& target) const ORTHANC_OVERRIDE
     {
       target = Json::objectValue;
       target[TYPE] = ANSWER;
--- a/Plugins/Engine/OrthancPlugins.h	Mon Mar 16 12:33:28 2020 +0100
+++ b/Plugins/Engine/OrthancPlugins.h	Mon Mar 16 14:12:20 2020 +0100
@@ -239,20 +239,20 @@
                         const Arguments& headers,
                         const GetArguments& getArguments,
                         const void* bodyData,
-                        size_t bodySize);
+                        size_t bodySize) ORTHANC_OVERRIDE;
 
     virtual bool InvokeService(SharedLibrary& plugin,
                                _OrthancPluginService service,
-                               const void* parameters);
+                               const void* parameters) ORTHANC_OVERRIDE;
 
-    virtual void SignalChange(const ServerIndexChange& change);
-
+    virtual void SignalChange(const ServerIndexChange& change) ORTHANC_OVERRIDE;
+    
     virtual void SignalStoredInstance(const std::string& instanceId,
                                       DicomInstanceToStore& instance,
-                                      const Json::Value& simplifiedTags);
+                                      const Json::Value& simplifiedTags) ORTHANC_OVERRIDE;
 
     virtual bool FilterIncomingInstance(const DicomInstanceToStore& instance,
-                                        const Json::Value& simplified)
+                                        const Json::Value& simplified) ORTHANC_OVERRIDE
     {
       return true; // TODO Enable filtering of instances from plugins
     }
@@ -302,7 +302,7 @@
 
     bool HasWorklistHandler();
 
-    virtual IWorklistRequestHandler* ConstructWorklistRequestHandler();
+    virtual IWorklistRequestHandler* ConstructWorklistRequestHandler() ORTHANC_OVERRIDE;
 
     bool HasCustomImageDecoder();
 
@@ -315,22 +315,22 @@
 
     virtual ImageAccessor* Decode(const void* dicom,
                                   size_t size,
-                                  unsigned int frame);
+                                  unsigned int frame) ORTHANC_OVERRIDE;
 
     virtual bool IsAllowed(HttpMethod method,
                            const char* uri,
                            const char* ip,
                            const char* username,
                            const IHttpHandler::Arguments& httpHeaders,
-                           const IHttpHandler::GetArguments& getArguments);
+                           const IHttpHandler::GetArguments& getArguments) ORTHANC_OVERRIDE;
 
     bool HasFindHandler();
 
-    virtual IFindRequestHandler* ConstructFindRequestHandler();
+    virtual IFindRequestHandler* ConstructFindRequestHandler() ORTHANC_OVERRIDE;
 
     bool HasMoveHandler();
 
-    virtual IMoveRequestHandler* ConstructMoveRequestHandler();
+    virtual IMoveRequestHandler* ConstructMoveRequestHandler() ORTHANC_OVERRIDE;
 
     IJob* UnserializeJob(const std::string& type,
                          const Json::Value& value);
@@ -344,7 +344,7 @@
                                             const char* username,
                                             HttpMethod method,
                                             const UriComponents& uri,
-                                            const Arguments& headers);
+                                            const Arguments& headers) ORTHANC_OVERRIDE;
 
     // New in Orthanc 1.6.0
     IStorageCommitmentFactory::ILookupHandler* CreateStorageCommitment(
--- a/Plugins/Engine/PluginsJob.h	Mon Mar 16 12:33:28 2020 +0100
+++ b/Plugins/Engine/PluginsJob.h	Mon Mar 16 14:12:20 2020 +0100
@@ -51,30 +51,30 @@
 
     virtual ~PluginsJob();
 
-    virtual void Start()
+    virtual void Start() ORTHANC_OVERRIDE
     {
     }
     
     virtual JobStepResult Step(const std::string& jobId) ORTHANC_OVERRIDE;
 
-    virtual void Reset();
+    virtual void Reset() ORTHANC_OVERRIDE;
 
-    virtual void Stop(JobStopReason reason);
+    virtual void Stop(JobStopReason reason) ORTHANC_OVERRIDE;
 
-    virtual float GetProgress();
+    virtual float GetProgress() ORTHANC_OVERRIDE;
 
-    virtual void GetJobType(std::string& target)
+    virtual void GetJobType(std::string& target) ORTHANC_OVERRIDE
     {
       target = type_;
     }
     
-    virtual void GetPublicContent(Json::Value& value);
+    virtual void GetPublicContent(Json::Value& value) ORTHANC_OVERRIDE;
 
-    virtual bool Serialize(Json::Value& value);
+    virtual bool Serialize(Json::Value& value) ORTHANC_OVERRIDE;
 
     virtual bool GetOutput(std::string& output,
                            MimeType& mime,
-                           const std::string& key)
+                           const std::string& key) ORTHANC_OVERRIDE
     {
       // TODO
       return false;