From 0897d8f2e758dc978fa12c22d0da0dbf3c50f741 Mon Sep 17 00:00:00 2001
From: Krad <kradchen123@163.com>
Date: Thu, 30 Jun 2022 16:40:50 +0800
Subject: [PATCH] Move DICOM Network classes to IO/Network package.

---
 src/src/{callback => IO/Network}/callbackhelper.cpp       | 2 +-
 src/src/{callback => IO/Network}/callbackhelper.h         | 0
 src/src/{callback => IO/Network}/cfindcallback.cpp        | 2 +-
 src/src/{callback => IO/Network}/cfindcallback.h          | 0
 src/src/{callback => IO/Network}/cmovecallback.cpp        | 2 +-
 src/src/{callback => IO/Network}/cmovecallback.h          | 0
 .../{callback => IO/Network}/cmovestorescpcallback.cpp    | 2 +-
 src/src/{callback => IO/Network}/cmovestorescpcallback.h  | 0
 src/src/{view/subview => IO/Network}/moveworker.cpp       | 2 +-
 src/src/{view/subview => IO/Network}/moveworker.h         | 6 +++---
 src/src/{view/subview => IO/Network}/queryworker.cpp      | 2 +-
 src/src/{view/subview => IO/Network}/queryworker.h        | 4 ++--
 src/src/UI/Widget/importwidget.cpp                        | 8 ++++----
 src/src/UI/Widget/importwidget.h                          | 4 ++--
 14 files changed, 17 insertions(+), 17 deletions(-)
 rename src/src/{callback => IO/Network}/callbackhelper.cpp (92%)
 rename src/src/{callback => IO/Network}/callbackhelper.h (100%)
 rename src/src/{callback => IO/Network}/cfindcallback.cpp (93%)
 rename src/src/{callback => IO/Network}/cfindcallback.h (100%)
 rename src/src/{callback => IO/Network}/cmovecallback.cpp (93%)
 rename src/src/{callback => IO/Network}/cmovecallback.h (100%)
 rename src/src/{callback => IO/Network}/cmovestorescpcallback.cpp (96%)
 rename src/src/{callback => IO/Network}/cmovestorescpcallback.h (100%)
 rename src/src/{view/subview => IO/Network}/moveworker.cpp (98%)
 rename src/src/{view/subview => IO/Network}/moveworker.h (89%)
 rename src/src/{view/subview => IO/Network}/queryworker.cpp (99%)
 rename src/src/{view/subview => IO/Network}/queryworker.h (95%)

diff --git a/src/src/callback/callbackhelper.cpp b/src/src/IO/Network/callbackhelper.cpp
similarity index 92%
rename from src/src/callback/callbackhelper.cpp
rename to src/src/IO/Network/callbackhelper.cpp
index 6273ae5..f37066d 100644
--- a/src/src/callback/callbackhelper.cpp
+++ b/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)
diff --git a/src/src/callback/callbackhelper.h b/src/src/IO/Network/callbackhelper.h
similarity index 100%
rename from src/src/callback/callbackhelper.h
rename to src/src/IO/Network/callbackhelper.h
diff --git a/src/src/callback/cfindcallback.cpp b/src/src/IO/Network/cfindcallback.cpp
similarity index 93%
rename from src/src/callback/cfindcallback.cpp
rename to src/src/IO/Network/cfindcallback.cpp
index ae2862c..7667c50 100644
--- a/src/src/callback/cfindcallback.cpp
+++ b/src/src/IO/Network/cfindcallback.cpp
@@ -1,4 +1,4 @@
-#include "callback/cfindcallback.h"
+#include "cfindcallback.h"
 
 CFindCallback::CFindCallback()
 	: dcm_cfind_callback()
diff --git a/src/src/callback/cfindcallback.h b/src/src/IO/Network/cfindcallback.h
similarity index 100%
rename from src/src/callback/cfindcallback.h
rename to src/src/IO/Network/cfindcallback.h
diff --git a/src/src/callback/cmovecallback.cpp b/src/src/IO/Network/cmovecallback.cpp
similarity index 93%
rename from src/src/callback/cmovecallback.cpp
rename to src/src/IO/Network/cmovecallback.cpp
index d9f5a6d..4f47d8c 100644
--- a/src/src/callback/cmovecallback.cpp
+++ b/src/src/IO/Network/cmovecallback.cpp
@@ -1,4 +1,4 @@
-#include "callback/cmovecallback.h"
+#include "cmovecallback.h"
 
 CMoveCallback::CMoveCallback()
 	: dcm_cmove_callback()
