diff --git a/Code/Mantid/MantidPlot/src/AxesDialog.cpp b/Code/Mantid/MantidPlot/src/AxesDialog.cpp index 861a010e16a3d79023cbe3bfecafde66992d8355..8374423bd7dc35aff7b01549bbe696f2de6454ff 100644 --- a/Code/Mantid/MantidPlot/src/AxesDialog.cpp +++ b/Code/Mantid/MantidPlot/src/AxesDialog.cpp @@ -26,7 +26,7 @@ Description : General plot options dialog * Boston, MA 02110-1301 USA * * * ***************************************************************************/ -#include "qwt_compat.h" +#include "MantidQtAPI/qwt_compat.h" #include "AxesDialog.h" #include "ApplicationWindow.h" #include "TextDialog.h" diff --git a/Code/Mantid/MantidPlot/src/AxisDetails.cpp b/Code/Mantid/MantidPlot/src/AxisDetails.cpp index badf90ceef098fc9dfedab09401074077cbcfd6a..dcb1f34fadca616f0839715dec659387ddc6afea 100644 --- a/Code/Mantid/MantidPlot/src/AxisDetails.cpp +++ b/Code/Mantid/MantidPlot/src/AxisDetails.cpp @@ -7,7 +7,7 @@ #include "DoubleSpinBox.h" #include <qwt_scale_widget.h> //#include <qwt_plot.h> -#include "qwt_compat.h" +#include "MantidQtAPI/qwt_compat.h" #include "MyParser.h" #include "Plot.h" #include "plot2D/ScaleEngine.h" diff --git a/Code/Mantid/MantidPlot/src/Graph.cpp b/Code/Mantid/MantidPlot/src/Graph.cpp index c6fe0465feb4979e2d24006ffffcd0ab2de702cc..4925fffb45778cab79405c3a746c8f2b5a440163 100644 --- a/Code/Mantid/MantidPlot/src/Graph.cpp +++ b/Code/Mantid/MantidPlot/src/Graph.cpp @@ -27,7 +27,7 @@ * * ***************************************************************************/ -#include "qwt_compat.h" +#include "MantidQtAPI/qwt_compat.h" #include <QVarLengthArray> #include "pixmaps.h" diff --git a/Code/Mantid/MantidPlot/src/GridDetails.cpp b/Code/Mantid/MantidPlot/src/GridDetails.cpp index 3bf7273153d9b9c7809e9a8bdd61103562060bf8..8bc7b60434b9376322c6cb7e5da6fd31ea67c667 100644 --- a/Code/Mantid/MantidPlot/src/GridDetails.cpp +++ b/Code/Mantid/MantidPlot/src/GridDetails.cpp @@ -6,7 +6,7 @@ #include "ApplicationWindow.h" #include <qwt_scale_widget.h> //#include <qwt_plot.h> -#include "qwt_compat.h" +#include "MantidQtAPI/qwt_compat.h" #include "Plot.h" #include "plot2D/ScaleEngine.h" #include "DoubleSpinBox.h" diff --git a/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/OneCurvePlot.cpp b/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/OneCurvePlot.cpp index a91d3c8cb4c08e57d1dd2201dfba25028e810563..ea8e944da9099156c470d2fd8454272e96f7891b 100644 --- a/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/OneCurvePlot.cpp +++ b/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/OneCurvePlot.cpp @@ -6,7 +6,7 @@ #include <qwt_scale_engine.h> #include <qwt_scale_draw.h> #include <qwt_plot_canvas.h> -#include <qwt_compat.h> +#include <MantidQtAPI/qwt_compat.h> #include <qwt_plot_zoomer.h> #include <qwt_scale_widget.h> diff --git a/Code/Mantid/MantidPlot/src/Plot.cpp b/Code/Mantid/MantidPlot/src/Plot.cpp index e44b275dd3b8b95d2ff58230fb4b53936aea3d36..7983e7e10631d7607f89e5af491bb9379edfcfbc 100644 --- a/Code/Mantid/MantidPlot/src/Plot.cpp +++ b/Code/Mantid/MantidPlot/src/Plot.cpp @@ -26,7 +26,7 @@ * Boston, MA 02110-1301 USA * * * ***************************************************************************/ -#include "qwt_compat.h" +#include "MantidQtAPI/qwt_compat.h" #include "Plot.h" #include "Graph.h" #include "Grid.h" diff --git a/Code/Mantid/MantidPlot/src/ScaleDetails.cpp b/Code/Mantid/MantidPlot/src/ScaleDetails.cpp index c31fc4179e748d79c12ae6a6d0c497fd9ffa40df..ef0cec7f03732ec466c6205dbe69e7cfcb3a5a82 100644 --- a/Code/Mantid/MantidPlot/src/ScaleDetails.cpp +++ b/Code/Mantid/MantidPlot/src/ScaleDetails.cpp @@ -7,7 +7,7 @@ #include "DoubleSpinBox.h" #include <qwt_scale_widget.h> //#include <qwt_plot.h> -#include "qwt_compat.h" +#include "MantidQtAPI/qwt_compat.h" #include "Plot.h" #include "plot2D/ScaleEngine.h" diff --git a/Code/Mantid/MantidPlot/src/Spectrogram.cpp b/Code/Mantid/MantidPlot/src/Spectrogram.cpp index 8df0e9d881cc4aff5edb06416d51edce004e2c7c..ece80d7b100332f706b13ad4a60a7d516e7de05b 100644 --- a/Code/Mantid/MantidPlot/src/Spectrogram.cpp +++ b/Code/Mantid/MantidPlot/src/Spectrogram.cpp @@ -25,7 +25,7 @@ * Boston, MA 02110-1301 USA * * * ***************************************************************************/ -#include "qwt_compat.h" +#include "MantidQtAPI/qwt_compat.h" #include "Spectrogram.h" #include <math.h> #include <QPen> diff --git a/Code/Mantid/MantidPlot/src/plot2D/PowerScaleEngine.cpp b/Code/Mantid/MantidPlot/src/plot2D/PowerScaleEngine.cpp index 4fdae03130efca60095e7f65a973b0ed53e399f3..9f6a276f296cf92c0cbcc78f0d9ef2c6ac446e58 100644 --- a/Code/Mantid/MantidPlot/src/plot2D/PowerScaleEngine.cpp +++ b/Code/Mantid/MantidPlot/src/plot2D/PowerScaleEngine.cpp @@ -28,7 +28,7 @@ ***************************************************************************/ #include "PowerScaleEngine.h" -#include "qwt_compat.h" +#include "MantidQtAPI/qwt_compat.h" /*! Return a dummy transformation diff --git a/Code/Mantid/MantidPlot/src/plot2D/ScaleEngine.cpp b/Code/Mantid/MantidPlot/src/plot2D/ScaleEngine.cpp index 75e2e3d9d3b9e0afaacb404c7c685f82372cf4c3..1f51fdadad10118285ea24cb19720aa8b4164575 100644 --- a/Code/Mantid/MantidPlot/src/plot2D/ScaleEngine.cpp +++ b/Code/Mantid/MantidPlot/src/plot2D/ScaleEngine.cpp @@ -28,7 +28,7 @@ ***************************************************************************/ #include "ScaleEngine.h" #include "PowerScaleEngine.h" -#include "qwt_compat.h" +#include "MantidQtAPI/qwt_compat.h" #include <limits.h> QwtScaleTransformation* ScaleEngine::transformation() const diff --git a/Code/Mantid/MantidPlot/src/qwt_compat.h b/Code/Mantid/MantidPlot/src/qwt_compat.h deleted file mode 100644 index f6d05c7c30c5ef607df7646cff77d5a39664e64f..0000000000000000000000000000000000000000 --- a/Code/Mantid/MantidPlot/src/qwt_compat.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef MANTID_QWT_COMPAT -#define MANTID_QWT_COMPAT - -#include <qwt_global.h> - -#if QWT_VERSION >= 0x050200 -// FAA 11/04/2010: QWT 5.2.0 changed some member functions -// QwtScaleEngine -// loMargin/hiMargin renamed to lowerMargin/upperMargin -// QwtScaleDiv -// lBound/hBound renamed to lowerBound/upperBound -# define lBound() lowerBound() -# define hBound() upperBound() -# define loMargin() lowerMargin() -# define hiMargin() upperMargin() -#else -# define lowerMargin() loMargin() -# define upperMargin() hiMargin() -#endif /* QWT_VERSION >= 0x050200 */ - -#endif /* MANTID_QWT_COMPAT */