From 5850a092581bf6a54d11f34e90854ce88bcce903 Mon Sep 17 00:00:00 2001 From: Gemma Guest <gemma.guest@stfc.ac.uk> Date: Tue, 6 Aug 2019 11:22:14 +0100 Subject: [PATCH] Remove unnecessary include statement This causes a compile error unless the destructor is defined in the cpp file (see the comments on PR #26510) Re #26498 --- .../ISISReflectometry/GUI/MainWindow/MainWindowPresenter.cpp | 2 ++ .../ISISReflectometry/GUI/MainWindow/MainWindowPresenter.h | 1 + .../ISISReflectometry/GUI/MainWindow/QtMainWindowView.h | 3 ++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.cpp index 3347c56deae..405b2e1e6c8 100644 --- a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.cpp +++ b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.cpp @@ -33,6 +33,8 @@ MainWindowPresenter::MainWindowPresenter( addNewBatch(batchView); } +MainWindowPresenter::~MainWindowPresenter() = default; + void MainWindowPresenter::notifyNewBatchRequested() { auto *newBatchView = m_view->newBatch(); addNewBatch(newBatchView); diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.h index 9a34b8b90b0..88bd159188b 100644 --- a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.h +++ b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.h @@ -34,6 +34,7 @@ public: MainWindowPresenter( IMainWindowView *view, IMessageHandler *messageHandler, std::unique_ptr<IBatchPresenterFactory> batchPresenterFactory); + ~MainWindowPresenter(); // IMainWindowPresenter overrides bool isAnyBatchProcessing() const override; diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/QtMainWindowView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/QtMainWindowView.h index df3e9e7604c..3470ac94bd2 100644 --- a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/QtMainWindowView.h +++ b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/QtMainWindowView.h @@ -7,7 +7,6 @@ #ifndef MANTID_ISISREFLECTOMETRY_QTMAINWINDOWVIEW_H #define MANTID_ISISREFLECTOMETRY_QTMAINWINDOWVIEW_H -#include "GUI/Batch/IBatchPresenterFactory.h" #include "GUI/Common/IMessageHandler.h" #include "GUI/Common/IPythonRunner.h" #include "IMainWindowPresenter.h" @@ -17,6 +16,7 @@ #include "ui_MainWindowWidget.h" #include <QCloseEvent> +#include <memory> namespace MantidQt { namespace CustomInterfaces { @@ -34,6 +34,7 @@ class QtMainWindowView : public MantidQt::API::UserSubWindow, Q_OBJECT public: explicit QtMainWindowView(QWidget *parent = nullptr); + void subscribe(MainWindowSubscriber *notifyee) override; static std::string name() { return "ISIS Reflectometry"; } -- GitLab