# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1399366890 -7200
# Node ID d466b3606acadf42e796b49f4ae4eefa40bb723f
# Parent  437c4a83d2cc0d71facf1bb5b972e97f40ff84f8
refactoring

diff -r 437c4a83d2cc -r d466b3606aca OrthancServer/DicomModification.cpp
--- 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,
diff -r 437c4a83d2cc -r d466b3606aca OrthancServer/FromDcmtkBridge.h
--- 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
 {
diff -r 437c4a83d2cc -r d466b3606aca OrthancServer/OrthancFindRequestHandler.cpp
--- 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
 {
diff -r 437c4a83d2cc -r d466b3606aca OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp
--- 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>
 
diff -r 437c4a83d2cc -r d466b3606aca OrthancServer/OrthancRestApi/OrthancRestModalities.cpp
--- 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>
 
diff -r 437c4a83d2cc -r d466b3606aca OrthancServer/OrthancRestApi/OrthancRestResources.cpp
--- 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>
 
diff -r 437c4a83d2cc -r d466b3606aca OrthancServer/OrthancRestApi/OrthancRestSystem.cpp
--- 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>
 
diff -r 437c4a83d2cc -r d466b3606aca OrthancServer/ParsedDicomFile.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
diff -r 437c4a83d2cc -r d466b3606aca OrthancServer/ServerContext.cpp
--- 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"
 
diff -r 437c4a83d2cc -r d466b3606aca OrthancServer/ServerContext.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"