From b394484adca9f656ecf71bdd4f5adc614be496e8 Mon Sep 17 00:00:00 2001 From: Martyn Gigg <martyn.gigg@stfc.ac.uk> Date: Fri, 3 Apr 2020 14:36:07 +0100 Subject: [PATCH] Remove FrameworkManager.h from includes in any headers It is a header that is heavy and should never be needed in another header. It's long include chain now also has issues with older moc versions not parsing nested namespaces --- MantidPlot/src/ApplicationWindow.cpp | 1 + MantidPlot/src/Mantid/MantidMatrix.h | 1 - MantidPlot/src/Mantid/MantidUI.cpp | 1 + MantidPlot/src/Mantid/MantidUI.h | 1 - MantidPlot/src/ProjectRecovery.cpp | 1 + 5 files changed, 3 insertions(+), 2 deletions(-) diff --git a/MantidPlot/src/ApplicationWindow.cpp b/MantidPlot/src/ApplicationWindow.cpp index b5af9c61655..8b8074edf75 100644 --- a/MantidPlot/src/ApplicationWindow.cpp +++ b/MantidPlot/src/ApplicationWindow.cpp @@ -218,6 +218,7 @@ #include "MantidAPI/AlgorithmFactory.h" #include "MantidAPI/AnalysisDataService.h" #include "MantidAPI/CatalogManager.h" +#include "MantidAPI/FrameworkManager.h" #include "MantidAPI/ITableWorkspace.h" #include "MantidAPI/MultipleFileProperty.h" #include "MantidAPI/WorkspaceFactory.h" diff --git a/MantidPlot/src/Mantid/MantidMatrix.h b/MantidPlot/src/Mantid/MantidMatrix.h index 8cb759dddb9..ae413df95fc 100644 --- a/MantidPlot/src/Mantid/MantidMatrix.h +++ b/MantidPlot/src/Mantid/MantidMatrix.h @@ -19,7 +19,6 @@ #include "../MdiSubWindow.h" #include "../UserFunction.h" #include "MantidAPI/AnalysisDataService.h" -#include "MantidAPI/FrameworkManager.h" #include "MantidAPI/MatrixWorkspace_fwd.h" #include "MantidQtWidgets/Common/WorkspaceObserver.h" diff --git a/MantidPlot/src/Mantid/MantidUI.cpp b/MantidPlot/src/Mantid/MantidUI.cpp index 8f6158ce4c5..9e16596ecfb 100644 --- a/MantidPlot/src/Mantid/MantidUI.cpp +++ b/MantidPlot/src/Mantid/MantidUI.cpp @@ -57,6 +57,7 @@ #include "MantidQtWidgets/Common/WorkspacePresenter/WorkspaceTreeWidget.h" #include "MantidAPI/CompositeFunction.h" +#include "MantidAPI/FrameworkManager.h" #include "MantidAPI/IMDEventWorkspace.h" #include "MantidAPI/IMDHistoWorkspace.h" #include "MantidAPI/IPeaksWorkspace.h" diff --git a/MantidPlot/src/Mantid/MantidUI.h b/MantidPlot/src/Mantid/MantidUI.h index a19385119f6..cd684664d58 100644 --- a/MantidPlot/src/Mantid/MantidUI.h +++ b/MantidPlot/src/Mantid/MantidUI.h @@ -19,7 +19,6 @@ #include "MantidAPI/AlgorithmFactory.h" #include "MantidAPI/AlgorithmManager.h" #include "MantidAPI/AnalysisDataService.h" -#include "MantidAPI/FrameworkManager.h" #include "MantidAPI/IMDWorkspace.h" #include "MantidAPI/IPeaksWorkspace_fwd.h" #include "MantidAPI/MatrixWorkspace_fwd.h" diff --git a/MantidPlot/src/ProjectRecovery.cpp b/MantidPlot/src/ProjectRecovery.cpp index 7007e0d5a7b..6bad6b4b8a2 100644 --- a/MantidPlot/src/ProjectRecovery.cpp +++ b/MantidPlot/src/ProjectRecovery.cpp @@ -43,6 +43,7 @@ #include <chrono> #include <condition_variable> #include <ctime> +#include <fstream> #include <iomanip> #include <mutex> #include <signal.h> -- GitLab