Move DICOM Network classes to IO/Network package.

src/src/IO/Network/callbackhelper.cpp

@@ -1,4 +1,4 @@
-#include "callback/callbackhelper.h"
+#include "callbackhelper.h"
 #include "dcmtk/dcmdata/dcdatset.h"
 
 CallbackHelper::CallbackHelper(QObject *parent)

src/src/IO/Network/cfindcallback.cpp

@@ -1,4 +1,4 @@
-#include "callback/cfindcallback.h"
+#include "cfindcallback.h"
 
 CFindCallback::CFindCallback()
 	: dcm_cfind_callback()

src/src/IO/Network/cmovecallback.cpp

@@ -1,4 +1,4 @@
-#include "callback/cmovecallback.h"
+#include "cmovecallback.h"
 
 CMoveCallback::CMoveCallback()
 	: dcm_cmove_callback()

src/src/IO/Network/cmovestorescpcallback.cpp

@@ -1,4 +1,4 @@
-#include "callback/cmovestorescpcallback.h"
+#include "cmovestorescpcallback.h"
 #include "base/dicomviewerhelper.h"
 
 CMoveStoreSCPCallback::CMoveStoreSCPCallback(std::string outDirectory)

src/src/IO/Network/moveworker.cpp

@@ -1,4 +1,4 @@
-#include "view/subview/moveworker.h"
+#include "moveworker.h"
 
 MoveWorker::MoveWorker(const QString& peerIP, unsigned long long peerPort, const QString& peerTitle, unsigned long long ourPort, const QString& ourTitle, const QString& outputDirectory, QObject *parent)
 	: QObject(parent)

src/src/IO/Network/moveworker.h

@@ -3,9 +3,9 @@
 
 #include <QObject>
 #include "base/dicomviewertype.h"
-#include "callback/callbackhelper.h"
+#include "callbackhelper.h"
-#include "callback/cmovecallback.h"
+#include "cmovecallback.h"
-#include "callback/cmovestorescpcallback.h"
+#include "cmovestorescpcallback.h"
 
 
 class MoveWorker : public QObject

src/src/IO/Network/queryworker.cpp

@@ -1,4 +1,4 @@
-#include "view/subview/queryworker.h"
+#include "queryworker.h"
 #include "dcmtk/dcmdata/dcdatset.h"
 
 QueryWorker::QueryWorker(const QString& peerIP, unsigned long peerPort, const QString& peerTitle, const QString& ourTitle, QObject *parent)

src/src/IO/Network/queryworker.h

@@ -2,8 +2,8 @@
 #define _QUERYWORKER_H_
 
 #include <QObject>
-#include "callback/callbackhelper.h"
+#include "callbackhelper.h"
-#include "callback/cfindcallback.h"
+#include "cfindcallback.h"
 #include "base/dicomviewertype.h"
 
 class DcmDataset;

src/src/UI/Widget/importwidget.cpp

@@ -16,13 +16,13 @@
 #include <QProgressBar>
 #include <QProgressBar>
 #include "UI/Dialog/promptdialog.h"
-#include "callback/cfindcallback.h"
+#include "IO/Network/cfindcallback.h"
-#include "callback/callbackhelper.h"
+#include "IO/Network/callbackhelper.h"
 #include "base/dicomviewerhelper.h"
 #include "dcmtk/dcmdata/dcdatset.h"
 #include "dcm_move.h"
-#include "callback/cmovecallback.h"
+#include "IO/Network/cmovecallback.h"
-#include "callback/cmovestorescpcallback.h"
+#include "IO/Network/cmovestorescpcallback.h"
 
 ImportWidget::ImportWidget(QWidget *parent)
 	: QDialog(parent)

src/src/UI/Widget/importwidget.h

@@ -8,8 +8,8 @@
 #include <QThread>
 #include "base/dicomviewerhelper.h"
 #include "base/dicomviewertype.h"
-#include "queryworker.h"
+#include "IO/Network/queryworker.h"
-#include "moveworker.h"
+#include "IO/Network/moveworker.h"
 #include "radiusprogressbar.h"
 //#include "radiusprogressbar.h"