STYLE: Cleanup includes

commontk · Jan 18, 2024 · 7843549 · 7843549
1 parent a77348e
commit 7843549
Show file tree

Hide file tree

Showing 22 changed files with 47 additions and 30 deletions.
diff --git a/Libs/DICOM/Core/ctkDICOMEcho.cpp b/Libs/DICOM/Core/ctkDICOMEcho.cpp
@@ -29,16 +29,10 @@
 #include "ctkLogger.h"
 
 // DCMTK includes
+#include <dcmtk/dcmdata/dcuid.h>
 #include <dcmtk/dcmnet/scu.h>
-#include <dcmtk/dcmdata/dcfilefo.h>
-#include <dcmtk/dcmdata/dcdeftag.h>
-#include <dcmtk/dcmdata/dcdatset.h>
-#include <dcmtk/oflog/oflog.h>
-#include <dcmtk/ofstd/ofcond.h>
-#include <dcmtk/ofstd/ofstring.h>
-#include <dcmtk/ofstd/oflist.h>
 #include <dcmtk/ofstd/ofstd.h>        /* for class OFStandard */
-#include <dcmtk/dcmdata/dcddirif.h>   /* for class DicomDirInterface */
+#include <dcmtk/ofstd/ofstring.h>
 
 static ctkLogger logger ( "org.commontk.dicom.DICOMEcho" );
 

diff --git a/Libs/DICOM/Core/ctkDICOMEcho.h b/Libs/DICOM/Core/ctkDICOMEcho.h
@@ -22,16 +22,15 @@
 #define __ctkDICOMEcho_h
 
 // Qt includes
-#include <QObject>
 #include <QMap>
+#include <QObject>
 #include <QString>
 
 // CTK includes
 #include <ctkPimpl.h>
 
 // ctkDICOMCore includes
 #include "ctkDICOMCoreExport.h"
-#include "ctkErrorLogLevel.h"
 
 class ctkDICOMEchoPrivate;
 

diff --git a/Libs/DICOM/Core/ctkDICOMInserter.cpp b/Libs/DICOM/Core/ctkDICOMInserter.cpp
@@ -30,7 +30,7 @@
 #include "ctkDICOMInserter.h"
 #include "ctkDICOMJobResponseSet.h"
 
-static ctkLogger logger ( "org.commontk.dicom.DICOMQuery" );
+static ctkLogger logger ("org.commontk.dicom.DICOMQuery");
 
 //------------------------------------------------------------------------------
 class ctkDICOMInserterPrivate

diff --git a/Libs/DICOM/Core/ctkDICOMInserter.h b/Libs/DICOM/Core/ctkDICOMInserter.h
@@ -27,9 +27,6 @@
 // Qt includes
 #include <QObject>
 
-// ctkCore includes
-#include <ctkPimpl.h>
-
 // ctkDICOMCore includes
 #include "ctkDICOMCoreExport.h"
 

diff --git a/Libs/DICOM/Core/ctkDICOMInserterJob.cpp b/Libs/DICOM/Core/ctkDICOMInserterJob.cpp
@@ -26,7 +26,7 @@
 #include "ctkDICOMInserterWorker.h"
 #include "ctkLogger.h"
 
-static ctkLogger logger ( "org.commontk.dicom.ctkDICOMInserterJob" );
+static ctkLogger logger ("org.commontk.dicom.ctkDICOMInserterJob");
 
 //------------------------------------------------------------------------------
 // ctkDICOMInserterJob methods

diff --git a/Libs/DICOM/Core/ctkDICOMInserterWorker.cpp b/Libs/DICOM/Core/ctkDICOMInserterWorker.cpp
@@ -24,13 +24,13 @@
 // Qt includes
 #include <QThread>
 
+// ctkCore includes
+#include <ctkLogger.h>
+
 // ctkDICOMCore includes
-#include "ctkDICOMDatabase.h"
-#include "ctkDICOMInserterWorker_p.h"
 #include "ctkDICOMInserterJob.h"
+#include "ctkDICOMInserterWorker_p.h"
 #include "ctkDICOMJobResponseSet.h"
-#include "ctkDICOMScheduler.h"
-#include "ctkLogger.h"
 
 static ctkLogger logger ("org.commontk.dicom.ctkDICOMInserterWorker");
 

