Re #23570 Ui objects unique_ptr

MantidPlot/src/ProjectRecoveryGUIs/ProjectRecoveryView.cpp

@@ -13,24 +13,23 @@
 #include "ScriptingWindow.h"
 #include "ui_ProjectRecoveryWidget.h"
 #include <boost/smart_ptr/make_shared.hpp>
+#include <memory>
 
 ProjectRecoveryView::ProjectRecoveryView(QWidget *parent,
                                          ProjectRecoveryPresenter *presenter)
-    : QDialog(parent), ui(new Ui::ProjectRecoveryWidget),
+    : QDialog(parent), ui(std::make_unique<Ui::ProjectRecoveryWidget>()),
       m_presenter(presenter) {
   ui->setupUi(this);
   ui->tableWidget->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
   ui->tableWidget->verticalHeader()->setResizeMode(QHeaderView::Stretch);
   ui->progressBar->setMinimum(0);
   // Set the table information
-  addDataToTable(ui);
+  addDataToTable();
   Mantid::Kernel::UsageService::Instance().registerFeatureUsage(
       "Interface", "ProjectRecoveryWindow", true);
 }
 
-ProjectRecoveryView::~ProjectRecoveryView() { delete ui; }
-
-void ProjectRecoveryView::addDataToTable(Ui::ProjectRecoveryWidget *ui) {
+void ProjectRecoveryView::addDataToTable() {
   const QStringList row = m_presenter->getRow(0);
   ui->tableWidget->setItem(0, 0, new QTableWidgetItem(row[0]));
   ui->tableWidget->setItem(0, 1, new QTableWidgetItem(row[1]));

MantidPlot/src/ProjectRecoveryGUIs/ProjectRecoveryView.h

@@ -8,12 +8,10 @@
 #define PROJECTRECOVERYVIEW_H
 
 #include "ProjectRecoveryPresenter.h"
+#include "ui_ProjectRecoveryWidget.h"
 #include <QDialog>
 #include <QWidget>
-
-namespace Ui {
-class ProjectRecoveryWidget;
-}
+#include <memory>
 
 class ProjectRecoveryView : public QDialog {
   Q_OBJECT
@@ -21,7 +19,6 @@ class ProjectRecoveryView : public QDialog {
 public:
   explicit ProjectRecoveryView(QWidget *parent = 0,
                                ProjectRecoveryPresenter *presenter = nullptr);
-  ~ProjectRecoveryView();
   void reject() override;
   void setProgressBarMaximum(int newValue);
   void connectProgressBar();
@@ -40,9 +37,9 @@ private slots:
   void onClickStartMantidNormally();
 
 private:
-  void addDataToTable(Ui::ProjectRecoveryWidget *ui);
+  void addDataToTable();
 
-  Ui::ProjectRecoveryWidget *ui;
+  std::unique_ptr<Ui::ProjectRecoveryWidget> ui;
   ProjectRecoveryPresenter *m_presenter;
 };
 

MantidPlot/src/ProjectRecoveryGUIs/RecoveryFailureView.cpp

@@ -11,24 +11,24 @@
 #include "ScriptingWindow.h"
 #include "ui_RecoveryFailure.h"
 #include <boost/smart_ptr/make_shared.hpp>
+#include <memory>
 
 RecoveryFailureView::RecoveryFailureView(QWidget *parent,
                                          ProjectRecoveryPresenter *presenter)
-    : QDialog(parent), ui(new Ui::RecoveryFailure), m_presenter(presenter) {
+    : QDialog(parent), ui(std::make_unique<Ui::RecoveryFailure>()),
+      m_presenter(presenter) {
   ui->setupUi(this);
   ui->tableWidget->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
   ui->tableWidget->verticalHeader()->setResizeMode(QHeaderView::Stretch);
   // Make sure the UI has all the data it needs to display
   m_presenter->fillAllRows();
   // Set the table information
-  addDataToTable(ui);
+  addDataToTable();
   Mantid::Kernel::UsageService::Instance().registerFeatureUsage(
       "Interface", "ProjectRecoveryFailureWindow", true);
 }
 
-RecoveryFailureView::~RecoveryFailureView() { delete ui; }
-
-void RecoveryFailureView::addDataToTable(Ui::RecoveryFailure *ui) {
+void RecoveryFailureView::addDataToTable() {
   // This table's size was generated for 5 which is the default but will take
   // more or less than 5, but won't look as neat
   const auto numberOfRows = m_presenter->getNumberOfCheckpoints();

MantidPlot/src/ProjectRecoveryGUIs/RecoveryFailureView.h

@@ -8,12 +8,10 @@
 #define RECOVERYFAILUREVIEW_H
 
 #include "ProjectRecoveryPresenter.h"
+#include "ui_RecoveryFailure.h"
 #include <QDialog>
 #include <QWidget>
-
-namespace Ui {
-class RecoveryFailure;
-}
+#include <memory>
 
 class RecoveryFailureView : public QDialog {
   Q_OBJECT
@@ -21,7 +19,6 @@ class RecoveryFailureView : public QDialog {
 public:
   explicit RecoveryFailureView(QWidget *parent = 0,
                                ProjectRecoveryPresenter *presenter = nullptr);
-  ~RecoveryFailureView();
   void reject() override;
 
   void setProgressBarMaximum(const int newValue);
@@ -42,9 +39,9 @@ private slots:
   void onClickStartMantidNormally();
 
 private:
-  void addDataToTable(Ui::RecoveryFailure *ui);
+  void addDataToTable();
 
-  Ui::RecoveryFailure *ui;
+  std::unique_ptr<Ui::RecoveryFailure> ui;
   ProjectRecoveryPresenter *m_presenter;
 };