From 84a194742a8da776f21b6edd13db61cc624e69db Mon Sep 17 00:00:00 2001
From: Simon Heybrock <simon.heybrock@esss.se>
Date: Mon, 27 Feb 2017 14:37:13 +0100
Subject: [PATCH] Re #18659. REmoved unused includes of ComponentHelper.h.
---
Framework/Algorithms/src/SpecularReflectionAlgorithm.cpp | 1 -
Framework/Algorithms/src/SpecularReflectionPositionCorrect.cpp | 1 -
Framework/Algorithms/test/CopyInstrumentParametersTest.h | 2 --
Framework/DataHandling/src/LoadDetectorInfo.cpp | 1 -
Framework/DataHandling/src/LoadHelper.cpp | 2 +-
Framework/DataHandling/src/LoadILLIndirect.cpp | 2 +-
Framework/DataHandling/src/LoadILLIndirect2.cpp | 2 +-
Framework/DataHandling/src/LoadILLReflectometry.cpp | 2 +-
Framework/DataHandling/src/LoadSpice2D.cpp | 1 -
Framework/DataHandling/src/LoadSwans.cpp | 2 +-
Framework/DataHandling/src/SetScalingPSD.cpp | 2 +-
Framework/DataHandling/src/UpdateInstrumentFromFile.cpp | 1 -
Framework/MDAlgorithms/src/ConvertCWSDMDtoHKL.cpp | 1 -
13 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/Framework/Algorithms/src/SpecularReflectionAlgorithm.cpp b/Framework/Algorithms/src/SpecularReflectionAlgorithm.cpp
index a313930aea5..ecffb44639a 100644
--- a/Framework/Algorithms/src/SpecularReflectionAlgorithm.cpp
+++ b/Framework/Algorithms/src/SpecularReflectionAlgorithm.cpp
@@ -8,7 +8,6 @@
#include "MantidKernel/ListValidator.h"
#include "MantidGeometry/Instrument/DetectorGroup.h"
#include "MantidGeometry/Instrument/ReferenceFrame.h"
-#include "MantidGeometry/Instrument/ComponentHelper.h"
#include <boost/make_shared.hpp>
diff --git a/Framework/Algorithms/src/SpecularReflectionPositionCorrect.cpp b/Framework/Algorithms/src/SpecularReflectionPositionCorrect.cpp
index 9e53a90982e..ce7ed7919da 100644
--- a/Framework/Algorithms/src/SpecularReflectionPositionCorrect.cpp
+++ b/Framework/Algorithms/src/SpecularReflectionPositionCorrect.cpp
@@ -1,7 +1,6 @@
#include "MantidAlgorithms/SpecularReflectionPositionCorrect.h"
#include "MantidAPI/MatrixWorkspace.h"
-#include "MantidGeometry/Instrument/ComponentHelper.h"
#include "MantidGeometry/Instrument/DetectorGroup.h"
#include "MantidGeometry/Instrument/ReferenceFrame.h"
#include "MantidKernel/BoundedValidator.h"
diff --git a/Framework/Algorithms/test/CopyInstrumentParametersTest.h b/Framework/Algorithms/test/CopyInstrumentParametersTest.h
index 924d7ec4171..dc4f4e73dcf 100644
--- a/Framework/Algorithms/test/CopyInstrumentParametersTest.h
+++ b/Framework/Algorithms/test/CopyInstrumentParametersTest.h
@@ -20,7 +20,6 @@
#include "MantidGeometry/Instrument.h"
#include "MantidGeometry/Instrument/Component.h"
#include "MantidDataHandling/LoadEmptyInstrument.h"
-#include "MantidGeometry/Instrument/ComponentHelper.h"
#include <cmath>
#include <stdexcept>
@@ -30,7 +29,6 @@ using namespace Mantid::Kernel;
using namespace Mantid::DataObjects;
using Mantid::Geometry::IDetector_const_sptr;
using Mantid::Geometry::IComponent_const_sptr;
-using namespace Geometry::ComponentHelper;
class CopyInstrumentParametersTest : public CxxTest::TestSuite {
public:
diff --git a/Framework/DataHandling/src/LoadDetectorInfo.cpp b/Framework/DataHandling/src/LoadDetectorInfo.cpp
index b360b15935a..40668abb968 100644
--- a/Framework/DataHandling/src/LoadDetectorInfo.cpp
+++ b/Framework/DataHandling/src/LoadDetectorInfo.cpp
@@ -3,7 +3,6 @@
#include "MantidAPI/DetectorInfo.h"
#include "MantidAPI/FileProperty.h"
#include "MantidAPI/MatrixWorkspace.h"
-#include "MantidGeometry/Instrument/ComponentHelper.h"
#include "MantidKernel/Exception.h"
#include <Poco/Path.h>
diff --git a/Framework/DataHandling/src/LoadHelper.cpp b/Framework/DataHandling/src/LoadHelper.cpp
index c3639b32cbd..ca7a56aafce 100644
--- a/Framework/DataHandling/src/LoadHelper.cpp
+++ b/Framework/DataHandling/src/LoadHelper.cpp
@@ -6,7 +6,7 @@
#include "MantidAPI/DetectorInfo.h"
#include "MantidAPI/MatrixWorkspace.h"
-#include "MantidGeometry/Instrument/ComponentHelper.h"
+#include "MantidGeometry/Instrument.h"
#include "MantidKernel/PhysicalConstants.h"
#include <nexus/napi.h>
diff --git a/Framework/DataHandling/src/LoadILLIndirect.cpp b/Framework/DataHandling/src/LoadILLIndirect.cpp
index 304220d9228..769f3491a7c 100644
--- a/Framework/DataHandling/src/LoadILLIndirect.cpp
+++ b/Framework/DataHandling/src/LoadILLIndirect.cpp
@@ -7,7 +7,7 @@
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidHistogramData/LinearGenerator.h"
#include "MantidKernel/UnitFactory.h"
-#include "MantidGeometry/Instrument/ComponentHelper.h"
+#include "MantidGeometry/Instrument.h"
#include <boost/algorithm/string.hpp>
diff --git a/Framework/DataHandling/src/LoadILLIndirect2.cpp b/Framework/DataHandling/src/LoadILLIndirect2.cpp
index 756882e8084..f8082e22957 100644
--- a/Framework/DataHandling/src/LoadILLIndirect2.cpp
+++ b/Framework/DataHandling/src/LoadILLIndirect2.cpp
@@ -5,7 +5,7 @@
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/RegisterFileLoader.h"
#include "MantidAPI/WorkspaceFactory.h"
-#include "MantidGeometry/Instrument/ComponentHelper.h"
+#include "MantidGeometry/Instrument.h"
#include "MantidKernel/UnitFactory.h"
#include <boost/algorithm/string.hpp>
diff --git a/Framework/DataHandling/src/LoadILLReflectometry.cpp b/Framework/DataHandling/src/LoadILLReflectometry.cpp
index b41993fa164..3beef8cce1f 100644
--- a/Framework/DataHandling/src/LoadILLReflectometry.cpp
+++ b/Framework/DataHandling/src/LoadILLReflectometry.cpp
@@ -9,8 +9,8 @@
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/RegisterFileLoader.h"
#include "MantidAPI/WorkspaceFactory.h"
+#include "MantidKernel/Quat.h"
#include "MantidKernel/UnitFactory.h"
-#include "MantidGeometry/Instrument/ComponentHelper.h"
#include <boost/algorithm/string.hpp>
#include <algorithm>
diff --git a/Framework/DataHandling/src/LoadSpice2D.cpp b/Framework/DataHandling/src/LoadSpice2D.cpp
index 17540beb599..ebe36076385 100644
--- a/Framework/DataHandling/src/LoadSpice2D.cpp
+++ b/Framework/DataHandling/src/LoadSpice2D.cpp
@@ -12,7 +12,6 @@
#include "MantidKernel/ConfigService.h"
#include "MantidKernel/BoundedValidator.h"
#include "MantidKernel/Strings.h"
-#include "MantidGeometry/Instrument/ComponentHelper.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include <boost/regex.hpp>
diff --git a/Framework/DataHandling/src/LoadSwans.cpp b/Framework/DataHandling/src/LoadSwans.cpp
index 61e0c29a0e6..98d9b03f950 100644
--- a/Framework/DataHandling/src/LoadSwans.cpp
+++ b/Framework/DataHandling/src/LoadSwans.cpp
@@ -1,7 +1,7 @@
#include "MantidDataHandling/LoadSwans.h"
#include "MantidAPI/FileProperty.h"
#include "MantidDataHandling/LoadHelper.h"
-#include "MantidGeometry/Instrument/ComponentHelper.h"
+#include "MantidGeometry/Instrument.h"
#include "MantidKernel/StringTokenizer.h"
#include <map>
diff --git a/Framework/DataHandling/src/SetScalingPSD.cpp b/Framework/DataHandling/src/SetScalingPSD.cpp
index 9853c45bfca..b73e1859c12 100644
--- a/Framework/DataHandling/src/SetScalingPSD.cpp
+++ b/Framework/DataHandling/src/SetScalingPSD.cpp
@@ -5,7 +5,7 @@
#include "MantidAPI/DetectorInfo.h"
#include "MantidAPI/FileProperty.h"
#include "MantidAPI/MatrixWorkspace.h"
-#include "MantidGeometry/Instrument/ComponentHelper.h"
+#include "MantidGeometry/Instrument/ParameterMap.h"
#include "MantidKernel/ArrayProperty.h"
#include "MantidKernel/BoundedValidator.h"
#include "MantidKernel/V3D.h"
diff --git a/Framework/DataHandling/src/UpdateInstrumentFromFile.cpp b/Framework/DataHandling/src/UpdateInstrumentFromFile.cpp
index 6e357656111..9a2633503a9 100644
--- a/Framework/DataHandling/src/UpdateInstrumentFromFile.cpp
+++ b/Framework/DataHandling/src/UpdateInstrumentFromFile.cpp
@@ -7,7 +7,6 @@
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/SpectrumInfo.h"
#include "MantidGeometry/Instrument.h"
-#include "MantidGeometry/Instrument/ComponentHelper.h"
#include "MantidGeometry/Instrument/DetectorGroup.h"
#include "MantidKernel/NexusDescriptor.h"
#include "LoadRaw/isisraw2.h"
diff --git a/Framework/MDAlgorithms/src/ConvertCWSDMDtoHKL.cpp b/Framework/MDAlgorithms/src/ConvertCWSDMDtoHKL.cpp
index 8d3ad9c0fdb..f31c9245fc9 100644
--- a/Framework/MDAlgorithms/src/ConvertCWSDMDtoHKL.cpp
+++ b/Framework/MDAlgorithms/src/ConvertCWSDMDtoHKL.cpp
@@ -16,7 +16,6 @@
#include "MantidDataObjects/MDEventFactory.h"
#include "MantidAPI/ExperimentInfo.h"
-#include "MantidGeometry/Instrument/ComponentHelper.h"
#include "MantidMDAlgorithms/MDWSDescription.h"
#include "MantidMDAlgorithms/MDWSTransform.h"
#include "MantidAPI/FileProperty.h"
--
GitLab