Merge pull request #28421 from mantidproject/ifileloader_unnecessary_includes

Move FileDescriptor and NexusDescriptor includes to derived classes

Framework/API/inc/MantidAPI/FileLoaderRegistry.h

@@ -8,6 +8,8 @@
 
 #include "MantidAPI/AlgorithmFactory.h"
 #include "MantidAPI/IFileLoader.h"
+#include "MantidKernel/FileDescriptor.h"
+#include "MantidKernel/NexusDescriptor.h"
 #include "MantidKernel/SingletonHolder.h"
 
 #ifndef Q_MOC_RUN

Framework/API/inc/MantidAPI/IFileLoader.h

@@ -7,8 +7,6 @@
 #pragma once
 
 #include "MantidAPI/ParallelAlgorithm.h"
-#include "MantidKernel/FileDescriptor.h"
-#include "MantidKernel/NexusDescriptor.h"
 
 namespace Mantid {
 namespace API {

Framework/Crystal/inc/MantidCrystal/LoadIsawPeaks.h

@@ -10,6 +10,7 @@
 #include "MantidCrystal/DllConfig.h"
 #include "MantidDataObjects/PeaksWorkspace.h"
 #include "MantidGeometry/Instrument/DetectorInfo.h"
+#include "MantidKernel/FileDescriptor.h"
 
 namespace Mantid {
 namespace Crystal {

Framework/DataHandling/inc/MantidDataHandling/FilterEventsByLogValuePreNexus.h

@@ -11,6 +11,7 @@
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidDataObjects/Events.h"
 #include "MantidKernel/BinaryFile.h"
+#include "MantidKernel/FileDescriptor.h"
 #include <fstream>
 #include <string>
 #include <vector>
@@ -271,4 +272,4 @@ private:
   bool m_corretctTOF;
 };
 } // namespace DataHandling
-} // namespace Mantid
\ No newline at end of file
+} // namespace Mantid

Framework/DataHandling/inc/MantidDataHandling/LoadAscii.h

@@ -8,6 +8,7 @@
 
 #include "MantidAPI/DeprecatedAlgorithm.h"
 #include "MantidAPI/IFileLoader.h"
+#include "MantidKernel/FileDescriptor.h"
 
 #include <list>
 

Framework/DataHandling/inc/MantidDataHandling/LoadAscii2.h

@@ -9,6 +9,7 @@
 #include "MantidAPI/IFileLoader.h"
 #include "MantidAPI/MatrixWorkspace_fwd.h"
 #include "MantidDataObjects/Histogram1D.h"
+#include "MantidKernel/FileDescriptor.h"
 
 #include <list>
 

Framework/DataHandling/inc/MantidDataHandling/LoadBBY.h

