diff --git a/MantidPlot/CMakeLists.txt b/MantidPlot/CMakeLists.txt index 10cca32934b8b76e1f7632b0e85fdf8533a38b38..8650d0f9b2e2ff5f1564e0ee9a21dba69a014426 100644 --- a/MantidPlot/CMakeLists.txt +++ b/MantidPlot/CMakeLists.txt @@ -131,7 +131,6 @@ set ( QTIPLOT_SRCS src/ApplicationWindow.cpp src/TiledWindow.cpp src/TitlePicker.cpp src/TranslateCurveTool.cpp - src/TSVSerialiser.cpp src/UserFunction.cpp src/VectorCurve.cpp src/WindowFactory.cpp @@ -333,7 +332,6 @@ set ( QTIPLOT_HDRS src/ApplicationWindow.h src/TiledWindow.h src/TitlePicker.h src/TranslateCurveTool.h - src/TSVSerialiser.h src/UserFunction.h src/VectorCurve.h src/WindowFactory.h diff --git a/MantidPlot/src/ApplicationWindow.cpp b/MantidPlot/src/ApplicationWindow.cpp index 99edf1a3baa7f48a793e27976c5b3660515e1475..6b5860ab26be06b6e6391722620f76863fa8e7ec 100644 --- a/MantidPlot/src/ApplicationWindow.cpp +++ b/MantidPlot/src/ApplicationWindow.cpp @@ -112,7 +112,7 @@ #include "DataPickerTool.h" #include "TiledWindow.h" #include "DockedWindow.h" -#include "TSVSerialiser.h" +#include "MantidQtAPI/TSVSerialiser.h" #include "ProjectSerialiser.h" // TODO: move tool-specific code to an extension manager diff --git a/MantidPlot/src/Graph.cpp b/MantidPlot/src/Graph.cpp index a0073969f7e202e324e8dceb3f8edf232401bb66..5caf29ec857079c15f55871de3eaaf09318defa4 100644 --- a/MantidPlot/src/Graph.cpp +++ b/MantidPlot/src/Graph.cpp @@ -67,7 +67,7 @@ #include "MantidQtAPI/QwtWorkspaceSpectrumData.h" #include "Mantid/ErrorBarSettings.h" -#include "TSVSerialiser.h" +#include "MantidQtAPI/TSVSerialiser.h" #ifdef EMF_OUTPUT #include "EmfEngine.h" diff --git a/MantidPlot/src/Graph3D.cpp b/MantidPlot/src/Graph3D.cpp index 67bf1416bb8c378f075dc1ef82b58f21b9d6b3d4..da3a323c7357730dfabe3ef346e115ab7aaf0da0 100644 --- a/MantidPlot/src/Graph3D.cpp +++ b/MantidPlot/src/Graph3D.cpp @@ -38,7 +38,7 @@ #include "MatrixModel.h" #include "UserFunction.h" //Mantid -#include "TSVSerialiser.h" +#include "MantidQtAPI/TSVSerialiser.h" #include <QApplication> #include <QMessageBox> diff --git a/MantidPlot/src/Graph3D.h b/MantidPlot/src/Graph3D.h index 8f6afd9d411ec0ee859bbe703b2bad6dc9b3e929..565cb62a570bfdf1a998bf5f017a23110aa84553 100644 --- a/MantidPlot/src/Graph3D.h +++ b/MantidPlot/src/Graph3D.h @@ -42,7 +42,7 @@ #include "Table.h" #include "Matrix.h" -#include "TSVSerialiser.h" +#include "MantidQtAPI/TSVSerialiser.h" class MantidMatrix; class UserFunction2D; diff --git a/MantidPlot/src/Grid.cpp b/MantidPlot/src/Grid.cpp index 4d1ab028d36b978374211391888f3cd919f4f33f..94f7095353a193d1acdcef022dffb89bd58677fb 100644 --- a/MantidPlot/src/Grid.cpp +++ b/MantidPlot/src/Grid.cpp @@ -31,7 +31,7 @@ #include "Grid.h" #include "ColorBox.h" -#include "TSVSerialiser.h" +#include "MantidQtAPI/TSVSerialiser.h" #include <qwt_plot_canvas.h> #include <qwt_painter.h> diff --git a/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindow.cpp b/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindow.cpp index 24d72828ec73fe21a00c67f7a4a0b118273d6d3e..a3cd47e5fef6eebd2f1b59beb0b267ae23ef5f15 100644 --- a/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindow.cpp +++ b/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindow.cpp @@ -5,7 +5,7 @@ #include "MantidAPI/MatrixWorkspace.h" #include "MantidAPI/Workspace.h" #include "MantidKernel/UsageService.h" -#include "TSVSerialiser.h" +#include "MantidQtAPI/TSVSerialiser.h" #include <QApplication> #include <QMessageBox> diff --git a/MantidPlot/src/Mantid/MantidMatrix.cpp b/MantidPlot/src/Mantid/MantidMatrix.cpp index 6e362b4a8abb73884233b3be3976a0b426f3c09b..ac07f439b527710ed2d98fca7fa4a92ccfefee52 100644 --- a/MantidPlot/src/Mantid/MantidMatrix.cpp +++ b/MantidPlot/src/Mantid/MantidMatrix.cpp @@ -10,7 +10,7 @@ #include "Preferences.h" #include "../pixmaps.h" -#include "TSVSerialiser.h" +#include "MantidQtAPI/TSVSerialiser.h" #include "MantidAPI/MatrixWorkspace.h" #include "MantidAPI/NumericAxis.h" diff --git a/MantidPlot/src/Matrix.cpp b/MantidPlot/src/Matrix.cpp index 3df2b76425858e3bee6480851bf41510bc7c2753..fb3b7fdd6925c55f5885026f1de42f042e4fff99 100644 --- a/MantidPlot/src/Matrix.cpp +++ b/MantidPlot/src/Matrix.cpp @@ -35,7 +35,7 @@ #include "MatrixCommand.h" #include "pixmaps.h" #include "ScriptingEnv.h" -#include "TSVSerialiser.h" +#include "MantidQtAPI/TSVSerialiser.h" #include <QtGlobal> #include <QTextStream> diff --git a/MantidPlot/src/MatrixModel.cpp b/MantidPlot/src/MatrixModel.cpp index c72c17828c1ced4ec81d0b14191fc7050d829dbd..81fa3fddeeb5db4cce6fe2adc968e4b4548fc527 100644 --- a/MantidPlot/src/MatrixModel.cpp +++ b/MantidPlot/src/MatrixModel.cpp @@ -36,7 +36,7 @@ #include "muParserScript.h" #include "ScriptingEnv.h" #include "analysis/fft2D.h" -#include "TSVSerialiser.h" +#include "MantidQtAPI/TSVSerialiser.h" #include "MantidKernel/Strings.h" diff --git a/MantidPlot/src/MultiLayer.cpp b/MantidPlot/src/MultiLayer.cpp index ea46276793a326cf88d17cee6b5472c18a87b2c5..b576628f5f0c3c3dc91e968ae8d8624a0b3d9f4b 100644 --- a/MantidPlot/src/MultiLayer.cpp +++ b/MantidPlot/src/MultiLayer.cpp @@ -71,7 +71,7 @@ #include "Mantid/MantidWSIndexDialog.h" #include "MantidQtSliceViewer/LinePlotOptions.h" -#include "TSVSerialiser.h" +#include "MantidQtAPI/TSVSerialiser.h" // Register the window into the WindowFactory DECLARE_WINDOW(MultiLayer) diff --git a/MantidPlot/src/Note.cpp b/MantidPlot/src/Note.cpp index c58a26d119c3952575d0d524646d4cbe6f011511..2ba8c91c19c12652098bdba3cba0afe218ecf299 100644 --- a/MantidPlot/src/Note.cpp +++ b/MantidPlot/src/Note.cpp @@ -41,7 +41,7 @@ #include <QPrintDialog> #include "ApplicationWindow.h" -#include "TSVSerialiser.h" +#include "MantidQtAPI/TSVSerialiser.h" #include "MantidKernel/ConfigService.h" #include "MantidQtAPI/FileDialogHandler.h" diff --git a/MantidPlot/src/ProjectSerialiser.h b/MantidPlot/src/ProjectSerialiser.h index f605ffcca2bdce091beff82ef89c64b5e2cfc7a2..00f58c74836206a9975e6c933f15d6a81f8efdea 100644 --- a/MantidPlot/src/ProjectSerialiser.h +++ b/MantidPlot/src/ProjectSerialiser.h @@ -10,7 +10,7 @@ #include <QDir> #include <QApplication> -#include "TSVSerialiser.h" +#include "MantidQtAPI/TSVSerialiser.h" #include "qstring.h" #include "Folder.h" diff --git a/MantidPlot/src/ScriptingWindow.cpp b/MantidPlot/src/ScriptingWindow.cpp index 5259fa26681f7feb330e75f404036043304d0de8..db7d991673ff173f24315bbd3a6aa3c3d53dfce3 100644 --- a/MantidPlot/src/ScriptingWindow.cpp +++ b/MantidPlot/src/ScriptingWindow.cpp @@ -6,7 +6,7 @@ #include "MultiTabScriptInterpreter.h" #include "ScriptingEnv.h" #include "ScriptFileInterpreter.h" -#include "TSVSerialiser.h" +#include "MantidQtAPI/TSVSerialiser.h" #include "pixmaps.h" // Mantid diff --git a/MantidPlot/src/Spectrogram.cpp b/MantidPlot/src/Spectrogram.cpp index 5a2461c76353334a87882039b38769eabba4be3d..20fb1e87ae79793edd91dcc4f4d16beb7c5c11c7 100644 --- a/MantidPlot/src/Spectrogram.cpp +++ b/MantidPlot/src/Spectrogram.cpp @@ -44,7 +44,7 @@ #include "MantidQtAPI/QwtRasterDataMD.h" #include "MantidQtAPI/SignalRange.h" -#include "TSVSerialiser.h" +#include "MantidQtAPI/TSVSerialiser.h" #include <numeric> diff --git a/MantidPlot/src/Table.cpp b/MantidPlot/src/Table.cpp index 4073d436531fb818c66ee7fb0c4a3be9b76402bb..2ee301d7842918ee5e62221e3aec2114014edc1b 100644 --- a/MantidPlot/src/Table.cpp +++ b/MantidPlot/src/Table.cpp @@ -35,7 +35,7 @@ #include "muParserScript.h" #include "ApplicationWindow.h" #include "pixmaps.h" -#include "TSVSerialiser.h" +#include "MantidQtAPI/TSVSerialiser.h" #include <QContextMenuEvent> #include <QMessageBox> diff --git a/MantidPlot/src/TableStatistics.cpp b/MantidPlot/src/TableStatistics.cpp index b867dba5e09335a1d1058a7109ff679a22e5c553..c694c51c5b8332b4225f9854a4dc4e25adaa5a5c 100644 --- a/MantidPlot/src/TableStatistics.cpp +++ b/MantidPlot/src/TableStatistics.cpp @@ -29,7 +29,7 @@ ***************************************************************************/ #include "ApplicationWindow.h" #include "TableStatistics.h" -#include "TSVSerialiser.h" +#include "MantidQtAPI/TSVSerialiser.h" #include "Mantid/IProjectSerialisable.h" #include "MantidKernel/Strings.h" diff --git a/MantidQt/API/CMakeLists.txt b/MantidQt/API/CMakeLists.txt index 1c5a568b0865957ff393cb26d94a0a6cf2132a94..f073ac0722e176a6f91d35db3c7d350cf1d9bccd 100644 --- a/MantidQt/API/CMakeLists.txt +++ b/MantidQt/API/CMakeLists.txt @@ -42,6 +42,7 @@ src/SignalRange.cpp src/SyncedCheckboxes.cpp src/TextPropertyWidget.cpp + src/TSVSerialiser.cpp src/UserSubWindow.cpp src/VatesViewerInterface.cpp src/WidgetScrollbarDecorator.cpp @@ -111,6 +112,7 @@ set ( INC_FILES inc/MantidQtAPI/SelectionNotificationService.h inc/MantidQtAPI/SignalBlocker.h inc/MantidQtAPI/SignalRange.h + inc/MantidQtAPI/TSVSerialiser.h inc/MantidQtAPI/qwt_compat.h inc/MantidQtAPI/WidgetScrollbarDecorator.h ) diff --git a/MantidPlot/src/TSVSerialiser.h b/MantidQt/API/inc/MantidQtAPI/TSVSerialiser.h similarity index 100% rename from MantidPlot/src/TSVSerialiser.h rename to MantidQt/API/inc/MantidQtAPI/TSVSerialiser.h diff --git a/MantidPlot/src/TSVSerialiser.cpp b/MantidQt/API/src/TSVSerialiser.cpp similarity index 99% rename from MantidPlot/src/TSVSerialiser.cpp rename to MantidQt/API/src/TSVSerialiser.cpp index 4e03e32936c092079311a6c2d20c5c13596dd0a3..eaa0f87460db85bb8a98f233d60a186bd405f8f6 100644 --- a/MantidPlot/src/TSVSerialiser.cpp +++ b/MantidQt/API/src/TSVSerialiser.cpp @@ -1,4 +1,4 @@ -#include "TSVSerialiser.h" +#include "MantidQtAPI/TSVSerialiser.h" #include "MantidKernel/Logger.h"