Move QGlobals to Common package.

src/src/IO/DICOM/DicomLoader.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "global/QGlobals.h"
+#include "Common/QGlobals.h"
 
 using namespace std;
 typedef std::map<std::string,std::vector<std::string>> OrientationMapType;

src/src/IO/General/ColorMapReader.h

@@ -9,7 +9,7 @@
 #include <string>
 #include <unordered_map>
 #include <QtCore/QJsonDocument>
-#include "QGlobals.h"
+#include "Common/QGlobals.h"
 
 using namespace std;
 class ColorMapReader {

src/src/Interaction/ActorDraggableInteractorStyle.cpp

@@ -21,8 +21,8 @@
 #include <vtkImageProperty.h>
 #include <vtkPointData.h>
 
-#include "src/src/measure/DraggableActor.h"
+#include "measure/DraggableActor.h"
-#include "QGlobals.h"
+#include "Common/QGlobals.h"
 
 vtkStandardNewMacro(ActorDraggableInteractorStyle)
 

src/src/Rendering/infinitiViewer.h

@@ -11,7 +11,7 @@
 //for convert vtkEvent to Qt signal
 #include "Events/vtkSignalRaiser.h"
 #include "measure\RulerLegendActor.h"
-#include "global\QGlobals.h"
+#include "Common/QGlobals.h"
 
 class vtkAlgorithm;
 class vtkAlgorithmOutput;

src/src/base/SeriesImageSet.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "global/QGlobals.h"
+#include "Common/QGlobals.h"
 #include <memory>
 #include <vtkImageData.h>
 #include <vtkSmartPointer.h>

src/src/measure/MeasureFactory.h

@@ -6,7 +6,7 @@
 #define OMEGAV_MEASUREFACTORY_H
 
 #include "Measure.h"
-#include "QGlobals.h"
+#include "Common/QGlobals.h"
 
 class MeasureFactory {
 public:

src/src/view/subview/mytitlebar.cpp

@@ -3,7 +3,7 @@
 #include <QPainter>
 #include <QFile>
 #include <QMouseEvent>
-#include "global/QGlobals.h"
+#include "Common/QGlobals.h"
 #define  BUTTON_HEIGHT 15 // Button height;
 #define  BUTTON_WIDTH 15 // Button width;
 #define  TITLE_HEIGHT 15 // Title bar height;

src/src/view/thumbnailImage.cpp

@@ -2,7 +2,7 @@
 #include <QPalette>
 #include <QApplication>
 #include <QPainter>
-#include "global/QGlobals.h"
+#include "Common/QGlobals.h"
 #include "qstyleoption.h"
 #include "qpainter.h"
 #include "IO/DICOM/QDicomUtility.h"

src/src/view/thumbnailImage.h

@@ -4,7 +4,7 @@
 //#include <QtWidgets/QLabel>
 //#include <QtWidgets/QVBoxLayout>
 //#include <QtWidgets/QWidget>
-#include "global/QGlobals.h"
+#include "Common/QGlobals.h"
 #include <QFrame>
 #include <QDrag>
 #include <QDragEnterEvent>

src/src/view/thumbnailbarwidget.h

@@ -6,7 +6,7 @@
 #include <QPointer>
 #include <QThread>
 #include <QLabel>
-#include "global/QGlobals.h"
+#include "Common/QGlobals.h"
 #include "QScrollArea.h"
 #include "view/thumbnailImage.h"
 

src/src/view/viewcontainerwidget.cpp

@@ -6,7 +6,7 @@
 #include <QSettings>
 #include <QFontDialog>
 #include <QVTKOpenGLNativeWidget.h>
-#include "QGlobals.h"
+#include "Common/QGlobals.h"
 #include <QDebug>
 #include "qstyleoption.h"
 #include "qpainter.h"

src/src/view/viewcontainerwidget.h

@@ -1,7 +1,7 @@
 #pragma once
 #include <QFrame>
 #include <QScrollBar>
-#include "global/QGlobals.h"
+#include "Common/QGlobals.h"
 #include "dicomimageview.h"
 #include "ImageViewManager.h"