diff --git a/src/src/callback/cmovecallback.h b/src/src/IO/Network/cmovecallback.h
similarity index 100%
rename from src/src/callback/cmovecallback.h
rename to src/src/IO/Network/cmovecallback.h
diff --git a/src/src/callback/cmovestorescpcallback.cpp b/src/src/IO/Network/cmovestorescpcallback.cpp
similarity index 96%
rename from src/src/callback/cmovestorescpcallback.cpp
rename to src/src/IO/Network/cmovestorescpcallback.cpp
index d076200..e4af3ca 100644
--- a/src/src/callback/cmovestorescpcallback.cpp
+++ b/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)
diff --git a/src/src/callback/cmovestorescpcallback.h b/src/src/IO/Network/cmovestorescpcallback.h
similarity index 100%
rename from src/src/callback/cmovestorescpcallback.h
rename to src/src/IO/Network/cmovestorescpcallback.h
diff --git a/src/src/view/subview/moveworker.cpp b/src/src/IO/Network/moveworker.cpp
similarity index 98%
rename from src/src/view/subview/moveworker.cpp
rename to src/src/IO/Network/moveworker.cpp
index 5657b98..8e04870 100644
--- a/src/src/view/subview/moveworker.cpp
+++ b/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)
diff --git a/src/src/view/subview/moveworker.h b/src/src/IO/Network/moveworker.h
similarity index 89%
rename from src/src/view/subview/moveworker.h
rename to src/src/IO/Network/moveworker.h
index 9a08ea2..6e183aa 100644
--- a/src/src/view/subview/moveworker.h
+++ b/src/src/IO/Network/moveworker.h
@@ -3,9 +3,9 @@
 
 #include <QObject>
 #include "base/dicomviewertype.h"
-#include "callback/callbackhelper.h"
-#include "callback/cmovecallback.h"
-#include "callback/cmovestorescpcallback.h"
+#include "callbackhelper.h"
+#include "cmovecallback.h"
+#include "cmovestorescpcallback.h"
 
 
 class MoveWorker : public QObject
diff --git a/src/src/view/subview/queryworker.cpp b/src/src/IO/Network/queryworker.cpp
similarity index 99%
rename from src/src/view/subview/queryworker.cpp
rename to src/src/IO/Network/queryworker.cpp
index ca34ea2..85554a0 100644
--- a/src/src/view/subview/queryworker.cpp
+++ b/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)
diff --git a/src/src/view/subview/queryworker.h b/src/src/IO/Network/queryworker.h
similarity index 95%
rename from src/src/view/subview/queryworker.h
rename to src/src/IO/Network/queryworker.h
index 175588c..3226be5 100644
--- a/src/src/view/subview/queryworker.h
+++ b/src/src/IO/Network/queryworker.h
@@ -2,8 +2,8 @@
 #define _QUERYWORKER_H_
 
 #include <QObject>
-#include "callback/callbackhelper.h"
-#include "callback/cfindcallback.h"
+#include "callbackhelper.h"
+#include "cfindcallback.h"
 #include "base/dicomviewertype.h"
 
 class DcmDataset;
diff --git a/src/src/UI/Widget/importwidget.cpp b/src/src/UI/Widget/importwidget.cpp
index 5e5fe84..d1e18d3 100644
--- a/src/src/UI/Widget/importwidget.cpp
+++ b/src/src/UI/Widget/importwidget.cpp
@@ -16,13 +16,13 @@
 #include <QProgressBar>
 #include <QProgressBar>
 #include "UI/Dialog/promptdialog.h"
-#include "callback/cfindcallback.h"
-#include "callback/callbackhelper.h"
+#include "IO/Network/cfindcallback.h"
+#include "IO/Network/callbackhelper.h"
 #include "base/dicomviewerhelper.h"
 #include "dcmtk/dcmdata/dcdatset.h"
 #include "dcm_move.h"
-#include "callback/cmovecallback.h"
-#include "callback/cmovestorescpcallback.h"
+#include "IO/Network/cmovecallback.h"
+#include "IO/Network/cmovestorescpcallback.h"
 
 ImportWidget::ImportWidget(QWidget *parent)
 	: QDialog(parent)
diff --git a/src/src/UI/Widget/importwidget.h b/src/src/UI/Widget/importwidget.h
index 762cd37..7734be2 100644
--- a/src/src/UI/Widget/importwidget.h
+++ b/src/src/UI/Widget/importwidget.h
@@ -8,8 +8,8 @@
 #include <QThread>
 #include "base/dicomviewerhelper.h"
 #include "base/dicomviewertype.h"
-#include "queryworker.h"
-#include "moveworker.h"
+#include "IO/Network/queryworker.h"
+#include "IO/Network/moveworker.h"
 #include "radiusprogressbar.h"
 //#include "radiusprogressbar.h"