diff --git a/Libs/DICOM/Core/ctkDICOMInserterWorker.h b/Libs/DICOM/Core/ctkDICOMInserterWorker.h
@@ -26,14 +26,11 @@
 
 // Qt includes
 #include <QObject>
-#include <QMap>
-#include <QVariant>
 #include <QSharedPointer>
 
 // ctkDICOMCore includes
 #include "ctkDICOMCoreExport.h"
 #include "ctkDICOMWorker.h"
-class ctkDICOMDatabase;
 class ctkDICOMInserter;
 class ctkDICOMInserterWorkerPrivate;
 

diff --git a/Libs/DICOM/Core/ctkDICOMInserterWorker_p.h b/Libs/DICOM/Core/ctkDICOMInserterWorker_p.h
@@ -24,6 +24,10 @@
 #ifndef __ctkDICOMInserterWorkerPrivate_h
 #define __ctkDICOMInserterWorkerPrivate_h
 
+// Qt includes
+#include <QObject>
+#include <QSharedPointer>
+
 // ctkDICOMCore includes
 #include "ctkDICOMInserter.h"
 #include "ctkDICOMInserterWorker.h"

diff --git a/Libs/DICOM/Core/ctkDICOMJob.cpp b/Libs/DICOM/Core/ctkDICOMJob.cpp
@@ -28,7 +28,7 @@
 #include "ctkDICOMJob.h"
 #include "ctkDICOMJobResponseSet.h"
 
-static ctkLogger logger ( "org.commontk.dicom.ctkDICOMJob" );
+static ctkLogger logger ("org.commontk.dicom.ctkDICOMJob");
 
 //------------------------------------------------------------------------------
 // ctkDICOMJob methods

diff --git a/Libs/DICOM/Core/ctkDICOMJob.h b/Libs/DICOM/Core/ctkDICOMJob.h
@@ -34,8 +34,6 @@
 
 // ctkDICOMCore includes
 #include "ctkDICOMCoreExport.h"
-
-class ctkDICOMServer;
 class ctkDICOMJobResponseSet;
 
 /// \ingroup DICOM_Core

diff --git a/Libs/DICOM/Core/ctkDICOMJobResponseSet.h b/Libs/DICOM/Core/ctkDICOMJobResponseSet.h
@@ -156,6 +156,7 @@ class CTK_DICOM_CORE_EXPORT ctkDICOMJobResponseSet : public QObject
   Q_DISABLE_COPY(ctkDICOMJobResponseSet);
 };
 
+//------------------------------------------------------------------------------
 struct CTK_DICOM_CORE_EXPORT ctkDICOMJobDetail : ctkJobDetail {
   explicit ctkDICOMJobDetail() = default;
 

diff --git a/Libs/DICOM/Core/ctkDICOMQueryJob.cpp b/Libs/DICOM/Core/ctkDICOMQueryJob.cpp
@@ -177,6 +177,7 @@ QString ctkDICOMQueryJob::loggerReport(const QString &status) const
       return QString("");
     }
 }
