Re #18826 Reinstate unique pointer IBatchPresenter in MainWindow

qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchPresenterFactory.h

@@ -37,7 +37,7 @@ public:
         m_instrumentPresenterFactory(std::move(instrumentPresenterFactory)),
         m_savePresenterFactory(std::move(savePresenterFactory)) {}
 
-  std::shared_ptr<IBatchPresenter> make(IBatchView *view) override {
+  std::unique_ptr<IBatchPresenter> make(IBatchView *view) override {
     auto runsPresenter = m_runsPresenterFactory.make(view->runs());
     auto eventPresenter = m_eventPresenterFactory.make(view->eventHandling());
     auto experimentPresenter =
@@ -50,7 +50,7 @@ public:
         experimentPresenter->experiment(), instrumentPresenter->instrument(),
         runsPresenter->mutableRunsTable(), eventPresenter->slicing());
 
-    return std::make_shared<BatchPresenter>(
+    return std::make_unique<BatchPresenter>(
         view, std::move(model), std::move(runsPresenter),
         std::move(eventPresenter), std::move(experimentPresenter),
         std::move(instrumentPresenter), std::move(savePresenter));

qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchPresenterFactory.h

@@ -18,7 +18,7 @@ class IBatchView;
 class IBatchPresenterFactory {
 public:
   virtual ~IBatchPresenterFactory() = default;
-  virtual std::shared_ptr<IBatchPresenter> make(IBatchView *view) = 0;
+  virtual std::unique_ptr<IBatchPresenter> make(IBatchView *view) = 0;
 };
 } // namespace ISISReflectometry
 } // namespace CustomInterfaces

qt/scientific_interfaces/ISISReflectometry/GUI/Common/Decoder.cpp

@@ -17,9 +17,9 @@ namespace ISISReflectometry {
 BatchPresenter *Decoder::findBatchPresenter(const QtBatchView *gui,
                                             const QtMainWindowView &mwv) {
   for (auto &ipresenter : mwv.m_presenter->m_batchPresenters) {
-    auto presenter = std::dynamic_pointer_cast<BatchPresenter>(ipresenter);
+    auto presenter = dynamic_cast<BatchPresenter *>(ipresenter.get());
     if (presenter->m_view == gui) {
-      return presenter.get();
+      return presenter;
     }
   }
   return nullptr;

qt/scientific_interfaces/ISISReflectometry/GUI/Common/Encoder.cpp

@@ -14,9 +14,9 @@ namespace ISISReflectometry {
 BatchPresenter *Encoder::findBatchPresenter(const QtBatchView *gui,
                                             const QtMainWindowView &mwv) {
   for (auto &ipresenter : mwv.m_presenter->m_batchPresenters) {
-    auto presenter = std::dynamic_pointer_cast<BatchPresenter>(ipresenter);
+    auto presenter = dynamic_cast<BatchPresenter *>(ipresenter.get());
     if (presenter->m_view == gui) {
-      return presenter.get();
+      return presenter;
     }
   }
   return nullptr;

qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.h

@@ -58,7 +58,7 @@ public:
 protected:
   IMainWindowView *m_view;
   IMessageHandler *m_messageHandler;
-  std::vector<std::shared_ptr<IBatchPresenter>> m_batchPresenters;
+  std::vector<std::unique_ptr<IBatchPresenter>> m_batchPresenters;
   std::unique_ptr<IBatchPresenterFactory> m_batchPresenterFactory;
 
 private:

qt/scientific_interfaces/test/ISISReflectometry/ReflMockObjects.h

@@ -45,8 +45,8 @@ GNU_DIAG_OFF_SUGGEST_OVERRIDE
 class MockBatchPresenterFactory : public IBatchPresenterFactory {
 public:
   MOCK_METHOD1(makeProxy, IBatchPresenter *(IBatchView *));
-  std::shared_ptr<IBatchPresenter> make(IBatchView *view) {
-    return std::shared_ptr<IBatchPresenter>(makeProxy(view));
+  std::unique_ptr<IBatchPresenter> make(IBatchView *view) {
+    return std::unique_ptr<IBatchPresenter>(makeProxy(view));
   }
 };