From 1b87504400175e07aae0a6f36c3a150edcdee04b Mon Sep 17 00:00:00 2001 From: Applin Date: Fri, 26 Apr 2024 12:15:17 +0100 Subject: [PATCH] Remove unused includes and functions --- .../Indirect/Common/IndirectInstrumentConfig.h | 1 - .../Indirect/Reduction/IndirectDataReduction.cpp | 8 -------- .../Indirect/Reduction/IndirectDataReduction.h | 3 --- qt/scientific_interfaces/Inelastic/Common/IndirectTab.h | 1 - qt/widgets/common/inc/MantidQtWidgets/Common/IJobRunner.h | 1 - .../common/inc/MantidQtWidgets/Common/QtJobRunner.h | 1 - qt/widgets/common/src/QtJobRunner.cpp | 2 -- 7 files changed, 17 deletions(-) diff --git a/qt/scientific_interfaces/Indirect/Common/IndirectInstrumentConfig.h b/qt/scientific_interfaces/Indirect/Common/IndirectInstrumentConfig.h index 510b271f37dc..32bb30871bf6 100644 --- a/qt/scientific_interfaces/Indirect/Common/IndirectInstrumentConfig.h +++ b/qt/scientific_interfaces/Indirect/Common/IndirectInstrumentConfig.h @@ -12,7 +12,6 @@ #include "MantidAPI/MatrixWorkspace_fwd.h" #include "MantidQtWidgets/Common/InstrumentSelector.h" #include "MantidQtWidgets/Common/MantidWidget.h" -#include "MantidQtWidgets/Common/QtAlgorithmRunner.h" #include diff --git a/qt/scientific_interfaces/Indirect/Reduction/IndirectDataReduction.cpp b/qt/scientific_interfaces/Indirect/Reduction/IndirectDataReduction.cpp index ce1eecb98217..0d1d052a711f 100644 --- a/qt/scientific_interfaces/Indirect/Reduction/IndirectDataReduction.cpp +++ b/qt/scientific_interfaces/Indirect/Reduction/IndirectDataReduction.cpp @@ -41,22 +41,14 @@ DECLARE_SUBWINDOW(IndirectDataReduction) IndirectDataReduction::IndirectDataReduction(QWidget *parent) : IndirectInterface(parent), m_settingsGroup("CustomInterfaces/IndirectDataReduction"), - m_algRunner(new MantidQt::API::QtAlgorithmRunner(this)), m_changeObserver(*this, &IndirectDataReduction::handleConfigChange), m_ipfFilename(""), m_idfDirectory(Mantid::Kernel::ConfigService::Instance().getString("instrumentDefinition.directory")), m_instDetails() { - // Signals to report load instrument algo result - connect(m_algRunner, SIGNAL(algorithmComplete(bool)), this, SLOT(instrumentLoadingDone(bool))); - Mantid::Kernel::ConfigService::Instance().addObserver(m_changeObserver); } IndirectDataReduction::~IndirectDataReduction() { Mantid::Kernel::ConfigService::Instance().removeObserver(m_changeObserver); - - // Make sure no algos are running after the window has been closed - m_algRunner->cancelRunningAlgorithm(); - saveSettings(); } diff --git a/qt/scientific_interfaces/Indirect/Reduction/IndirectDataReduction.h b/qt/scientific_interfaces/Indirect/Reduction/IndirectDataReduction.h index 5ea7767d7604..46ee56b925d7 100644 --- a/qt/scientific_interfaces/Indirect/Reduction/IndirectDataReduction.h +++ b/qt/scientific_interfaces/Indirect/Reduction/IndirectDataReduction.h @@ -13,7 +13,6 @@ #include "MantidAPI/MatrixWorkspace.h" #include "MantidGeometry/IComponent.h" #include "MantidQtWidgets/Common/AlgorithmRunner.h" -#include "MantidQtWidgets/Common/QtAlgorithmRunner.h" #include "MantidQtWidgets/Common/QtJobRunner.h" #include @@ -190,8 +189,6 @@ private slots: Ui::IndirectDataReduction m_uiForm; /// The settings group QString m_settingsGroup; - /// Runner for insturment load algorithm - MantidQt::API::QtAlgorithmRunner *m_algRunner; // All indirect tabs QMap> m_tabs; diff --git a/qt/scientific_interfaces/Inelastic/Common/IndirectTab.h b/qt/scientific_interfaces/Inelastic/Common/IndirectTab.h index ab22f4c4974e..880f61d29211 100644 --- a/qt/scientific_interfaces/Inelastic/Common/IndirectTab.h +++ b/qt/scientific_interfaces/Inelastic/Common/IndirectTab.h @@ -12,7 +12,6 @@ #include "MantidAPI/ITableWorkspace.h" #include "MantidKernel/DateAndTime.h" #include "MantidQtWidgets/Common/BatchAlgorithmRunner.h" -#include "MantidQtWidgets/Common/QtAlgorithmRunner.h" #include "MantidQtWidgets/Common/QtPropertyBrowser/QtIntPropertyManager" #include "MantidQtWidgets/Common/QtPropertyBrowser/QtTreePropertyBrowser" #include "MantidQtWidgets/Common/QtPropertyBrowser/qteditorfactory.h" diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/IJobRunner.h b/qt/widgets/common/inc/MantidQtWidgets/Common/IJobRunner.h index d4221c1540b5..a9d94ab67761 100644 --- a/qt/widgets/common/inc/MantidQtWidgets/Common/IJobRunner.h +++ b/qt/widgets/common/inc/MantidQtWidgets/Common/IJobRunner.h @@ -45,6 +45,5 @@ class EXPORT_OPT_MANTIDQT_COMMON IJobRunner { virtual void executeAlgorithmQueue() = 0; virtual void executeAlgorithm(MantidQt::API::IConfiguredAlgorithm_sptr algorithm) = 0; virtual void cancelAlgorithmQueue() = 0; - virtual std::size_t queueLength() = 0; }; } // namespace MantidQt::API diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/QtJobRunner.h b/qt/widgets/common/inc/MantidQtWidgets/Common/QtJobRunner.h index 0708232369b9..2b92ef10503f 100644 --- a/qt/widgets/common/inc/MantidQtWidgets/Common/QtJobRunner.h +++ b/qt/widgets/common/inc/MantidQtWidgets/Common/QtJobRunner.h @@ -29,7 +29,6 @@ class EXPORT_OPT_MANTIDQT_COMMON QtJobRunner : public QObject, public IJobRunner void executeAlgorithmQueue() override; void executeAlgorithm(MantidQt::API::IConfiguredAlgorithm_sptr algorithm) override; void cancelAlgorithmQueue() override; - std::size_t queueLength() override; private slots: void onBatchComplete(bool error); diff --git a/qt/widgets/common/src/QtJobRunner.cpp b/qt/widgets/common/src/QtJobRunner.cpp index 0f4ab75ac010..ec9845b07ab0 100644 --- a/qt/widgets/common/src/QtJobRunner.cpp +++ b/qt/widgets/common/src/QtJobRunner.cpp @@ -35,8 +35,6 @@ void QtJobRunner::executeAlgorithm(IConfiguredAlgorithm_sptr algorithm) { m_batchAlgoRunner.executeAlgorithmAsync(std::move(algorithm)); } -std::size_t QtJobRunner::queueLength() { return m_batchAlgoRunner.queueLength(); } - void QtJobRunner::cancelAlgorithmQueue() { m_batchAlgoRunner.cancelBatch(); } void QtJobRunner::connectBatchAlgoRunnerSlots() {