diff --git a/src/src/global/QGlobals.cpp b/src/src/Common/QGlobals.cpp similarity index 100% rename from src/src/global/QGlobals.cpp rename to src/src/Common/QGlobals.cpp diff --git a/src/src/global/QGlobals.h b/src/src/Common/QGlobals.h similarity index 100% rename from src/src/global/QGlobals.h rename to src/src/Common/QGlobals.h diff --git a/src/src/IO/DICOM/DicomLoader.h b/src/src/IO/DICOM/DicomLoader.h index 84861b7..08b87be 100644 --- a/src/src/IO/DICOM/DicomLoader.h +++ b/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> OrientationMapType; diff --git a/src/src/IO/General/ColorMapReader.h b/src/src/IO/General/ColorMapReader.h index 2f3084a..d10206c 100644 --- a/src/src/IO/General/ColorMapReader.h +++ b/src/src/IO/General/ColorMapReader.h @@ -9,7 +9,7 @@ #include #include #include -#include "QGlobals.h" +#include "Common/QGlobals.h" using namespace std; class ColorMapReader { diff --git a/src/src/Interaction/ActorDraggableInteractorStyle.cpp b/src/src/Interaction/ActorDraggableInteractorStyle.cpp index 17a8cd2..5562a0e 100644 --- a/src/src/Interaction/ActorDraggableInteractorStyle.cpp +++ b/src/src/Interaction/ActorDraggableInteractorStyle.cpp @@ -21,8 +21,8 @@ #include #include -#include "src/src/measure/DraggableActor.h" -#include "QGlobals.h" +#include "measure/DraggableActor.h" +#include "Common/QGlobals.h" vtkStandardNewMacro(ActorDraggableInteractorStyle) diff --git a/src/src/Rendering/infinitiViewer.h b/src/src/Rendering/infinitiViewer.h index 874f16a..1a2c749 100644 --- a/src/src/Rendering/infinitiViewer.h +++ b/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; diff --git a/src/src/base/SeriesImageSet.h b/src/src/base/SeriesImageSet.h index 5f60d65..3100c2c 100644 --- a/src/src/base/SeriesImageSet.h +++ b/src/src/base/SeriesImageSet.h @@ -1,5 +1,5 @@ #pragma once -#include "global/QGlobals.h" +#include "Common/QGlobals.h" #include #include #include diff --git a/src/src/measure/MeasureFactory.h b/src/src/measure/MeasureFactory.h index 4a8cbf4..110db56 100644 --- a/src/src/measure/MeasureFactory.h +++ b/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: diff --git a/src/src/view/subview/mytitlebar.cpp b/src/src/view/subview/mytitlebar.cpp index 32c6485..b85c2fc 100644 --- a/src/src/view/subview/mytitlebar.cpp +++ b/src/src/view/subview/mytitlebar.cpp @@ -3,7 +3,7 @@ #include #include #include -#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; diff --git a/src/src/view/thumbnailImage.cpp b/src/src/view/thumbnailImage.cpp index 0fc1267..d891baf 100644 --- a/src/src/view/thumbnailImage.cpp +++ b/src/src/view/thumbnailImage.cpp @@ -2,7 +2,7 @@ #include #include #include -#include "global/QGlobals.h" +#include "Common/QGlobals.h" #include "qstyleoption.h" #include "qpainter.h" #include "IO/DICOM/QDicomUtility.h" diff --git a/src/src/view/thumbnailImage.h b/src/src/view/thumbnailImage.h index 690a390..72a3bb0 100644 --- a/src/src/view/thumbnailImage.h +++ b/src/src/view/thumbnailImage.h @@ -4,7 +4,7 @@ //#include //#include //#include -#include "global/QGlobals.h" +#include "Common/QGlobals.h" #include #include #include diff --git a/src/src/view/thumbnailbarwidget.h b/src/src/view/thumbnailbarwidget.h index 748b32d..c4c7fef 100644 --- a/src/src/view/thumbnailbarwidget.h +++ b/src/src/view/thumbnailbarwidget.h @@ -6,7 +6,7 @@ #include #include #include -#include "global/QGlobals.h" +#include "Common/QGlobals.h" #include "QScrollArea.h" #include "view/thumbnailImage.h" diff --git a/src/src/view/viewcontainerwidget.cpp b/src/src/view/viewcontainerwidget.cpp index dafeb4d..23aa258 100644 --- a/src/src/view/viewcontainerwidget.cpp +++ b/src/src/view/viewcontainerwidget.cpp @@ -6,7 +6,7 @@ #include #include #include -#include "QGlobals.h" +#include "Common/QGlobals.h" #include #include "qstyleoption.h" #include "qpainter.h" diff --git a/src/src/view/viewcontainerwidget.h b/src/src/view/viewcontainerwidget.h index 50c0caf..4c78557 100644 --- a/src/src/view/viewcontainerwidget.h +++ b/src/src/view/viewcontainerwidget.h @@ -1,7 +1,7 @@ #pragma once #include #include -#include "global/QGlobals.h" +#include "Common/QGlobals.h" #include "dicomimageview.h" #include "ImageViewManager.h"