Re #14911 include fix

MantidPlot/CMakeLists.txt

@@ -691,8 +691,6 @@ include_directories ( src/lib/3rdparty/qtcolorpicker/src )
 include_directories ( ../QtPropertyBrowser/src )
 include_directories ( ../MantidQt/API/inc )
 include_directories ( ../MantidQt/MantidWidgets/inc )
-include_directories ( ../MantidQt/MantidWidgets/inc/MantidQtMantidWidgets)
-include_directories ( ../MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/InstrumentView)
 include_directories ( ../MantidQt/SliceViewer/inc )
 include_directories ( ../MantidQt/SpectrumViewer/inc )
 include_directories ( ../MantidQt/Factory/inc )

MantidPlot/src/AxesDialog.cpp

@@ -38,7 +38,7 @@ Description          : General plot options dialog
 #include "ColorButton.h"
 #include "TextFormatButtons.h"
 #include "Table.h"
-#include "DoubleSpinBox.h"
+#include "MantidQtMantidWidgets/DoubleSpinBox.h"
 #include "ScaleDraw.h"
 #include <float.h>
 

MantidPlot/src/AxisDetails.cpp

@@ -4,7 +4,7 @@
 
 #include "AxisDetails.h"
 #include "ApplicationWindow.h"
-#include "DoubleSpinBox.h"
+#include "MantidQtMantidWidgets/DoubleSpinBox.h"
 #include <qwt_scale_widget.h>
 //#include <qwt_plot.h>
 #include "MantidQtAPI/qwt_compat.h"

MantidPlot/src/ConfigDialog.cpp

@@ -34,7 +34,7 @@ Description          : Preferences dialog
 #include "ColorButton.h"
 #include "ColorBox.h"
 #include "pixmaps.h"
-#include "DoubleSpinBox.h"
+#include "MantidQtMantidWidgets/DoubleSpinBox.h"
 #include "SendToProgramDialog.h"
 #include "Mantid/MantidUI.h"
 #include "MantidQtMantidWidgets/FitPropertyBrowser.h"

MantidPlot/src/ContourLinesEditor.cpp

@@ -26,7 +26,7 @@
  *                                                                         *
  ***************************************************************************/
 #include "ContourLinesEditor.h"
-#include "DoubleSpinBox.h"
+#include "MantidQtMantidWidgets/DoubleSpinBox.h"
 #include "Spectrogram.h"
 #include "PenStyleBox.h"
 #include "ColorButton.h"

MantidPlot/src/FitDialog.cpp

@@ -40,7 +40,7 @@
 #include "SigmoidalFit.h"
 #include "LogisticFit.h"
 #include "Matrix.h"
-#include "DoubleSpinBox.h"
+#include "MantidQtMantidWidgets/DoubleSpinBox.h"
 
 #include <QListWidget>
 #include <QTableWidget>

MantidPlot/src/GridDetails.cpp

@@ -9,7 +9,7 @@
 #include "MantidQtAPI/qwt_compat.h"
 #include "Plot.h"
 #include "MantidQtAPI/ScaleEngine.h"
-#include "DoubleSpinBox.h"
+#include "MantidQtMantidWidgets/DoubleSpinBox.h"
 
 #include <QWidget>
 #include <QCheckBox>

MantidPlot/src/GridDetails.h

@@ -30,7 +30,7 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
 
 #include <QWidget>
 #include <QList>
-#include <DoubleSpinBox.h>
+#include <MantidQtMantidWidgets/DoubleSpinBox.h>
 class ApplicationWindow;
 class Graph;
 class QCheckBox;

MantidPlot/src/IntDialog.cpp

@@ -30,7 +30,7 @@
 #include "ApplicationWindow.h"
 #include "Graph.h"
 #include "Integration.h"
-#include "DoubleSpinBox.h"
+#include "MantidQtMantidWidgets/DoubleSpinBox.h"
 
 #include <QGroupBox>
 #include <QSpinBox>

MantidPlot/src/LineDialog.cpp

@@ -32,7 +32,7 @@
 #include "Graph.h"
 #include "Plot.h"
 #include "ApplicationWindow.h"
-#include "DoubleSpinBox.h"
+#include "MantidQtMantidWidgets/DoubleSpinBox.h"
 
 #include <qwt_plot.h>
 

MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindow.cpp

@@ -4,8 +4,8 @@
 #include "MantidAPI/Workspace.h"
 #include "TSVSerialiser.h"
 
