From 5e3dd4877f4c6f47123e84e830d480552167ca2b Mon Sep 17 00:00:00 2001 From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk> Date: Fri, 12 Feb 2016 16:13:23 +0000 Subject: [PATCH] update required headers in DataHandlers/Objects, LiveData, re #15246 --- .../DataHandling/inc/MantidDataHandling/LoadHelper.h | 5 +++++ Framework/DataHandling/src/LoadMLZ.cpp | 1 + Framework/DataObjects/src/Peak.cpp | 2 ++ Framework/DataObjects/src/PeakColumn.cpp | 1 + Framework/DataObjects/test/EventWorkspaceTest.h | 1 + Framework/DataObjects/test/PeakColumnTest.h | 1 + Framework/DataObjects/test/WorkspaceValidatorsTest.h | 1 + Framework/LiveData/src/ISISHistoDataListener.cpp | 10 ++++++---- Framework/LiveData/src/ISISLiveEventDataListener.cpp | 9 +++++---- Framework/LiveData/src/LiveDataAlgorithm.cpp | 11 ++++++----- Framework/LiveData/src/MonitorLiveData.cpp | 10 ++++++---- Framework/LiveData/src/SNSLiveEventDataListener.cpp | 1 + Framework/LiveData/src/TOPAZLiveEventDataListener.cpp | 1 + Framework/LiveData/test/TestDataListener.cpp | 1 + 14 files changed, 38 insertions(+), 17 deletions(-) diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadHelper.h b/Framework/DataHandling/inc/MantidDataHandling/LoadHelper.h index 196d7d9486e..c446379e6a5 100644 --- a/Framework/DataHandling/inc/MantidDataHandling/LoadHelper.h +++ b/Framework/DataHandling/inc/MantidDataHandling/LoadHelper.h @@ -6,6 +6,11 @@ #include "MantidNexus/NexusClasses.h" namespace Mantid { + +namespace Kernel { +class Quat; +} + namespace DataHandling { /** LoadHelper : Auxiliary File for Loading Files diff --git a/Framework/DataHandling/src/LoadMLZ.cpp b/Framework/DataHandling/src/LoadMLZ.cpp index 9b0d416a42e..01440e6e41b 100644 --- a/Framework/DataHandling/src/LoadMLZ.cpp +++ b/Framework/DataHandling/src/LoadMLZ.cpp @@ -10,6 +10,7 @@ #include "MantidAPI/RegisterFileLoader.h" #include "MantidGeometry/Instrument.h" #include "MantidKernel/EmptyValues.h" +#include "MantidKernel/Exception.h" #include "MantidKernel/UnitFactory.h" #include <algorithm> diff --git a/Framework/DataObjects/src/Peak.cpp b/Framework/DataObjects/src/Peak.cpp index 8c324bb5b99..bbe5885d83d 100644 --- a/Framework/DataObjects/src/Peak.cpp +++ b/Framework/DataObjects/src/Peak.cpp @@ -4,8 +4,10 @@ #include "MantidGeometry/Instrument/ReferenceFrame.h" #include "MantidGeometry/Objects/InstrumentRayTracer.h" #include "MantidKernel/ConfigService.h" +#include "MantidKernel/Exception.h" #include "MantidKernel/Strings.h" #include "MantidKernel/System.h" + #include <algorithm> #include <cctype> #include <string> diff --git a/Framework/DataObjects/src/PeakColumn.cpp b/Framework/DataObjects/src/PeakColumn.cpp index e98ef97480f..a286997ae9e 100644 --- a/Framework/DataObjects/src/PeakColumn.cpp +++ b/Framework/DataObjects/src/PeakColumn.cpp @@ -2,6 +2,7 @@ #include "MantidKernel/System.h" #include "MantidKernel/Strings.h" #include "MantidKernel/ConfigService.h" +#include "MantidKernel/Exception.h" #include <Poco/Mutex.h> diff --git a/Framework/DataObjects/test/EventWorkspaceTest.h b/Framework/DataObjects/test/EventWorkspaceTest.h index 37471dd5ad5..0e05ebbcc87 100644 --- a/Framework/DataObjects/test/EventWorkspaceTest.h +++ b/Framework/DataObjects/test/EventWorkspaceTest.h @@ -14,6 +14,7 @@ #include <string> +#include "MantidAPI/Axis.h" #include "MantidDataObjects/EventList.h" #include "MantidDataObjects/EventWorkspace.h" #include "MantidTestHelpers/WorkspaceCreationHelper.h" diff --git a/Framework/DataObjects/test/PeakColumnTest.h b/Framework/DataObjects/test/PeakColumnTest.h index 247db345382..f2489b04d35 100644 --- a/Framework/DataObjects/test/PeakColumnTest.h +++ b/Framework/DataObjects/test/PeakColumnTest.h @@ -4,6 +4,7 @@ #include <cxxtest/TestSuite.h> #include "MantidDataObjects/Peak.h" #include "MantidDataObjects/PeakColumn.h" +#include "MantidKernel/Exception.h" #include "MantidTestHelpers/ComponentCreationHelper.h" diff --git a/Framework/DataObjects/test/WorkspaceValidatorsTest.h b/Framework/DataObjects/test/WorkspaceValidatorsTest.h index 90af5914fb6..d2263628cae 100644 --- a/Framework/DataObjects/test/WorkspaceValidatorsTest.h +++ b/Framework/DataObjects/test/WorkspaceValidatorsTest.h @@ -2,6 +2,7 @@ #define WORKSPACEVALIDATORSTEST_H_ #include <cxxtest/TestSuite.h> +#include "MantidAPI/Axis.h" #include "MantidAPI/CommonBinsValidator.h" #include "MantidAPI/HistogramValidator.h" #include "MantidAPI/InstrumentValidator.h" diff --git a/Framework/LiveData/src/ISISHistoDataListener.cpp b/Framework/LiveData/src/ISISHistoDataListener.cpp index d590c510496..8e9c6047274 100644 --- a/Framework/LiveData/src/ISISHistoDataListener.cpp +++ b/Framework/LiveData/src/ISISHistoDataListener.cpp @@ -1,16 +1,18 @@ #include "MantidLiveData/ISISHistoDataListener.h" -#include "MantidAPI/LiveListenerFactory.h" -#include "MantidAPI/WorkspaceFactory.h" #include "MantidAPI/AlgorithmFactory.h" #include "MantidAPI/Algorithm.h" +#include "MantidAPI/AnalysisDataService.h" +#include "MantidAPI/Axis.h" +#include "MantidAPI/LiveListenerFactory.h" +#include "MantidAPI/MatrixWorkspace.h" #include "MantidAPI/SpectrumDetectorMapping.h" +#include "MantidAPI/WorkspaceFactory.h" #include "MantidAPI/WorkspaceGroup.h" -#include "MantidAPI/AnalysisDataService.h" #include "MantidKernel/ConfigService.h" #include "MantidKernel/Exception.h" -#include "MantidKernel/UnitFactory.h" #include "MantidKernel/ArrayProperty.h" #include "MantidKernel/ArrayBoundedValidator.h" +#include "MantidKernel/UnitFactory.h" #include "MantidKernel/WarningSuppressions.h" #include "MantidGeometry/Instrument.h" diff --git a/Framework/LiveData/src/ISISLiveEventDataListener.cpp b/Framework/LiveData/src/ISISLiveEventDataListener.cpp index 5b79d63ebe9..f9136f58f74 100644 --- a/Framework/LiveData/src/ISISLiveEventDataListener.cpp +++ b/Framework/LiveData/src/ISISLiveEventDataListener.cpp @@ -1,16 +1,17 @@ #include "MantidLiveData/ISISLiveEventDataListener.h" #include "MantidLiveData/Exception.h" +#include "MantidAPI/Algorithm.h" +#include "MantidAPI/AlgorithmFactory.h" +#include "MantidAPI/Axis.h" #include "MantidAPI/LiveListenerFactory.h" -#include "MantidAPI/WorkspaceFactory.h" #include "MantidAPI/SpectrumDetectorMapping.h" -#include "MantidAPI/AlgorithmFactory.h" -#include "MantidAPI/Algorithm.h" +#include "MantidAPI/WorkspaceFactory.h" #include "MantidKernel/DateAndTime.h" #include "MantidKernel/TimeSeriesProperty.h" -#include "MantidKernel/WarningSuppressions.h" #include "MantidKernel/UnitFactory.h" +#include "MantidKernel/WarningSuppressions.h" #ifdef GCC_VERSION // Avoid compiler warnings on gcc from unused static constants in diff --git a/Framework/LiveData/src/LiveDataAlgorithm.cpp b/Framework/LiveData/src/LiveDataAlgorithm.cpp index abf1e94e16f..b6b391094fb 100644 --- a/Framework/LiveData/src/LiveDataAlgorithm.cpp +++ b/Framework/LiveData/src/LiveDataAlgorithm.cpp @@ -1,11 +1,12 @@ #include "MantidLiveData/LiveDataAlgorithm.h" -#include "MantidKernel/System.h" +#include "MantidAPI/AlgorithmManager.h" +#include "MantidAPI/LiveListenerFactory.h" +#include "MantidKernel/ArrayProperty.h" #include "MantidKernel/DateAndTime.h" -#include "MantidKernel/ListValidator.h" #include "MantidKernel/FacilityInfo.h" -#include "MantidKernel/ArrayProperty.h" -#include "MantidAPI/LiveListenerFactory.h" -#include "MantidAPI/AlgorithmManager.h" +#include "MantidKernel/ListValidator.h" +#include "MantidKernel/Strings.h" + #include "boost/tokenizer.hpp" #include <boost/algorithm/string/trim.hpp> diff --git a/Framework/LiveData/src/MonitorLiveData.cpp b/Framework/LiveData/src/MonitorLiveData.cpp index 8491c3d349b..ad846f5e73a 100644 --- a/Framework/LiveData/src/MonitorLiveData.cpp +++ b/Framework/LiveData/src/MonitorLiveData.cpp @@ -1,10 +1,12 @@ -#include "MantidLiveData/MonitorLiveData.h" -#include "MantidKernel/System.h" -#include "MantidLiveData/LoadLiveData.h" -#include <Poco/Thread.h> #include "MantidAPI/AlgorithmManager.h" +#include "MantidAPI/MatrixWorkspace.h" #include "MantidAPI/MemoryManager.h" +#include "MantidKernel/System.h" #include "MantidKernel/WriteLock.h" +#include "MantidLiveData/LoadLiveData.h" +#include "MantidLiveData/MonitorLiveData.h" + +#include <Poco/Thread.h> using namespace Mantid::Kernel; using namespace Mantid::API; diff --git a/Framework/LiveData/src/SNSLiveEventDataListener.cpp b/Framework/LiveData/src/SNSLiveEventDataListener.cpp index a911b111cb7..6a52886e0d5 100644 --- a/Framework/LiveData/src/SNSLiveEventDataListener.cpp +++ b/Framework/LiveData/src/SNSLiveEventDataListener.cpp @@ -4,6 +4,7 @@ #include <exception> #include "MantidAPI/AlgorithmManager.h" +#include "MantidAPI/Axis.h" #include "MantidAPI/LiveListenerFactory.h" #include "MantidAPI/WorkspaceFactory.h" #include "MantidDataObjects/Events.h" diff --git a/Framework/LiveData/src/TOPAZLiveEventDataListener.cpp b/Framework/LiveData/src/TOPAZLiveEventDataListener.cpp index 0a1a73b7980..828fc8ef8f7 100644 --- a/Framework/LiveData/src/TOPAZLiveEventDataListener.cpp +++ b/Framework/LiveData/src/TOPAZLiveEventDataListener.cpp @@ -1,4 +1,5 @@ #include "MantidAPI/AlgorithmManager.h" +#include "MantidAPI/Axis.h" #include "MantidAPI/LiveListenerFactory.h" #include "MantidAPI/WorkspaceFactory.h" #include "MantidLiveData/TOPAZLiveEventDataListener.h" diff --git a/Framework/LiveData/test/TestDataListener.cpp b/Framework/LiveData/test/TestDataListener.cpp index 97ae87c46fd..82e2684d42e 100644 --- a/Framework/LiveData/test/TestDataListener.cpp +++ b/Framework/LiveData/test/TestDataListener.cpp @@ -1,4 +1,5 @@ #include "TestDataListener.h" +#include "MantidAPI/Axis.h" #include "MantidAPI/LiveListenerFactory.h" #include "MantidAPI/WorkspaceFactory.h" #include "MantidKernel/MersenneTwister.h" -- GitLab