@@ -14,6 +14,7 @@
 #include "MantidAPI/IFileLoader.h"
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidGeometry/Instrument.h"
+#include "MantidKernel/FileDescriptor.h"
 #include "MantidNexus/NexusClasses.h"
 
 namespace Mantid {

Framework/DataHandling/inc/MantidDataHandling/LoadCanSAS1D.h

@@ -9,6 +9,8 @@
 #include "MantidAPI/IFileLoader.h"
 #include "MantidAPI/WorkspaceGroup_fwd.h"
 #include "MantidDataObjects/Workspace2D.h"
+#include "MantidKernel/FileDescriptor.h"
+
 #include <Poco/DOM/Element.h>
 #include <Poco/DOM/Node.h>
 

Framework/DataHandling/inc/MantidDataHandling/LoadDaveGrp.h

@@ -11,6 +11,7 @@
 #include <vector>
 
 #include "MantidAPI/IFileLoader.h"
+#include "MantidKernel/FileDescriptor.h"
 #include "MantidKernel/cow_ptr.h"
 
 namespace Mantid {

Framework/DataHandling/inc/MantidDataHandling/LoadEMU.h

@@ -16,6 +16,8 @@
 #include "MantidAPI/LogManager.h"
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidGeometry/Instrument.h"
+#include "MantidKernel/FileDescriptor.h"
+#include "MantidKernel/NexusDescriptor.h"
 #include "MantidNexus/NexusClasses.h"
 
 namespace Mantid {

Framework/DataHandling/inc/MantidDataHandling/LoadEmptyInstrument.h

@@ -11,6 +11,7 @@
 //----------------------------------------------------------------------
 #include "MantidAPI/IFileLoader.h"
 #include "MantidDataObjects/Workspace2D.h"
+#include "MantidKernel/FileDescriptor.h"
 
 namespace Mantid {
 namespace DataHandling {

Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h

@@ -15,6 +15,7 @@
 #include "MantidDataObjects/Events.h"
 #include "MantidGeometry/Instrument.h"
 #include "MantidGeometry/Instrument/ParameterMap.h"
+#include "MantidKernel/NexusDescriptor.h"
 #include "MantidKernel/OptionalBool.h"
 #include "MantidKernel/TimeSeriesProperty.h"
 

Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus2.h

@@ -10,6 +10,7 @@
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidDataObjects/Events.h"
 #include "MantidKernel/BinaryFile.h"
+#include "MantidKernel/FileDescriptor.h"
 #include <fstream>
 #include <string>
 #include <vector>
@@ -217,4 +218,4 @@ private:
   void processInvestigationInputs();
 };
 } // namespace DataHandling
-} // namespace Mantid
\ No newline at end of file
+} // namespace Mantid

Framework/DataHandling/inc/MantidDataHandling/LoadFITS.h

@@ -16,6 +16,7 @@
 
 #include "MantidAPI/IFileLoader.h"
 #include "MantidDataObjects/Workspace2D.h"
+#include "MantidKernel/FileDescriptor.h"
 
 namespace Mantid {
 namespace DataHandling {

Framework/DataHandling/inc/MantidDataHandling/LoadGSS.h

@@ -10,6 +10,7 @@
 // Includes
 //---------------------------------------------------
 #include "MantidAPI/IFileLoader.h"
+#include "MantidKernel/FileDescriptor.h"
 
 namespace Mantid {
 namespace DataHandling {
@@ -70,4 +71,4 @@ private:
                                 const std::vector<double> &twothetas);
 };
 } // namespace DataHandling
-} // namespace Mantid
\ No newline at end of file
+} // namespace Mantid

Framework/DataHandling/inc/MantidDataHandling/LoadHFIRSANS.h

@@ -10,6 +10,8 @@
 #include "MantidDataHandling/XmlHandler.h"
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidKernel/DateAndTime.h"
+#include "MantidKernel/FileDescriptor.h"
+
 #include <map>
 #include <string>
 #include <utility>

Framework/DataHandling/inc/MantidDataHandling/LoadILLDiffraction.h

@@ -10,6 +10,7 @@
 #include "MantidDataHandling/DllConfig.h"
 #include "MantidDataHandling/LoadHelper.h"
 #include "MantidKernel/DateAndTime.h"
+#include "MantidKernel/NexusDescriptor.h"
 #include "MantidKernel/V3D.h"
 #include "MantidNexus/NexusClasses.h"
 

Framework/DataHandling/inc/MantidDataHandling/LoadILLIndirect2.h

@@ -8,6 +8,7 @@
 
 #include "MantidAPI/IFileLoader.h"
 #include "MantidDataHandling/LoadHelper.h"
+#include "MantidKernel/NexusDescriptor.h"
 #include "MantidNexus/NexusClasses.h"
 
 namespace Mantid {

Framework/DataHandling/inc/MantidDataHandling/LoadILLReflectometry.h

@@ -9,6 +9,7 @@
 #include "MantidAPI/IFileLoader.h"
 #include "MantidAPI/MatrixWorkspace_fwd.h"
 #include "MantidDataHandling/LoadHelper.h"
+#include "MantidKernel/NexusDescriptor.h"
 #include "MantidNexus/NexusClasses.h"
 
 namespace Mantid {

Framework/DataHandling/inc/MantidDataHandling/LoadILLSANS.h

@@ -8,6 +8,7 @@
 
 #include "MantidAPI/IFileLoader.h"
 #include "MantidDataHandling/LoadHelper.h"
+#include "MantidKernel/NexusDescriptor.h"
 #include "MantidKernel/System.h"
 #include "MantidNexus/NexusClasses.h"