Move widgets to UI/Widget package. 2

src/src/UI/Widget/dicomimageview.cpp

@@ -1,7 +1,7 @@
-#include "view/dicomimageview.h"
+#include "dicomimageview.h"
 #include <QMessageBox>
 #include <QDebug>
-#include "view/thumbnailImage.h"
+#include "thumbnailImage.h"
 #include <vtkRenderer.h>
 #include <vtkCamera.h>
 #include <vtkInteractorStyleImage.h>

src/src/UI/Widget/thumbnailImage.cpp

@@ -1,4 +1,4 @@
-#include "view/thumbnailImage.h"
+#include "thumbnailImage.h"
 #include <QPalette>
 #include <QApplication>
 #include <QPainter>

src/src/UI/Widget/thumbnailbarwidget.cpp

@@ -1,4 +1,4 @@
-#include "view/thumbnailbarwidget.h"
+#include "thumbnailbarwidget.h"
 #include "IO/DICOM/DicomLoader.h"
 #include "base/SeriesImageSet.h"
 #include <QTimer>
@@ -6,7 +6,7 @@
 #include <QDebug>
 #include <QPixmap>
 
-#include "view/dicomimageview.h"
+#include "dicomimageview.h"
 #include "qstyleoption.h"
 #include "qpainter.h"
 /************************************************************************

src/src/UI/Widget/thumbnailbarwidget.h

@@ -7,8 +7,8 @@
 #include <QThread>
 #include <QLabel>
 #include "Common/QGlobals.h"
-#include "QScrollArea.h"
-#include "view/thumbnailImage.h"
+#include "qscrollarea.h"
+#include "thumbnailImage.h"
 
 class SeriesImageSet;
 class DicomImageView;

src/src/UI/Window/customwindow.cpp

@@ -1,5 +1,5 @@
 #include "customwindow.h"
-#include "view/dicomimageview.h"
+#include "UI/Widget/dicomimageview.h"
 
 Customwindow::Customwindow(QWidget *parent)
 	: QDialog(parent)

src/src/base/SeriesImageSet.cpp

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

src/src/cine/pqVCRController.h

@@ -37,7 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <QObject>
 #include <QPointer>
 #include <QTimer>
-#include "DicomImageView.h"
+#include "UI/Widget/dicomimageview.h"
 // pqVCRController is the QObject that encapsulates the
 // VCR control functionality.
 // It provides a slot to set the scene that this object

src/src/cine/pqVCRToolbar.cxx

@@ -1,7 +1,7 @@
 #include "cine/pqVCRToolbar.h"
 #include "cine/pqVCRController.h"
 #include <QThread>
-#include "DicomImageView.h"
+#include "UI/Widget/dicomimageview.h"
 QString stylesheet =
 "QToolBar#vcr_toolbar{border:1px solid grey;}"
 "QSpinBox#spinFPS{background-color:transparent;border:0px;height:30px;width:30px;color:#a7d28c;font:bold 14px;}"

src/src/export/exportdialog.h

@@ -7,7 +7,7 @@
 #include "dicomexporterthread.h"
 #include "QFileDialog"
 #include "IO/DICOM/DicomLoader.h"
-#include "dicomimageview.h"
+#include "UI/Widget/dicomimageview.h"
 
 
 

src/src/measure/pqFontPropertyWidget.cpp

@@ -1,5 +1,5 @@
 #include "pqFontPropertyWidget.h"
-#include "dicomimageview.h"
+#include "UI/Widget/dicomimageview.h"
 #include <vtkRenderWindowInteractor.h>
 #include "QColorDialog.h"
 //#include "QFontDialog.h"

src/src/view/ImageViewManager.h

@@ -6,7 +6,7 @@
 #define OMEGAV_IMAGEVIEWMANAGER_H
 #include <QObject>
 #include <QList>
-#include "dicomimageview.h"
+#include "UI/Widget/dicomimageview.h"
 
 
 class ImageViewManager:public QObject {