-#include <InstrumentWidget.h>
-#include <ProjectionSurface.h>
+#include <MantidQtMantidWidgets/InstrumentView/InstrumentWidget.h>
+#include <MantidQtMantidWidgets/InstrumentView/ProjectionSurface.h>
 
 using namespace Mantid::API;
 using namespace MantidQt::MantidWidgets;

MantidPlot/src/MatrixSizeDialog.cpp

@@ -28,7 +28,7 @@
  ***************************************************************************/
 #include "MatrixSizeDialog.h"
 #include "MatrixCommand.h"
-#include "DoubleSpinBox.h"
+#include "MantidQtMantidWidgets/DoubleSpinBox.h"
 
 #include <QPushButton>
 #include <QLabel>

MantidPlot/src/PlotDialog.cpp

@@ -43,7 +43,7 @@
 #include "QwtPieCurve.h"
 #include "ColorMapEditor.h"
 #include "pixmaps.h"
-#include "DoubleSpinBox.h"
+#include "MantidQtMantidWidgets/DoubleSpinBox.h"
 #include "Folder.h"
 #include "ContourLinesEditor.h"
 #include "PenStyleBox.h"

MantidPlot/src/ScaleDetails.cpp

@@ -4,7 +4,7 @@
 
 #include "ScaleDetails.h"
 #include "ApplicationWindow.h"
-#include "DoubleSpinBox.h"
+#include "MantidQtMantidWidgets/DoubleSpinBox.h"
 #include <qwt_scale_widget.h>
 //#include <qwt_plot.h>
 #include "MantidQtAPI/qwt_compat.h"

MantidPlot/src/Spectrogram.h

@@ -42,7 +42,7 @@
 #include "MantidAPI/IMDWorkspace.h"
 #include "MantidQtAPI/MantidColorMap.h"
 #include "MantidQtAPI/WorkspaceObserver.h"
-#include <InstrumentWidget.h>
+#include <MantidQtMantidWidgets/InstrumentView/InstrumentWidget.h>
 
 #include <fstream>
 #include <float.h>

MantidPlot/src/lib/src/ColorMapEditor.cpp

@@ -26,7 +26,7 @@
  *                                                                         *
  ***************************************************************************/
 #include "ColorMapEditor.h"
-#include "DoubleSpinBox.h"
+#include "MantidQtMantidWidgets/DoubleSpinBox.h"
 
 #include <QPushButton>
 #include <QTableWidget>

MantidQt/MantidWidgets/CMakeLists.txt

@@ -265,8 +265,6 @@ include(${QT_USE_FILE})
 include_directories ( ../../QtPropertyBrowser/src )
 include_directories ( ../../MantidQt/API/inc )
 include_directories ( ../../MantidQt/MantidWidgets/inc )
-include_directories ( ../../MantidQt/MantidWidgets/inc/MantidQtMantidWidgets )
-include_directories ( ../../MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/InstrumentView )
 include_directories ( ../../MantidQt/SliceViewer/inc )
 include_directories ( ../../MantidQt/SpectrumViewer/inc )
 include_directories ( ../../MantidQt/Factory/inc )

MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/InstrumentView/InstrumentActor.h

 #ifndef INSTRUMENTACTOR_H_
 #define INSTRUMENTACTOR_H_
 
-#include "WidgetDllOption.h"
+#include "MantidQtMantidWidgets/WidgetDllOption.h"
 #include "GLColor.h"
 #include "GLActor.h"
 #include "GLActorCollection.h"

MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/InstrumentView/InstrumentTreeWidget.h

@@ -4,7 +4,7 @@
 //---------------------------------------
 // Includes
 //--------------------------------------
-#include <WidgetDllOption.h>
+#include <MantidQtMantidWidgets/WidgetDllOption.h>
 #include <QTreeView>
 #include "InstrumentTreeModel.h"
 #include "MantidGeometry/IComponent.h"

MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/InstrumentView/InstrumentWidget.h

@@ -3,7 +3,7 @@
 
 #include "InstrumentWidgetTypes.h"
 #include "MantidGLWidget.h"
-#include <WidgetDllOption.h>
+#include <MantidQtMantidWidgets/WidgetDllOption.h>
 
 #include "MantidAPI/AlgorithmObserver.h"
 #include "MantidAPI/IPeaksWorkspace_fwd.h"