Re #16869 Suggested changes (1)

MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflRunsTabView.h

@@ -71,7 +71,7 @@ public:
   virtual std::string getSearchString() const = 0;
   virtual std::string getTransferMethod() const = 0;
 
-  virtual IReflRunsTabPresenter *getPresenter() const = 0;
+  virtual IReflRunsTabPresenter *const getPresenter() const = 0;
   virtual boost::shared_ptr<MantidQt::API::AlgorithmRunner>
   getAlgorithmRunner() const = 0;
 };

MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/IReflSettingsTabView.h

@@ -42,7 +42,7 @@ public:
   /// Destructor
   virtual ~IReflSettingsTabView(){};
   /// Returns the presenter managing this view
-  virtual IReflSettingsTabPresenter *getPresenter() const = 0;
+  virtual IReflSettingsTabPresenter *const getPresenter() const = 0;
 
   /// Processing
   /// Returns selected analysis mode

MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/QtReflRunsTabView.h

@@ -89,7 +89,7 @@ public:
   std::string getSearchString() const override;
   std::string getTransferMethod() const override;
 
-  IReflRunsTabPresenter *getPresenter() const override;
+  IReflRunsTabPresenter *const getPresenter() const override;
   boost::shared_ptr<MantidQt::API::AlgorithmRunner>
   getAlgorithmRunner() const override;
 

MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Reflectometry/QtReflSettingsTabView.h

@@ -42,7 +42,7 @@ public:
   /// Destructor
   ~QtReflSettingsTabView() override;
   /// Returns the presenter managing this view
-  IReflSettingsTabPresenter *getPresenter() const;
+  IReflSettingsTabPresenter *const getPresenter() const;
   /// Returns selected analysis mode
   std::string getAnalysisMode() const override;
   /// Returns selected resolution (dQ/Q)

MantidQt/CustomInterfaces/src/Reflectometry/QtReflRunsTabView.cpp

@@ -48,10 +48,9 @@ void QtReflRunsTabView::initLayout() {
 
   // Create the DataProcessor presenter
   ReflGenericDataProcessorPresenterFactory presenterFactory;
-  auto processorPresenter = presenterFactory.create();
 
   QDataProcessorWidget *qDataProcessorWidget = new QDataProcessorWidget(
-      std::unique_ptr<DataProcessorPresenter>(processorPresenter.release()),
+      std::unique_ptr<DataProcessorPresenter>(presenterFactory.create()),
       this);
   ui.layoutProcessPane->addWidget(qDataProcessorWidget);
 
@@ -278,7 +277,7 @@ std::set<int> QtReflRunsTabView::getSelectedSearchRows() const {
 Get a pointer to the presenter that's currently controlling this view.
 @returns A pointer to the presenter
 */
-IReflRunsTabPresenter *QtReflRunsTabView::getPresenter() const {
+IReflRunsTabPresenter *const QtReflRunsTabView::getPresenter() const {
   return m_presenter.get();
 }
 

MantidQt/CustomInterfaces/src/Reflectometry/QtReflSettingsTabView.cpp

@@ -8,11 +8,9 @@ namespace CustomInterfaces {
 /** Constructor
 * @param parent :: [input] The parent of this widget
 */
-QtReflSettingsTabView::QtReflSettingsTabView(QWidget *parent) {
+QtReflSettingsTabView::QtReflSettingsTabView(QWidget *parent): m_presenter(new ReflSettingsTabPresenter(this)) {
 
   initLayout();
-
-  m_presenter.reset(new ReflSettingsTabPresenter(this));
 }
 
 //----------------------------------------------------------------------------------------------
@@ -28,7 +26,7 @@ void QtReflSettingsTabView::initLayout() { m_ui.setupUi(this); }
 /** Returns the presenter managing this view
 * @return :: A pointer to the presenter
 */
-IReflSettingsTabPresenter *QtReflSettingsTabView::getPresenter() const {
+IReflSettingsTabPresenter *const QtReflSettingsTabView::getPresenter() const {
 
   return m_presenter.get();
 }

MantidQt/CustomInterfaces/src/Reflectometry/ReflMainWindowPresenter.cpp

@@ -43,6 +43,9 @@ ReflMainWindowPresenter::getPreprocessingOptions() const {
 */
 std::string ReflMainWindowPresenter::getProcessingOptions() const {
 
+	if (m_settingsPresenter == nullptr)
+		throw std::runtime_error("Could not read settings");
+
   // Request global processing options to 'Settings' presenter
   return m_settingsPresenter->getProcessingOptions();
 }
@@ -52,6 +55,9 @@ std::string ReflMainWindowPresenter::getProcessingOptions() const {
 */
 std::string ReflMainWindowPresenter::getPostprocessingOptions() const {
 
+	if (m_settingsPresenter == nullptr)
+		throw std::runtime_error("Could not read settings");
+
   // Request global post-processing options to 'Settings' presenter
   return m_settingsPresenter->getPostprocessingOptions();
 }

MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/DataProcessorUI/DataProcessorView.h

@@ -78,7 +78,7 @@ public:
   virtual std::string getWorkspaceToOpen() const = 0;
   virtual std::string getClipboard() const = 0;
   virtual std::string getProcessInstrument() const = 0;
-  virtual DataProcessorPresenter *getPresenter() const = 0;
+  virtual DataProcessorPresenter *const getPresenter() const = 0;
 };
 }
 }

MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/DataProcessorUI/QDataProcessorWidget.h

@@ -84,7 +84,7 @@ public:
   std::string getWorkspaceToOpen() const override;
   std::string getClipboard() const override;
 
-  DataProcessorPresenter *getPresenter() const override;
+  DataProcessorPresenter *const getPresenter() const override;
 
 private:
   // initialise the interface

MantidQt/MantidWidgets/src/DataProcessorUI/QDataProcessorWidget.cpp

@@ -481,7 +481,7 @@ std::string QDataProcessorWidget::getWorkspaceToOpen() const {
 Get a pointer to the presenter that's currently controlling this view.
 @returns A pointer to the presenter
 */
-DataProcessorPresenter *QDataProcessorWidget::getPresenter() const {
+DataProcessorPresenter *const QDataProcessorWidget::getPresenter() const {
   return m_presenter.get();
 }