Mercurial > hg > orthanc

changeset 795:d466b3606aca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactoring
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 06 May 2014 11:01:30 +0200
parents 437c4a83d2cc
children e7b1ca0f1e04
files OrthancServer/DicomModification.cpp OrthancServer/FromDcmtkBridge.h OrthancServer/OrthancFindRequestHandler.cpp OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp OrthancServer/OrthancRestApi/OrthancRestModalities.cpp OrthancServer/OrthancRestApi/OrthancRestResources.cpp OrthancServer/OrthancRestApi/OrthancRestSystem.cpp OrthancServer/ParsedDicomFile.h OrthancServer/ServerContext.cpp OrthancServer/ServerContext.h
diffstat 10 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancServer/DicomModification.cpp	Tue May 06 10:52:20 2014 +0200
+++ b/OrthancServer/DicomModification.cpp	Tue May 06 11:01:30 2014 +0200
@@ -35,6 +35,8 @@
 #include "../Core/OrthancException.h"
 #include "FromDcmtkBridge.h"
 
+#include <memory>   // For std::auto_ptr
+
 namespace Orthanc
 {
   void DicomModification::MapDicomIdentifier(ParsedDicomFile& dicom,
--- a/OrthancServer/FromDcmtkBridge.h	Tue May 06 10:52:20 2014 +0200
+++ b/OrthancServer/FromDcmtkBridge.h	Tue May 06 11:01:30 2014 +0200
@@ -38,7 +38,6 @@
 
 #include <dcmtk/dcmdata/dcdatset.h>
 #include <json/json.h>
-#include <memory>
 
 namespace Orthanc
 {
--- a/OrthancServer/OrthancFindRequestHandler.cpp	Tue May 06 10:52:20 2014 +0200
+++ b/OrthancServer/OrthancFindRequestHandler.cpp	Tue May 06 11:01:30 2014 +0200
@@ -37,6 +37,7 @@
 #include "../Core/DicomFormat/DicomArray.h"
 #include "ServerToolbox.h"
 #include "OrthancInitialization.h"
+#include "FromDcmtkBridge.h"
 
 namespace Orthanc
 {
--- a/OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp	Tue May 06 10:52:20 2014 +0200
+++ b/OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp	Tue May 06 11:01:30 2014 +0200
@@ -33,6 +33,7 @@
 #include "OrthancRestApi.h"
 
 #include "../DicomModification.h"
+#include "../FromDcmtkBridge.h"
 
 #include <glog/logging.h>
 
--- a/OrthancServer/OrthancRestApi/OrthancRestModalities.cpp	Tue May 06 10:52:20 2014 +0200
+++ b/OrthancServer/OrthancRestApi/OrthancRestModalities.cpp	Tue May 06 11:01:30 2014 +0200
@@ -34,6 +34,7 @@
 
 #include "../OrthancInitialization.h"
 #include "../../Core/HttpClient.h"
+#include "../FromDcmtkBridge.h"
 
 #include <glog/logging.h>
 
--- a/OrthancServer/OrthancRestApi/OrthancRestResources.cpp	Tue May 06 10:52:20 2014 +0200
+++ b/OrthancServer/OrthancRestApi/OrthancRestResources.cpp	Tue May 06 11:01:30 2014 +0200
@@ -33,6 +33,7 @@
 #include "OrthancRestApi.h"
 
 #include "../ServerToolbox.h"
+#include "../FromDcmtkBridge.h"
 
 #include <glog/logging.h>
 
--- a/OrthancServer/OrthancRestApi/OrthancRestSystem.cpp	Tue May 06 10:52:20 2014 +0200
+++ b/OrthancServer/OrthancRestApi/OrthancRestSystem.cpp	Tue May 06 11:01:30 2014 +0200
@@ -33,6 +33,7 @@
 #include "OrthancRestApi.h"
 
 #include "../OrthancInitialization.h"
+#include "../FromDcmtkBridge.h"
 
 #include <glog/logging.h>
 
--- a/OrthancServer/ParsedDicomFile.h	Tue May 06 10:52:20 2014 +0200
+++ b/OrthancServer/ParsedDicomFile.h	Tue May 06 11:01:30 2014 +0200
@@ -34,7 +34,6 @@
 
 #include "../Core/DicomFormat/DicomInstanceHasher.h"
 #include "../Core/RestApi/RestApiOutput.h"
-#include "../Core/Toolbox.h"
 #include "ServerEnumerations.h"
 
 namespace Orthanc
--- a/OrthancServer/ServerContext.cpp	Tue May 06 10:52:20 2014 +0200
+++ b/OrthancServer/ServerContext.cpp	Tue May 06 11:01:30 2014 +0200
@@ -34,6 +34,7 @@
 
 #include "../Core/HttpServer/FilesystemHttpSender.h"
 #include "../Core/Lua/LuaFunctionCall.h"
+#include "FromDcmtkBridge.h"
 #include "ServerToolbox.h"
 #include "OrthancInitialization.h"
 
--- a/OrthancServer/ServerContext.h	Tue May 06 10:52:20 2014 +0200
+++ b/OrthancServer/ServerContext.h	Tue May 06 11:01:30 2014 +0200
@@ -38,7 +38,6 @@
 #include "../Core/RestApi/RestApiOutput.h"
 #include "../Core/Lua/LuaContext.h"
 #include "ServerIndex.h"
-#include "FromDcmtkBridge.h"
 #include "ParsedDicomFile.h"
 #include "DicomProtocol/ReusableDicomUserConnection.h"