changeset 6375:ab58c6884a8d

cppcheck: missingOverride (mainly for destructors)
author Alain Mazy <am@orthanc.team>
date Mon, 10 Nov 2025 17:43:15 +0100
parents 60e32e442218
children 37c4ce2438ac
files OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.h OrthancFramework/Sources/FileStorage/MemoryStorageArea.h OrthancFramework/Sources/Images/PamReader.h OrthancFramework/Sources/JobsEngine/Operations/SequenceOfOperationsJob.h OrthancFramework/Sources/JobsEngine/SetOfCommandsJob.h OrthancFramework/Sources/JobsEngine/SetOfInstancesJob.cpp OrthancFramework/Sources/MallocMemoryBuffer.h OrthancFramework/Sources/MultiThreading/IRunnableBySteps.h OrthancServer/Plugins/Engine/OrthancPluginDatabase.cpp OrthancServer/Plugins/Engine/OrthancPluginDatabaseV3.h OrthancServer/Plugins/Engine/OrthancPluginDatabaseV4.cpp OrthancServer/Plugins/Engine/OrthancPluginDatabaseV4.h OrthancServer/Plugins/Engine/OrthancPlugins.cpp OrthancServer/Plugins/Engine/OrthancPlugins.h OrthancServer/Plugins/Engine/PluginMemoryBuffer32.h OrthancServer/Plugins/Engine/PluginMemoryBuffer64.h OrthancServer/Plugins/Engine/PluginsJob.h OrthancServer/Resources/RunCppCheck.sh OrthancServer/Sources/OrthancMoveRequestHandler.cpp OrthancServer/Sources/OrthancWebDav.cpp OrthancServer/Sources/OrthancWebDav.h OrthancServer/Sources/ServerContext.h OrthancServer/Sources/ServerIndex.cpp OrthancServer/Sources/ServerJobs/ArchiveJob.cpp OrthancServer/Sources/ServerJobs/ArchiveJob.h OrthancServer/Sources/ServerJobs/DicomRetrieveScuBaseJob.h OrthancServer/Sources/ServerJobs/ThreadedSetOfInstancesJob.h
diffstat 27 files changed, 33 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.h	Mon Nov 10 17:33:52 2025 +0100
+++ b/OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.h	Mon Nov 10 17:43:15 2025 +0100
@@ -62,9 +62,9 @@
                         unsigned int maximumPduLength,
                         IApplicationEntityFilter* filter);
 
-      virtual ~CommandDispatcher();
+      virtual ~CommandDispatcher() ORTHANC_OVERRIDE;
 