+
 //------------------------------------------------------------------------------
 ctkAbstractJob* ctkDICOMQueryJob::clone() const
 {

diff --git a/Libs/DICOM/Core/ctkDICOMQueryJob.h b/Libs/DICOM/Core/ctkDICOMQueryJob.h
@@ -25,10 +25,10 @@
 #define __ctkDICOMQueryJob_h
 
 // Qt includes
-#include <QObject>
 #include <QMap>
-#include <QVariant>
+#include <QObject>
 #include <QSharedPointer>
+#include <QVariant>
 
 // ctkCore includes
 class ctkAbstractWorker;

diff --git a/Libs/DICOM/Core/ctkDICOMQueryJob_p.h b/Libs/DICOM/Core/ctkDICOMQueryJob_p.h
@@ -24,6 +24,11 @@
 #ifndef __ctkDICOMQueryJobPrivate_h
 #define __ctkDICOMQueryJobPrivate_h
 
+// Qt includes
+#include <QMap>
+#include <QObject>
+#include <QSharedPointer>
+
 // ctkDICOMCore includes
 #include "ctkDICOMQueryJob.h"
 

diff --git a/Libs/DICOM/Core/ctkDICOMQueryWorker.h b/Libs/DICOM/Core/ctkDICOMQueryWorker.h
@@ -25,9 +25,8 @@
 #define __ctkDICOMQueryWorker_h
 
 // Qt includes
-#include <QObject>
 #include <QMap>
-#include <QVariant>
+#include <QObject>
 #include <QSharedPointer>
 
 // ctkDICOMCore includes

diff --git a/Libs/DICOM/Core/ctkDICOMQueryWorker_p.h b/Libs/DICOM/Core/ctkDICOMQueryWorker_p.h
@@ -24,6 +24,9 @@
 #ifndef __ctkDICOMQueryWorkerPrivate_h
 #define __ctkDICOMQueryWorkerPrivate_h
 
+// Qt includes
+#include <QSharedPointer>
+
 // ctkDICOMCore includes
 #include "ctkDICOMQuery.h"
 #include "ctkDICOMQueryWorker.h"

diff --git a/Libs/DICOM/Core/ctkDICOMRetrieveJob_p.h b/Libs/DICOM/Core/ctkDICOMRetrieveJob_p.h
@@ -24,8 +24,13 @@
 #ifndef __ctkDICOMRetrieveJobPrivate_h
 #define __ctkDICOMRetrieveJobPrivate_h
 
+// Qt includes
+#include <QObject>
+#include <QSharedPointer>
+
 // ctkDICOMCore includes
 #include "ctkDICOMRetrieveJob.h"
+#include "ctkDICOMServer.h"
 
 //------------------------------------------------------------------------------
 class ctkDICOMRetrieveJobPrivate : public QObject

diff --git a/Libs/DICOM/Core/ctkDICOMRetrieveWorker_p.h b/Libs/DICOM/Core/ctkDICOMRetrieveWorker_p.h
@@ -24,6 +24,10 @@
 #ifndef __ctkDICOMRetrieveWorkerPrivate_h
 #define __ctkDICOMRetrieveWorkerPrivate_h
 
+// Qt includes
+#include <QObject>
+#include <QSharedPointer>
+
 // ctkDICOMCore includes
 #include "ctkDICOMRetrieve.h"
 #include "ctkDICOMRetrieveWorker.h"

diff --git a/Libs/DICOM/Core/ctkDICOMScheduler_p.h b/Libs/DICOM/Core/ctkDICOMScheduler_p.h
@@ -24,10 +24,19 @@
 #ifndef __ctkDICOMQueryJobPrivate_h
 #define __ctkDICOMQueryJobPrivate_h
 
+// Qt includes
+#include <QList>
+#include <QMap>
+#include <QSharedPointer>
+#include <QString>
+class QVariant;
+
 // ctkCore includes
 #include <ctkJobScheduler_p.h>
 class ctkAbstractJob;
 class ctkAbstractWorker;
+class ctkDICOMDatabase;
+class ctkDICOMServer;
 
 // ctkDICOMCore includes
 #include "ctkDICOMScheduler.h"

diff --git a/Libs/DICOM/Core/ctkDICOMServer.cpp b/Libs/DICOM/Core/ctkDICOMServer.cpp
@@ -23,6 +23,7 @@
 
 // Qt includes
 #include <QSharedPointer>
+#include <QString>
 
 // ctkCore includes
 #include <ctkLogger.h>

diff --git a/Libs/DICOM/Core/ctkDICOMServer.h b/Libs/DICOM/Core/ctkDICOMServer.h
@@ -151,5 +151,4 @@ class CTK_DICOM_CORE_EXPORT ctkDICOMServer : public QObject
   Q_DISABLE_COPY(ctkDICOMServer);
 };
 
-
 #endif
diff --git a/Libs/DICOM/Core/ctkDICOMStorageListenerJob.h b/Libs/DICOM/Core/ctkDICOMStorageListenerJob.h
@@ -27,6 +27,7 @@
 // Qt includes
 #include <QObject>
 #include <QSharedPointer>
+#include <QString>
 
 // ctkCore includes
 class ctkAbstractWorker;
-Original file line number
+Diff line change
@@ Expand Up @@
           return QString("");
         }
     }
     //------------------------------------------------------------------------------
     ctkAbstractJob* ctkDICOMQueryJob::clone() const
     {
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -151,5 +151,4 @@ class CTK_DICOM_CORE_EXPORT ctkDICOMServer : public QObject
		Q_DISABLE_COPY(ctkDICOMServer);
		};


		#endif