Move base/ classes to Common package.

src/src/Common/SeriesImageSet.cpp

@@ -1,4 +1,4 @@
-#include "base/SeriesImageSet.h"
+#include "SeriesImageSet.h"
 #include <vtkRendererCollection.h>
 #include "UI/Widget/dicomimageview.h"
 #include "IO/DICOM/DicomLoader.h"

src/src/Common/dicomviewerhelper.cpp

@@ -1,4 +1,4 @@
-#include "base/dicomviewerhelper.h"
+#include "dicomviewerhelper.h"
 #include <QFile>
 #include <QApplication>
 

src/src/IO/DICOM/DicomLoader.cpp

@@ -1,6 +1,6 @@
 #include "DicomLoader.h"
 
-#include "base/SeriesImageSet.h"
+#include "Common/SeriesImageSet.h"
 #include "DICOMDirectoryHelper.h"
 #include "ExtendMedicalImageProperties.h"
 #include "vtkDICOMImageReader2.h"

src/src/IO/Export/dicomexporter.cpp

@@ -1,5 +1,5 @@
 #include "dicomexporter.h"
-#include "SeriesImageSet.h"
+#include "Common/SeriesImageSet.h"
 
 
 DicomExporter::DicomExporter(QObject *parent) 

src/src/IO/Network/cmovestorescpcallback.cpp

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

src/src/IO/Network/moveworker.h

@@ -2,7 +2,7 @@
 #define _MOVEWORKER_H_
 
 #include <QObject>
-#include "base/dicomviewertype.h"
+#include "Common/dicomviewertype.h"
 #include "callbackhelper.h"
 #include "cmovecallback.h"
 #include "cmovestorescpcallback.h"

src/src/IO/Network/queryworker.h

@@ -4,7 +4,7 @@
 #include <QObject>
 #include "callbackhelper.h"
 #include "cfindcallback.h"
-#include "base/dicomviewertype.h"
+#include "Common/dicomviewertype.h"
 
 class DcmDataset;
 

src/src/UI/Widget/dicomimageview.h

@@ -3,7 +3,7 @@
 #include <QOpenGLWidget>
 #include "UI/Widget/ClickableScrollBar.h"
 #include <QGridLayout>
-#include "base/SeriesImageSet.h"
+#include "Common/SeriesImageSet.h"
 #include <QThread>
 #include "Rendering/infinitiViewer.h"
 

src/src/UI/Widget/importwidget.cpp

@@ -18,7 +18,7 @@
 #include "UI/Dialog/promptdialog.h"
 #include "IO/Network/cfindcallback.h"
 #include "IO/Network/callbackhelper.h"
-#include "base/dicomviewerhelper.h"
+#include "Common/dicomviewerhelper.h"
 #include "dcmtk/dcmdata/dcdatset.h"
 #include "dcm_move.h"
 #include "IO/Network/cmovecallback.h"

src/src/UI/Widget/importwidget.h

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

src/src/UI/Widget/pacsconfiguration.h

@@ -3,7 +3,7 @@
 
 #include <QDialog>
 #include <QStringList>
-#include "base/dicomviewerhelper.h"
+#include "Common/dicomviewerhelper.h"
 
 class QVBoxLayout;
 class QHBoxLayout;
@@ -95,7 +95,7 @@ private:
 	PromptDialog *m_pMsgDialog;
 
 	QList<host> m_lHosts;
-	QList<host> m_lHostsNew; // <20><><EFBFBD><EFBFBD><EFBFBD>м<EFBFBD><EFBFBD><EFBFBD><EFBFBD>˲<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Cancel<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD>м<EFBFBD><EFBFBD>IJ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɣ<EFBFBD>lol
+	QList<host> m_lHostsNew; // <20><><EFBFBD><EFBFBD>м<EFBFBD><D0BC><EFBFBD><EFBFBD>˲<EFBFBD><CBB2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Cancel<65><6C><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD>м<EFBFBD>IJ<EFBFBD><C4B2><EFBFBD><EFBFBD>ɣ<EFBFBD>lol
 	
 private:
 	struct

src/src/UI/Widget/thumbnailbarwidget.cpp

@@ -1,6 +1,6 @@
 #include "thumbnailbarwidget.h"
 #include "IO/DICOM/DicomLoader.h"
-#include "base/SeriesImageSet.h"
+#include "Common/SeriesImageSet.h"
 #include <QTimer>
 #include <QDir>
 #include <QDebug>