-      virtual bool Step();
+      virtual bool Step() ORTHANC_OVERRIDE;
     };
 
     CommandDispatcher* AcceptAssociation(const DicomServer& server, 
--- a/OrthancFramework/Sources/FileStorage/MemoryStorageArea.h	Mon Nov 10 17:33:52 2025 +0100
+++ b/OrthancFramework/Sources/FileStorage/MemoryStorageArea.h	Mon Nov 10 17:43:15 2025 +0100
@@ -42,7 +42,7 @@
     Content  content_;
     
   public:
-    virtual ~MemoryStorageArea();
+    virtual ~MemoryStorageArea() ORTHANC_OVERRIDE;
     
     virtual void Create(const std::string& uuid,
                         const void* content,
--- a/OrthancFramework/Sources/Images/PamReader.h	Mon Nov 10 17:33:52 2025 +0100
+++ b/OrthancFramework/Sources/Images/PamReader.h	Mon Nov 10 17:43:15 2025 +0100
@@ -73,7 +73,7 @@
     */
     explicit PamReader(bool enforceAligned);
 
-    virtual ~PamReader();
+    virtual ~PamReader() ORTHANC_OVERRIDE;
 
 #if ORTHANC_SANDBOXED == 0
     void ReadFromFile(const boost::filesystem::path& filename);
--- a/OrthancFramework/Sources/JobsEngine/Operations/SequenceOfOperationsJob.h	Mon Nov 10 17:33:52 2025 +0100
+++ b/OrthancFramework/Sources/JobsEngine/Operations/SequenceOfOperationsJob.h	Mon Nov 10 17:43:15 2025 +0100
@@ -70,7 +70,7 @@
     SequenceOfOperationsJob(IJobUnserializer& unserializer,
                             const Json::Value& serialized);
 
-    virtual ~SequenceOfOperationsJob();
+    virtual ~SequenceOfOperationsJob() ORTHANC_OVERRIDE;
 
     void SetDescription(const std::string& description);
 
--- a/OrthancFramework/Sources/JobsEngine/SetOfCommandsJob.h	Mon Nov 10 17:33:52 2025 +0100
+++ b/OrthancFramework/Sources/JobsEngine/SetOfCommandsJob.h	Mon Nov 10 17:43:15 2025 +0100
@@ -71,7 +71,7 @@
     SetOfCommandsJob(ICommandUnserializer* unserializer  /* takes ownership */,
                      const Json::Value& source);
 
-    virtual ~SetOfCommandsJob();
+    virtual ~SetOfCommandsJob() ORTHANC_OVERRIDE;
 
     size_t GetPosition() const;
 
--- a/OrthancFramework/Sources/JobsEngine/SetOfInstancesJob.cpp	Mon Nov 10 17:33:52 2025 +0100
+++ b/OrthancFramework/Sources/JobsEngine/SetOfInstancesJob.cpp	Mon Nov 10 17:43:15 2025 +0100
@@ -106,7 +106,7 @@
     {
     }
 
-    virtual ICommand* Unserialize(const Json::Value& source) const
+    virtual ICommand* Unserialize(const Json::Value& source) const ORTHANC_OVERRIDE
     {
       if (source.type() == Json::nullValue)
       {
--- a/OrthancFramework/Sources/MallocMemoryBuffer.h	Mon Nov 10 17:33:52 2025 +0100
+++ b/OrthancFramework/Sources/MallocMemoryBuffer.h	Mon Nov 10 17:43:15 2025 +0100
@@ -45,7 +45,7 @@
   public:
     MallocMemoryBuffer();
 
-    virtual ~MallocMemoryBuffer()
+    virtual ~MallocMemoryBuffer() ORTHANC_OVERRIDE
     {
       Clear();
     }
--- a/OrthancFramework/Sources/MultiThreading/IRunnableBySteps.h	Mon Nov 10 17:33:52 2025 +0100
+++ b/OrthancFramework/Sources/MultiThreading/IRunnableBySteps.h	Mon Nov 10 17:43:15 2025 +0100
@@ -25,13 +25,14 @@
 #pragma once
 
 #include "../IDynamicObject.h"
+#include "../Compatibility.h"
 
 namespace Orthanc
 {
   class IRunnableBySteps : public IDynamicObject
   {
   public:
-    virtual ~IRunnableBySteps()
+    virtual ~IRunnableBySteps() ORTHANC_OVERRIDE
     {
     }
 
--- a/OrthancServer/Plugins/Engine/OrthancPluginDatabase.cpp	Mon Nov 10 17:33:52 2025 +0100
+++ b/OrthancServer/Plugins/Engine/OrthancPluginDatabase.cpp	Mon Nov 10 17:43:15 2025 +0100
@@ -238,7 +238,7 @@
       ResetAnswers();
     }
 
-    virtual ~Transaction()
+    virtual ~Transaction() ORTHANC_OVERRIDE
     {
       assert(that_.activeTransaction_ != NULL);    
       that_.activeTransaction_ = NULL;
--- a/OrthancServer/Plugins/Engine/OrthancPluginDatabaseV3.h	Mon Nov 10 17:33:52 2025 +0100
+++ b/OrthancServer/Plugins/Engine/OrthancPluginDatabaseV3.h	Mon Nov 10 17:43:15 2025 +0100
@@ -54,7 +54,7 @@
                             void* database,
                             const std::string& serverIdentifier);
 
-    virtual ~OrthancPluginDatabaseV3();
+    virtual ~OrthancPluginDatabaseV3() ORTHANC_OVERRIDE;
 
     virtual void Open() ORTHANC_OVERRIDE;
 
--- a/OrthancServer/Plugins/Engine/OrthancPluginDatabaseV4.cpp	Mon Nov 10 17:33:52 2025 +0100
+++ b/OrthancServer/Plugins/Engine/OrthancPluginDatabaseV4.cpp	Mon Nov 10 17:43:15 2025 +0100
@@ -527,7 +527,7 @@
     }
 
     
-    virtual ~Transaction()
+    virtual ~Transaction() ORTHANC_OVERRIDE
     {
       try
       {
--- a/OrthancServer/Plugins/Engine/OrthancPluginDatabaseV4.h	Mon Nov 10 17:33:52 2025 +0100
+++ b/OrthancServer/Plugins/Engine/OrthancPluginDatabaseV4.h	Mon Nov 10 17:43:15 2025 +0100
@@ -53,7 +53,7 @@
                             const _OrthancPluginRegisterDatabaseBackendV4& database,
                             const std::string& serverIdentifier);
 
-    virtual ~OrthancPluginDatabaseV4();
+    virtual ~OrthancPluginDatabaseV4() ORTHANC_OVERRIDE;
 
     const _OrthancPluginRegisterDatabaseBackendV4& GetDefinition() const
     {
--- a/OrthancServer/Plugins/Engine/OrthancPlugins.cpp	Mon Nov 10 17:33:52 2025 +0100
+++ b/OrthancServer/Plugins/Engine/OrthancPlugins.cpp	Mon Nov 10 17:43:15 2025 +0100
@@ -1562,7 +1562,7 @@
           }
         }
 
-        virtual ~Handler()
+        virtual ~Handler() ORTHANC_OVERRIDE
         {
           assert(handler_ != NULL);
           parameters_.destructor(handler_);
@@ -6687,7 +6687,7 @@
       assert(reader_ != NULL);
     }
 
-    virtual ~HttpServerChunkedReader()
+    virtual ~HttpServerChunkedReader() ORTHANC_OVERRIDE
     {
       assert(reader_ != NULL);
       parameters_.finalize(reader_);
--- a/OrthancServer/Plugins/Engine/OrthancPlugins.h	Mon Nov 10 17:33:52 2025 +0100
+++ b/OrthancServer/Plugins/Engine/OrthancPlugins.h	Mon Nov 10 17:43:15 2025 +0100
@@ -281,7 +281,7 @@
   public:
     explicit OrthancPlugins(const std::string& databaseServerIdentifier);
 
-    virtual ~OrthancPlugins();
+    virtual ~OrthancPlugins() ORTHANC_OVERRIDE;
 
     void SetServerContext(ServerContext& context);
 
--- a/OrthancServer/Plugins/Engine/PluginMemoryBuffer32.h	Mon Nov 10 17:33:52 2025 +0100
+++ b/OrthancServer/Plugins/Engine/PluginMemoryBuffer32.h	Mon Nov 10 17:43:15 2025 +0100
@@ -44,7 +44,7 @@
   public:
     PluginMemoryBuffer32();
 
-    virtual ~PluginMemoryBuffer32()
+    virtual ~PluginMemoryBuffer32() ORTHANC_OVERRIDE
     {
       Clear();
     }
--- a/OrthancServer/Plugins/Engine/PluginMemoryBuffer64.h	Mon Nov 10 17:33:52 2025 +0100
+++ b/OrthancServer/Plugins/Engine/PluginMemoryBuffer64.h	Mon Nov 10 17:43:15 2025 +0100
@@ -44,7 +44,7 @@
   public:
     PluginMemoryBuffer64();
 
-    virtual ~PluginMemoryBuffer64()
+    virtual ~PluginMemoryBuffer64() ORTHANC_OVERRIDE
     {
       Clear();
     }
--- a/OrthancServer/Plugins/Engine/PluginsJob.h	Mon Nov 10 17:33:52 2025 +0100
+++ b/OrthancServer/Plugins/Engine/PluginsJob.h	Mon Nov 10 17:43:15 2025 +0100
@@ -47,7 +47,7 @@
 
     explicit PluginsJob(const _OrthancPluginCreateJob2& parameters);
 
-    virtual ~PluginsJob();
+    virtual ~PluginsJob() ORTHANC_OVERRIDE;
 
     virtual void Start() ORTHANC_OVERRIDE
     {
--- a/OrthancServer/Resources/RunCppCheck.sh	Mon Nov 10 17:33:52 2025 +0100
+++ b/OrthancServer/Resources/RunCppCheck.sh	Mon Nov 10 17:43:15 2025 +0100
@@ -49,7 +49,7 @@
             --suppress=missingIncludeSystem \
             --suppress=missingInclude \
             --suppress=useStlAlgorithm \
-            --suppress:nullPointerOutOfMemory \
+            --suppress=nullPointerOutOfMemory \
             --check-level=exhaustive \
             --suppressions-list=/tmp/cppcheck-suppressions.txt \
             -DBOOST_HAS_DATE_TIME=1 \
--- a/OrthancServer/Sources/OrthancMoveRequestHandler.cpp	Mon Nov 10 17:33:52 2025 +0100
+++ b/OrthancServer/Sources/OrthancMoveRequestHandler.cpp	Mon Nov 10 17:43:15 2025 +0100
@@ -85,12 +85,12 @@
         }
       }
 
-      virtual unsigned int GetSubOperationCount() const
+      virtual unsigned int GetSubOperationCount() const ORTHANC_OVERRIDE
       {
         return instances_.size();
       }
 
-      virtual Status DoNext()
+      virtual Status DoNext() ORTHANC_OVERRIDE
       {
         if (position_ >= instances_.size())
         {
@@ -169,12 +169,12 @@
         }
       }
 
-      virtual unsigned int GetSubOperationCount() const
+      virtual unsigned int GetSubOperationCount() const ORTHANC_OVERRIDE
       {
         return countInstances_;
       }
 
-      virtual Status DoNext()
+      virtual Status DoNext() ORTHANC_OVERRIDE
       {
         if (position_ >= countInstances_)
         {
--- a/OrthancServer/Sources/OrthancWebDav.cpp	Mon Nov 10 17:33:52 2025 +0100
+++ b/OrthancServer/Sources/OrthancWebDav.cpp	Mon Nov 10 17:43:15 2025 +0100
@@ -597,7 +597,7 @@
     virtual INode* CreateSubfolder(const std::string& path) = 0;
 
   public:
-    virtual ~InternalNode()
+    virtual ~InternalNode() ORTHANC_OVERRIDE
     {
       for (Children::iterator it = children_.begin(); it != children_.end(); ++it)
       {
--- a/OrthancServer/Sources/OrthancWebDav.h	Mon Nov 10 17:33:52 2025 +0100
+++ b/OrthancServer/Sources/OrthancWebDav.h	Mon Nov 10 17:43:15 2025 +0100
@@ -99,7 +99,7 @@
                   bool allowDicomDelete,
                   bool allowUpload);
 
-    virtual ~OrthancWebDav()
+    virtual ~OrthancWebDav() ORTHANC_OVERRIDE
     {
       Stop();
     }
--- a/OrthancServer/Sources/ServerContext.h	Mon Nov 10 17:33:52 2025 +0100
+++ b/OrthancServer/Sources/ServerContext.h	Mon Nov 10 17:43:15 2025 +0100
@@ -319,7 +319,7 @@
                   bool readOnly,
                   unsigned int maxConcurrentDcmtkTranscoder);
 
-    ~ServerContext();
+    ~ServerContext() ORTHANC_OVERRIDE;
 
     void SetupJobsEngine(bool unitTesting,
                          bool loadJobsFromDatabase);
--- a/OrthancServer/Sources/ServerIndex.cpp	Mon Nov 10 17:33:52 2025 +0100
+++ b/OrthancServer/Sources/ServerIndex.cpp	Mon Nov 10 17:43:15 2025 +0100
@@ -236,7 +236,7 @@
     {
     }
 
-    virtual ITransactionContext* Create()
+    virtual ITransactionContext* Create() ORTHANC_OVERRIDE
     {
       // There can be concurrent calls to this method, which is not an
       // issue because we simply create an object
--- a/OrthancServer/Sources/ServerJobs/ArchiveJob.cpp	Mon Nov 10 17:33:52 2025 +0100
+++ b/OrthancServer/Sources/ServerJobs/ArchiveJob.cpp	Mon Nov 10 17:43:15 2025 +0100
@@ -207,7 +207,7 @@
       }
     }
 
-    virtual ~ThreadedInstanceLoader()
+    virtual ~ThreadedInstanceLoader() ORTHANC_OVERRIDE
     {
       Clear();
     }
--- a/OrthancServer/Sources/ServerJobs/ArchiveJob.h	Mon Nov 10 17:33:52 2025 +0100
+++ b/OrthancServer/Sources/ServerJobs/ArchiveJob.h	Mon Nov 10 17:43:15 2025 +0100
@@ -83,7 +83,7 @@
                bool enableExtendedSopClass,
                ResourceType jobLevel);
     
-    virtual ~ArchiveJob();
+    virtual ~ArchiveJob() ORTHANC_OVERRIDE;
 
     void AcquireSynchronousTarget(ZipWriter::IOutputStream* synchronousTarget);
 
--- a/OrthancServer/Sources/ServerJobs/DicomRetrieveScuBaseJob.h	Mon Nov 10 17:33:52 2025 +0100
+++ b/OrthancServer/Sources/ServerJobs/DicomRetrieveScuBaseJob.h	Mon Nov 10 17:43:15 2025 +0100
@@ -56,7 +56,7 @@
       {
       }
 
-      virtual ~Command();
+      virtual ~Command() ORTHANC_OVERRIDE;
 
       virtual bool Execute(const std::string &jobId) ORTHANC_OVERRIDE;
 
--- a/OrthancServer/Sources/ServerJobs/ThreadedSetOfInstancesJob.h	Mon Nov 10 17:33:52 2025 +0100
+++ b/OrthancServer/Sources/ServerJobs/ThreadedSetOfInstancesJob.h	Mon Nov 10 17:43:15 2025 +0100
@@ -84,7 +84,7 @@
                                        bool hasTrailingStep,
                                        bool defaultKeepSource);
 
-    virtual ~ThreadedSetOfInstancesJob();
+    virtual ~ThreadedSetOfInstancesJob() ORTHANC_OVERRIDE;
 
   protected:
     virtual bool HandleInstance(const std::string& instance) = 0;