From 01e9428b9727c53cb783fa3bd7e3b824a8cbfa2c Mon Sep 17 00:00:00 2001
From: Simon Heybrock <simon.heybrock@esss.se>
Date: Tue, 1 Nov 2016 15:49:21 +0100
Subject: [PATCH] Re #17918. Cleaned up includes from VMD.h.
---
Framework/API/inc/MantidAPI/MDGeometry.h | 1 +
Framework/API/src/MatrixWorkspace.cpp | 1 +
Framework/Algorithms/src/AddLogDerivative.cpp | 1 +
Framework/Algorithms/src/CorrectFlightPaths.cpp | 1 +
.../Algorithms/src/DetectorEfficiencyCorUser.cpp | 1 +
.../src/MergeRuns/SampleLogsBehaviour.cpp | 2 ++
.../Algorithms/src/MonitorEfficiencyCorUser.cpp | 1 +
Framework/Algorithms/src/ReadGroupsFromFile.cpp | 4 +---
Framework/Crystal/src/LoadIsawPeaks.cpp | 1 +
Framework/Crystal/src/LoadIsawUB.cpp | 1 +
Framework/Crystal/src/MaskPeaksWorkspace.cpp | 4 +---
Framework/Crystal/src/PeakIntensityVsRadius.cpp | 1 +
Framework/Crystal/src/SaveHKL.cpp | 1 +
Framework/Crystal/src/SaveIsawPeaks.cpp | 1 +
Framework/Crystal/src/SaveLauenorm.cpp | 1 +
Framework/Crystal/src/SetGoniometer.cpp | 1 +
.../inc/MantidDataHandling/GroupDetectors2.h | 4 +---
Framework/DataHandling/src/LoadIDFFromNexus.cpp | 4 +---
Framework/DataHandling/src/LoadIsawDetCal.cpp | 1 +
Framework/DataHandling/src/SaveIsawDetCal.cpp | 1 +
Framework/DataHandling/test/SaveParameterFileTest.h | 1 +
Framework/Kernel/inc/MantidKernel/VMD.h | 13 ++++---------
Framework/Kernel/src/VMD.cpp | 9 +++++++++
Framework/Kernel/test/VMDTest.h | 1 +
Framework/MDAlgorithms/src/MDNormDirectSC.cpp | 1 +
Framework/MDAlgorithms/src/MDNormSCD.cpp | 1 +
Framework/MDAlgorithms/src/QueryMDWorkspace.cpp | 1 +
Framework/MDAlgorithms/src/SaveMD.cpp | 1 +
Framework/MDAlgorithms/src/SaveMD2.cpp | 1 +
Framework/MDAlgorithms/src/SaveZODS.cpp | 1 +
30 files changed, 42 insertions(+), 21 deletions(-)
diff --git a/Framework/API/inc/MantidAPI/MDGeometry.h b/Framework/API/inc/MantidAPI/MDGeometry.h
index fc6a3c78036..f8d15c5cbbc 100644
--- a/Framework/API/inc/MantidAPI/MDGeometry.h
+++ b/Framework/API/inc/MantidAPI/MDGeometry.h
@@ -2,6 +2,7 @@
#define MANTID_API_MDGEOMETRY_H_
#include "MantidKernel/System.h"
+#include "MantidKernel/Matrix.h"
#include "MantidKernel/VMD.h"
#include "MantidGeometry/MDGeometry/MDTypes.h"
#include <boost/shared_ptr.hpp>
diff --git a/Framework/API/src/MatrixWorkspace.cpp b/Framework/API/src/MatrixWorkspace.cpp
index 67c2b7d19ad..38ecfc64ce7 100644
--- a/Framework/API/src/MatrixWorkspace.cpp
+++ b/Framework/API/src/MatrixWorkspace.cpp
@@ -14,6 +14,7 @@
#include "MantidGeometry/MDGeometry/GeneralFrame.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidKernel/MDUnit.h"
+#include "MantidKernel/Strings.h"
#include "MantidKernel/make_unique.h"
#include <cmath>
diff --git a/Framework/Algorithms/src/AddLogDerivative.cpp b/Framework/Algorithms/src/AddLogDerivative.cpp
index a7cb098cce8..f4319c91c25 100644
--- a/Framework/Algorithms/src/AddLogDerivative.cpp
+++ b/Framework/Algorithms/src/AddLogDerivative.cpp
@@ -1,4 +1,5 @@
#include "MantidAlgorithms/AddLogDerivative.h"
+#include "MantidKernel/Strings.h"
#include "MantidKernel/System.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidAPI/MatrixWorkspace.h"
diff --git a/Framework/Algorithms/src/CorrectFlightPaths.cpp b/Framework/Algorithms/src/CorrectFlightPaths.cpp
index 4d286adfdfa..821f912eccd 100644
--- a/Framework/Algorithms/src/CorrectFlightPaths.cpp
+++ b/Framework/Algorithms/src/CorrectFlightPaths.cpp
@@ -9,6 +9,7 @@
#include "MantidGeometry/Instrument/ComponentHelper.h"
#include "MantidGeometry/Instrument/ParameterMap.h"
#include "MantidKernel/CompositeValidator.h"
+#include "MantidKernel/Strings.h"
#include "MantidKernel/UnitFactory.h"
#include <cmath>
diff --git a/Framework/Algorithms/src/DetectorEfficiencyCorUser.cpp b/Framework/Algorithms/src/DetectorEfficiencyCorUser.cpp
index 66ec4940943..54475523b35 100644
--- a/Framework/Algorithms/src/DetectorEfficiencyCorUser.cpp
+++ b/Framework/Algorithms/src/DetectorEfficiencyCorUser.cpp
@@ -8,6 +8,7 @@
#include "MantidGeometry/muParser_Silent.h"
#include "MantidKernel/BoundedValidator.h"
#include "MantidKernel/CompositeValidator.h"
+#include "MantidKernel/Strings.h"
using Mantid::HistogramData::Histogram;
using Mantid::HistogramData::Points;
diff --git a/Framework/Algorithms/src/MergeRuns/SampleLogsBehaviour.cpp b/Framework/Algorithms/src/MergeRuns/SampleLogsBehaviour.cpp
index 86c351bad63..586a856801b 100644
--- a/Framework/Algorithms/src/MergeRuns/SampleLogsBehaviour.cpp
+++ b/Framework/Algorithms/src/MergeRuns/SampleLogsBehaviour.cpp
@@ -1,6 +1,8 @@
#include "MantidAlgorithms/MergeRuns/SampleLogsBehaviour.h"
#include "MantidAPI/Run.h"
#include "MantidGeometry/Instrument.h"
+#include "MantidKernel/Strings.h"
+#include "MantidKernel/StringTokenizer.h"
#include "MantidKernel/TimeSeriesProperty.h"
namespace Mantid {
diff --git a/Framework/Algorithms/src/MonitorEfficiencyCorUser.cpp b/Framework/Algorithms/src/MonitorEfficiencyCorUser.cpp
index bb91bd7c334..69061e7f696 100644
--- a/Framework/Algorithms/src/MonitorEfficiencyCorUser.cpp
+++ b/Framework/Algorithms/src/MonitorEfficiencyCorUser.cpp
@@ -7,6 +7,7 @@
#include "MantidGeometry/Instrument.h"
#include "MantidGeometry/muParser_Silent.h"
#include "MantidKernel/MultiThreaded.h"
+#include "MantidKernel/Strings.h"
using Mantid::HistogramData::HistogramX;
using Mantid::HistogramData::HistogramY;
diff --git a/Framework/Algorithms/src/ReadGroupsFromFile.cpp b/Framework/Algorithms/src/ReadGroupsFromFile.cpp
index 07880d99ef2..d28782fcd1c 100644
--- a/Framework/Algorithms/src/ReadGroupsFromFile.cpp
+++ b/Framework/Algorithms/src/ReadGroupsFromFile.cpp
@@ -1,6 +1,3 @@
-//----------------------------------------------------------------------
-// Includes
-//----------------------------------------------------------------------
#include "MantidAlgorithms/ReadGroupsFromFile.h"
#include "MantidAPI/FileProperty.h"
#include "MantidAPI/InstrumentDataService.h"
@@ -10,6 +7,7 @@
#include "MantidAPI/WorkspaceProperty.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidKernel/ListValidator.h"
+#include "MantidKernel/StringTokenizer.h"
// Poco XML Headers for Grouping File
#include <Poco/DOM/DOMParser.h>
diff --git a/Framework/Crystal/src/LoadIsawPeaks.cpp b/Framework/Crystal/src/LoadIsawPeaks.cpp
index 5c9ff368422..974a0ede458 100644
--- a/Framework/Crystal/src/LoadIsawPeaks.cpp
+++ b/Framework/Crystal/src/LoadIsawPeaks.cpp
@@ -7,6 +7,7 @@
#include "MantidGeometry/Crystal/OrientedLattice.h"
#include "MantidGeometry/Instrument/RectangularDetector.h"
#include "MantidKernel/OptionalBool.h"
+#include "MantidKernel/Strings.h"
#include "MantidKernel/Unit.h"
using Mantid::Kernel::Strings::readToEndOfLine;
diff --git a/Framework/Crystal/src/LoadIsawUB.cpp b/Framework/Crystal/src/LoadIsawUB.cpp
index c89719269b4..49e754ec0fd 100644
--- a/Framework/Crystal/src/LoadIsawUB.cpp
+++ b/Framework/Crystal/src/LoadIsawUB.cpp
@@ -4,6 +4,7 @@
#include <MantidGeometry/Crystal/OrientedLattice.h>
#include "MantidAPI/IMDEventWorkspace.h"
#include "MantidAPI/Sample.h"
+#include "MantidKernel/Strings.h"
using namespace Mantid::Kernel::Strings;
using Mantid::Kernel::DblMatrix;
diff --git a/Framework/Crystal/src/MaskPeaksWorkspace.cpp b/Framework/Crystal/src/MaskPeaksWorkspace.cpp
index 378be6b7113..18a5e7f8171 100644
--- a/Framework/Crystal/src/MaskPeaksWorkspace.cpp
+++ b/Framework/Crystal/src/MaskPeaksWorkspace.cpp
@@ -1,6 +1,3 @@
-//----------------------------------------------------------------------
-// Includes
-//----------------------------------------------------------------------
#include "MantidCrystal/MaskPeaksWorkspace.h"
#include "MantidDataObjects/PeaksWorkspace.h"
#include "MantidAPI/InstrumentValidator.h"
@@ -9,6 +6,7 @@
#include "MantidAPI/IPeakFunction.h"
#include "MantidKernel/VectorHelper.h"
#include "MantidKernel/ArrayProperty.h"
+#include "MantidKernel/Strings.h"
#include <boost/math/special_functions/round.hpp>
diff --git a/Framework/Crystal/src/PeakIntensityVsRadius.cpp b/Framework/Crystal/src/PeakIntensityVsRadius.cpp
index 8e2960f5a60..25841bb6b62 100644
--- a/Framework/Crystal/src/PeakIntensityVsRadius.cpp
+++ b/Framework/Crystal/src/PeakIntensityVsRadius.cpp
@@ -7,6 +7,7 @@
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidKernel/ListValidator.h"
+#include "MantidKernel/Strings.h"
using namespace Mantid::Kernel;
using namespace Mantid::API;
diff --git a/Framework/Crystal/src/SaveHKL.cpp b/Framework/Crystal/src/SaveHKL.cpp
index 7273700621b..f228a6a5563 100644
--- a/Framework/Crystal/src/SaveHKL.cpp
+++ b/Framework/Crystal/src/SaveHKL.cpp
@@ -8,6 +8,7 @@
#include "MantidKernel/Material.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidKernel/ListValidator.h"
+#include "MantidKernel/Strings.h"
#include "MantidCrystal/AnvredCorrection.h"
#include "MantidGeometry/Crystal/OrientedLattice.h"
#include <fstream>
diff --git a/Framework/Crystal/src/SaveIsawPeaks.cpp b/Framework/Crystal/src/SaveIsawPeaks.cpp
index 8c5a7d11017..c55d7435dc9 100644
--- a/Framework/Crystal/src/SaveIsawPeaks.cpp
+++ b/Framework/Crystal/src/SaveIsawPeaks.cpp
@@ -5,6 +5,7 @@
#include "MantidDataObjects/Peak.h"
#include "MantidDataObjects/PeaksWorkspace.h"
#include "MantidGeometry/Instrument/RectangularDetector.h"
+#include "MantidKernel/Strings.h"
#include "MantidKernel/Utils.h"
#include "MantidDataObjects/Workspace2D.h"
#include <fstream>
diff --git a/Framework/Crystal/src/SaveLauenorm.cpp b/Framework/Crystal/src/SaveLauenorm.cpp
index 780faf5b3ef..bb54a1cd9f3 100644
--- a/Framework/Crystal/src/SaveLauenorm.cpp
+++ b/Framework/Crystal/src/SaveLauenorm.cpp
@@ -7,6 +7,7 @@
#include "MantidKernel/ListValidator.h"
#include "MantidCrystal/AnvredCorrection.h"
#include "MantidKernel/ArrayProperty.h"
+#include "MantidKernel/Strings.h"
#include <fstream>
#include <Poco/File.h>
#include <Poco/Path.h>
diff --git a/Framework/Crystal/src/SetGoniometer.cpp b/Framework/Crystal/src/SetGoniometer.cpp
index 9dbb81d615e..1e57ef0a385 100644
--- a/Framework/Crystal/src/SetGoniometer.cpp
+++ b/Framework/Crystal/src/SetGoniometer.cpp
@@ -2,6 +2,7 @@
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/Run.h"
#include "MantidKernel/ListValidator.h"
+#include "MantidKernel/Strings.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include <boost/algorithm/string/classification.hpp>
diff --git a/Framework/DataHandling/inc/MantidDataHandling/GroupDetectors2.h b/Framework/DataHandling/inc/MantidDataHandling/GroupDetectors2.h
index 617cc786e77..a0fb1ea9053 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/GroupDetectors2.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/GroupDetectors2.h
@@ -1,12 +1,10 @@
#ifndef MANTID_DATAHANDLING_GROUPDETECTORS2_H_
#define MANTID_DATAHANDLING_GROUPDETECTORS2_H_
-//----------------------------------------------------------------------
-// Includes
-//----------------------------------------------------------------------
#include "MantidAPI/Algorithm.h"
#include "MantidDataObjects/EventWorkspace.h"
#include "MantidDataObjects/GroupingWorkspace.h"
+#include "MantidKernel/StringTokenizer.h"
#include <map>
diff --git a/Framework/DataHandling/src/LoadIDFFromNexus.cpp b/Framework/DataHandling/src/LoadIDFFromNexus.cpp
index 1cfc6d102c0..ab9e7484b49 100644
--- a/Framework/DataHandling/src/LoadIDFFromNexus.cpp
+++ b/Framework/DataHandling/src/LoadIDFFromNexus.cpp
@@ -1,11 +1,9 @@
-//----------------------------------------------------------------------
-// Includes
-//----------------------------------------------------------------------
#include "MantidDataHandling/LoadIDFFromNexus.h"
#include "MantidAPI/FileProperty.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidGeometry/Instrument.h"
#include "MantidKernel/ConfigService.h"
+#include "MantidKernel/Strings.h"
#include <Poco/DOM/Document.h>
#include <Poco/DOM/DOMParser.h>
diff --git a/Framework/DataHandling/src/LoadIsawDetCal.cpp b/Framework/DataHandling/src/LoadIsawDetCal.cpp
index 09b626fe0e5..cdd51572f8a 100644
--- a/Framework/DataHandling/src/LoadIsawDetCal.cpp
+++ b/Framework/DataHandling/src/LoadIsawDetCal.cpp
@@ -13,6 +13,7 @@
#include "MantidGeometry/Instrument/ObjCompAssembly.h"
#include "MantidGeometry/Instrument/ComponentHelper.h"
+#include "MantidKernel/Strings.h"
#include "MantidKernel/V3D.h"
#include <Poco/File.h>
diff --git a/Framework/DataHandling/src/SaveIsawDetCal.cpp b/Framework/DataHandling/src/SaveIsawDetCal.cpp
index 740f14ec9dd..ce10be85d4a 100644
--- a/Framework/DataHandling/src/SaveIsawDetCal.cpp
+++ b/Framework/DataHandling/src/SaveIsawDetCal.cpp
@@ -5,6 +5,7 @@
#include "MantidGeometry/Instrument.h"
#include "MantidGeometry/Instrument/RectangularDetector.h"
#include "MantidKernel/ArrayProperty.h"
+#include "MantidKernel/Strings.h"
#include "MantidKernel/System.h"
#include "MantidAPI/Workspace.h"
#include "MantidAPI/ExperimentInfo.h"
diff --git a/Framework/DataHandling/test/SaveParameterFileTest.h b/Framework/DataHandling/test/SaveParameterFileTest.h
index 6ce13bf6c08..bd4fd8da473 100644
--- a/Framework/DataHandling/test/SaveParameterFileTest.h
+++ b/Framework/DataHandling/test/SaveParameterFileTest.h
@@ -16,6 +16,7 @@
#include "MantidGeometry/Instrument.h"
#include "MantidGeometry/Instrument/Component.h"
#include "MantidKernel/Exception.h"
+#include "MantidKernel/StringTokenizer.h"
#include "MantidTestHelpers/ScopedFileHelper.h"
using namespace Mantid::API;
diff --git a/Framework/Kernel/inc/MantidKernel/VMD.h b/Framework/Kernel/inc/MantidKernel/VMD.h
index 582ab558613..477edbc92a6 100644
--- a/Framework/Kernel/inc/MantidKernel/VMD.h
+++ b/Framework/Kernel/inc/MantidKernel/VMD.h
@@ -1,18 +1,13 @@
#ifndef MANTID_KERNEL_VMD_H_
#define MANTID_KERNEL_VMD_H_
-#include "MantidKernel/StringTokenizer.h"
-#include "MantidKernel/Strings.h"
-#include "MantidKernel/System.h"
-#include "MantidKernel/Tolerance.h"
-#include "MantidKernel/V3D.h"
-#include <algorithm>
-#include <cstddef>
-#include <sstream>
-#include <stdexcept>
+#include "MantidKernel/DllConfig.h"
+#include <string>
+#include <vector>
namespace Mantid {
namespace Kernel {
+class V3D;
/** Simple vector class for multiple dimensions (i.e. > 3).
diff --git a/Framework/Kernel/src/VMD.cpp b/Framework/Kernel/src/VMD.cpp
index 18fceb8e532..f9087bf79bb 100644
--- a/Framework/Kernel/src/VMD.cpp
+++ b/Framework/Kernel/src/VMD.cpp
@@ -1,4 +1,13 @@
#include "MantidKernel/VMD.h"
+#include "MantidKernel/StringTokenizer.h"
+#include "MantidKernel/Strings.h"
+#include "MantidKernel/System.h"
+#include "MantidKernel/Tolerance.h"
+#include "MantidKernel/V3D.h"
+#include <algorithm>
+#include <cstddef>
+#include <sstream>
+#include <stdexcept>
using namespace Mantid::Kernel;
diff --git a/Framework/Kernel/test/VMDTest.h b/Framework/Kernel/test/VMDTest.h
index 0d550ab59a5..7bc51cad7c1 100644
--- a/Framework/Kernel/test/VMDTest.h
+++ b/Framework/Kernel/test/VMDTest.h
@@ -7,6 +7,7 @@
#include <cmath>
#include "MantidKernel/VMD.h"
+#include "MantidKernel/V3D.h"
using namespace Mantid;
using namespace Mantid::Kernel;
diff --git a/Framework/MDAlgorithms/src/MDNormDirectSC.cpp b/Framework/MDAlgorithms/src/MDNormDirectSC.cpp
index 45caf39ee0e..38ad009aae4 100644
--- a/Framework/MDAlgorithms/src/MDNormDirectSC.cpp
+++ b/Framework/MDAlgorithms/src/MDNormDirectSC.cpp
@@ -9,6 +9,7 @@
#include "MantidDataObjects/MDHistoWorkspace.h"
#include "MantidGeometry/Instrument.h"
#include "MantidKernel/CompositeValidator.h"
+#include "MantidKernel/Strings.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidKernel/VectorHelper.h"
#include "MantidKernel/ConfigService.h"
diff --git a/Framework/MDAlgorithms/src/MDNormSCD.cpp b/Framework/MDAlgorithms/src/MDNormSCD.cpp
index 1e5d2afab9a..49d18a24226 100644
--- a/Framework/MDAlgorithms/src/MDNormSCD.cpp
+++ b/Framework/MDAlgorithms/src/MDNormSCD.cpp
@@ -11,6 +11,7 @@
#include "MantidGeometry/Instrument.h"
#include "MantidKernel/CompositeValidator.h"
#include "MantidKernel/ConfigService.h"
+#include "MantidKernel/Strings.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidKernel/VectorHelper.h"
diff --git a/Framework/MDAlgorithms/src/QueryMDWorkspace.cpp b/Framework/MDAlgorithms/src/QueryMDWorkspace.cpp
index f550a26f303..6f7c4c4b8b8 100644
--- a/Framework/MDAlgorithms/src/QueryMDWorkspace.cpp
+++ b/Framework/MDAlgorithms/src/QueryMDWorkspace.cpp
@@ -9,6 +9,7 @@
#include "MantidKernel/BoundedValidator.h"
#include "MantidKernel/EnabledWhenProperty.h"
#include "MantidKernel/ListValidator.h"
+#include "MantidKernel/Strings.h"
using namespace Mantid::API;
using namespace Mantid::DataObjects;
diff --git a/Framework/MDAlgorithms/src/SaveMD.cpp b/Framework/MDAlgorithms/src/SaveMD.cpp
index 2bb5a152d4a..a547ff5dbcb 100644
--- a/Framework/MDAlgorithms/src/SaveMD.cpp
+++ b/Framework/MDAlgorithms/src/SaveMD.cpp
@@ -3,6 +3,7 @@
#include "MantidAPI/IMDEventWorkspace.h"
#include "MantidAPI/WorkspaceHistory.h"
#include "MantidKernel/Matrix.h"
+#include "MantidKernel/Strings.h"
#include "MantidKernel/System.h"
#include "MantidDataObjects/MDBoxIterator.h"
#include "MantidDataObjects/MDEventFactory.h"
diff --git a/Framework/MDAlgorithms/src/SaveMD2.cpp b/Framework/MDAlgorithms/src/SaveMD2.cpp
index 9c3c16584ca..22fb267dc2c 100644
--- a/Framework/MDAlgorithms/src/SaveMD2.cpp
+++ b/Framework/MDAlgorithms/src/SaveMD2.cpp
@@ -3,6 +3,7 @@
#include "MantidAPI/IMDEventWorkspace.h"
#include "MantidAPI/WorkspaceHistory.h"
#include "MantidKernel/Matrix.h"
+#include "MantidKernel/Strings.h"
#include "MantidKernel/System.h"
#include "MantidDataObjects/MDBoxIterator.h"
#include "MantidDataObjects/MDEventFactory.h"
diff --git a/Framework/MDAlgorithms/src/SaveZODS.cpp b/Framework/MDAlgorithms/src/SaveZODS.cpp
index 495b4d8fd9b..c96478ff459 100644
--- a/Framework/MDAlgorithms/src/SaveZODS.cpp
+++ b/Framework/MDAlgorithms/src/SaveZODS.cpp
@@ -1,6 +1,7 @@
#include "MantidAPI/FileProperty.h"
#include "MantidAPI/IMDHistoWorkspace.h"
#include "MantidAPI/Sample.h"
+#include "MantidKernel/Strings.h"
#include "MantidKernel/System.h"
#include "MantidMDAlgorithms/SaveZODS.h"
#include "MantidDataObjects/MDHistoWorkspace.h"
--
GitLab