orthanc: OrthancServer/Sources/main.cpp comparison

comparison OrthancServer/Sources/main.cpp @ 4205:d962a2996637

cppcheck

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 17 Sep 2020 17:58:19 +0200
parents	9ce5c89328f5
children	7bd5eab3ba25

comparison

equal deleted inserted replaced

-:318c16cfccab
+:d962a2996637
 {
 private:
 ServerContext& context_;
 public:
-OrthancStoreRequestHandler(ServerContext& context) :
+explicit OrthancStoreRequestHandler(ServerContext& context) :
 context_(context)
 {
 }
 virtual void Handle(const std::string& dicomFile,
 const DicomMap& dicomSummary,
 const Json::Value& dicomJson,
 const std::string& remoteIp,
 const std::string& remoteAet,
-const std::string& calledAet)
+const std::string& calledAet) ORTHANC_OVERRIDE
 {
 if (dicomFile.size() > 0)
 {
 DicomInstanceToStore toStore;
 toStore.SetOrigin(DicomInstanceOrigin::FromDicomProtocol
 {
 private:
 ServerContext& context_;
 public:
-OrthancStorageCommitmentRequestHandler(ServerContext& context) :
+explicit OrthancStorageCommitmentRequestHandler(ServerContext& context) :
 context_(context)
 {
 }
 virtual void HandleRequest(const std::string& transactionUid,
 const std::vector<std::string>& referencedSopClassUids,
 const std::vector<std::string>& referencedSopInstanceUids,
 const std::string& remoteIp,
 const std::string& remoteAet,
-const std::string& calledAet)
+const std::string& calledAet) ORTHANC_OVERRIDE
 {
 if (referencedSopClassUids.size() != referencedSopInstanceUids.size())
 {
 throw OrthancException(ErrorCode_InternalError);
 }
 const std::vector<std::string>& failedSopClassUids,
 const std::vector<std::string>& failedSopInstanceUids,
 const std::vector<StorageCommitmentFailureReason>& failureReasons,
 const std::string& remoteIp,
 const std::string& remoteAet,
-const std::string& calledAet)
+const std::string& calledAet) ORTHANC_OVERRIDE
 {
 if (successSopClassUids.size() != successSopInstanceUids.size() ||
 failedSopClassUids.size() != failedSopInstanceUids.size() ||
 failedSopClassUids.size() != failureReasons.size())
 {
 class ModalitiesFromConfiguration : public DicomServer::IRemoteModalities
 {
 public:
 virtual bool IsSameAETitle(const std::string& aet1,
-const std::string& aet2)
+const std::string& aet2) ORTHANC_OVERRIDE
 {
 OrthancConfiguration::ReaderLock lock;
 return lock.GetConfiguration().IsSameAETitle(aet1, aet2);
 }
 virtual bool LookupAETitle(RemoteModalityParameters& modality,
-const std::string& aet)
+const std::string& aet) ORTHANC_OVERRIDE
 {
 OrthancConfiguration::ReaderLock lock;
 return lock.GetConfiguration().LookupDicomModalityUsingAETitle(modality, aet);
 }
 };
 {
 private:
 ServerContext& context_;
 public:
-MyDicomServerFactory(ServerContext& context) : context_(context)
+explicit MyDicomServerFactory(ServerContext& context) : context_(context)
 {
 }
-virtual IStoreRequestHandler* ConstructStoreRequestHandler()
+virtual IStoreRequestHandler* ConstructStoreRequestHandler() ORTHANC_OVERRIDE
 {
 return new OrthancStoreRequestHandler(context_);
 }
-virtual IFindRequestHandler* ConstructFindRequestHandler()
+virtual IFindRequestHandler* ConstructFindRequestHandler() ORTHANC_OVERRIDE
 {
 std::unique_ptr<OrthancFindRequestHandler> result(new OrthancFindRequestHandler(context_));
 {
 OrthancConfiguration::ReaderLock lock;
 }
 return result.release();
 }
-virtual IMoveRequestHandler* ConstructMoveRequestHandler()
+virtual IMoveRequestHandler* ConstructMoveRequestHandler() ORTHANC_OVERRIDE
 {
 return new OrthancMoveRequestHandler(context_);
 }
-virtual IGetRequestHandler* ConstructGetRequestHandler()
+virtual IGetRequestHandler* ConstructGetRequestHandler() ORTHANC_OVERRIDE
 {
 return new OrthancGetRequestHandler(context_);
 }
-virtual IStorageCommitmentRequestHandler* ConstructStorageCommitmentRequestHandler()
+virtual IStorageCommitmentRequestHandler* ConstructStorageCommitmentRequestHandler() ORTHANC_OVERRIDE
 {
 return new OrthancStorageCommitmentRequestHandler(context_);
 }
 ServerContext&  context_;
 bool            alwaysAllowEcho_;
 bool            alwaysAllowStore_;
 public:
-OrthancApplicationEntityFilter(ServerContext& context) :
+explicit OrthancApplicationEntityFilter(ServerContext& context) :
 context_(context)
 {
 OrthancConfiguration::ReaderLock lock;
 alwaysAllowEcho_ = lock.GetConfiguration().GetBooleanParameter("DicomAlwaysAllowEcho", true);
 alwaysAllowStore_ = lock.GetConfiguration().GetBooleanParameter("DicomAlwaysAllowStore", true);
 }
 virtual bool IsAllowedConnection(const std::string& remoteIp,
 const std::string& remoteAet,
-const std::string& calledAet)
+const std::string& calledAet) ORTHANC_OVERRIDE
 {
 LOG(INFO) << "Incoming connection from AET " << remoteAet
 << " on IP " << remoteIp << ", calling AET " << calledAet;
 if (alwaysAllowEcho_ ||
 }
 virtual bool IsAllowedRequest(const std::string& remoteIp,
 const std::string& remoteAet,
 const std::string& calledAet,
-DicomRequestType type)
+DicomRequestType type) ORTHANC_OVERRIDE
 {
 LOG(INFO) << "Incoming " << EnumerationToString(type) << " request from AET "
 << remoteAet << " on IP " << remoteIp << ", calling AET " << calledAet;
 if (type == DicomRequestType_Echo &&
 }
 virtual bool IsAllowedTransferSyntax(const std::string& remoteIp,
 const std::string& remoteAet,
 const std::string& calledAet,
-TransferSyntax syntax)
+TransferSyntax syntax) ORTHANC_OVERRIDE
 {
 std::string configuration;
 switch (syntax)
 {
 }
 virtual bool IsUnknownSopClassAccepted(const std::string& remoteIp,
 const std::string& remoteAet,
-const std::string& calledAet)
+const std::string& calledAet) ORTHANC_OVERRIDE
 {
 static const char* configuration = "UnknownSopClassAccepted";
 {
 std::string lua = "Is" + std::string(configuration);
 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
 {
 #if ORTHANC_ENABLE_PLUGINS == 1
 if (plugins_ != NULL &&
 !plugins_->IsAllowed(method, uri, ip, username, httpHeaders, getArguments))
 {
 }
 virtual void Format(HttpOutput& output,
 const OrthancException& exception,
 HttpMethod method,
-const char* uri)
+const char* uri) ORTHANC_OVERRIDE
 {
 {
 bool isPlugin = false;
 #if ORTHANC_ENABLE_PLUGINS == 1
 #if ORTHANC_ENABLE_PLUGINS == 1
 static void LoadPlugins(OrthancPlugins& plugins)
 {
-std::list<std::string> path;
+std::list<std::string> pathList;
 {
 OrthancConfiguration::ReaderLock lock;
-lock.GetConfiguration().GetListOfStringsParameter(path, "Plugins");
+lock.GetConfiguration().GetListOfStringsParameter(pathList, "Plugins");
 }
 for (std::list<std::string>::const_iterator
-it = path.begin(); it != path.end(); ++it)
+it = pathList.begin(); it != pathList.end(); ++it)
 {
 std::string path;
 {
 OrthancConfiguration::ReaderLock lock;
 // Returns "true" if restart is required
 static bool WaitForExit(ServerContext& context,
-OrthancRestApi& restApi)
+const OrthancRestApi& restApi)
 {
 LOG(WARNING) << "Orthanc has started";
 #if ORTHANC_ENABLE_PLUGINS == 1
 if (context.HasPlugins())
 }
 static bool StartHttpServer(ServerContext& context,
-OrthancRestApi& restApi,
+const OrthancRestApi& restApi,
 OrthancPlugins* plugins)
 {
 bool httpServerEnabled;
 {
 }
 }
 static bool StartDicomServer(ServerContext& context,
-OrthancRestApi& restApi,
+const OrthancRestApi& restApi,
 OrthancPlugins* plugins)
 {
 bool dicomServerEnabled;
 {

Mercurial > hg > orthanc

comparison OrthancServer/Sources/main.cpp @ 4205:d962a2996637