diff --git a/MantidPlot/src/ProjectRecoveryGUIs/ProjectRecoveryView.cpp b/MantidPlot/src/ProjectRecoveryGUIs/ProjectRecoveryView.cpp index 94ee234382f2c5f040923f99db2e2207c0105759..d7092ae9dd93b3ac625bf16eeb8637f4b7cbd881 100644 --- a/MantidPlot/src/ProjectRecoveryGUIs/ProjectRecoveryView.cpp +++ b/MantidPlot/src/ProjectRecoveryGUIs/ProjectRecoveryView.cpp @@ -17,12 +17,12 @@ ProjectRecoveryView::ProjectRecoveryView(QWidget *parent, ProjectRecoveryPresenter *presenter) - : QDialog(parent), ui(std::make_unique<Ui::ProjectRecoveryWidget>()), + : QDialog(parent), m_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); + m_ui->setupUi(this); + m_ui->tableWidget->horizontalHeader()->setResizeMode(QHeaderView::Stretch); + m_ui->tableWidget->verticalHeader()->setResizeMode(QHeaderView::Stretch); + m_ui->progressBar->setMinimum(0); // Set the table information addDataToTable(); Mantid::Kernel::UsageService::Instance().registerFeatureUsage( @@ -31,8 +31,8 @@ ProjectRecoveryView::ProjectRecoveryView(QWidget *parent, 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])); + m_ui->tableWidget->setItem(0, 0, new QTableWidgetItem(row[0])); + m_ui->tableWidget->setItem(0, 1, new QTableWidgetItem(row[1])); } void ProjectRecoveryView::onClickLastCheckpoint() { @@ -65,12 +65,12 @@ void ProjectRecoveryView::reject() { void ProjectRecoveryView::updateProgressBar(int newValue, bool err) { if (!err) { - ui->progressBar->setValue(newValue); + m_ui->progressBar->setValue(newValue); } } void ProjectRecoveryView::setProgressBarMaximum(int newValue) { - ui->progressBar->setMaximum(newValue); + m_ui->progressBar->setMaximum(newValue); } void ProjectRecoveryView::connectProgressBar() { @@ -88,5 +88,5 @@ void ProjectRecoveryView::emitAbortScript() { } void ProjectRecoveryView::changeStartMantidButton(const QString &string) { - ui->startmantidButton->setText(string); + m_ui->startmantidButton->setText(string); } \ No newline at end of file diff --git a/MantidPlot/src/ProjectRecoveryGUIs/ProjectRecoveryView.h b/MantidPlot/src/ProjectRecoveryGUIs/ProjectRecoveryView.h index 1c9a5c91fab2b4ca58c9ec0da0e936743ee460d5..3bf88f28a7086713e72ec9dffb3ea858b36bf7fe 100644 --- a/MantidPlot/src/ProjectRecoveryGUIs/ProjectRecoveryView.h +++ b/MantidPlot/src/ProjectRecoveryGUIs/ProjectRecoveryView.h @@ -39,7 +39,7 @@ private slots: private: void addDataToTable(); - std::unique_ptr<Ui::ProjectRecoveryWidget> ui; + std::unique_ptr<Ui::ProjectRecoveryWidget> m_ui; ProjectRecoveryPresenter *m_presenter; }; diff --git a/MantidPlot/src/ProjectRecoveryGUIs/RecoveryFailureView.cpp b/MantidPlot/src/ProjectRecoveryGUIs/RecoveryFailureView.cpp index 337621d2cde8a8efd1f5d7cc57324f6ceac43c01..cf33188b2917f1474718b9a6d42c336ebfd50326 100644 --- a/MantidPlot/src/ProjectRecoveryGUIs/RecoveryFailureView.cpp +++ b/MantidPlot/src/ProjectRecoveryGUIs/RecoveryFailureView.cpp @@ -15,12 +15,12 @@ RecoveryFailureView::RecoveryFailureView(QWidget *parent, ProjectRecoveryPresenter *presenter) - : QDialog(parent), ui(std::make_unique<Ui::RecoveryFailure>()), + : QDialog(parent), m_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_ui->setupUi(this); + m_ui->tableWidget->horizontalHeader()->setResizeMode(QHeaderView::Stretch); + m_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(); @@ -35,7 +35,7 @@ void RecoveryFailureView::addDataToTable() { for (auto i = 0; i < numberOfRows; ++i) { const auto row = m_presenter->getRow(i); for (auto j = 0; j < row.size(); ++j) { - ui->tableWidget->setItem(i, j, new QTableWidgetItem(row[j])); + m_ui->tableWidget->setItem(i, j, new QTableWidgetItem(row[j])); } } } @@ -49,7 +49,7 @@ void RecoveryFailureView::onClickLastCheckpoint() { void RecoveryFailureView::onClickSelectedCheckpoint() { // Recover Selected - QList<QTableWidgetItem *> selectedRows = ui->tableWidget->selectedItems(); + QList<QTableWidgetItem *> selectedRows = m_ui->tableWidget->selectedItems(); if (selectedRows.size() > 0) { const QString text = selectedRows[0]->text(); if (text.toStdString().empty()) { @@ -64,7 +64,7 @@ void RecoveryFailureView::onClickSelectedCheckpoint() { void RecoveryFailureView::onClickOpenSelectedInScriptWindow() { // Open checkpoint in script window - QList<QTableWidgetItem *> selectedRows = ui->tableWidget->selectedItems(); + QList<QTableWidgetItem *> selectedRows = m_ui->tableWidget->selectedItems(); if (selectedRows.size() > 0) { const QString text = selectedRows[0]->text(); if (text.toStdString().empty()) { @@ -94,12 +94,12 @@ void RecoveryFailureView::reject() { void RecoveryFailureView::updateProgressBar(const int newValue, const bool err) { if (!err) { - ui->progressBar->setValue(newValue); + m_ui->progressBar->setValue(newValue); } } void RecoveryFailureView::setProgressBarMaximum(const int newValue) { - ui->progressBar->setMaximum(newValue); + m_ui->progressBar->setMaximum(newValue); } void RecoveryFailureView::connectProgressBar() { @@ -117,5 +117,5 @@ void RecoveryFailureView::emitAbortScript() { } void RecoveryFailureView::changeStartMantidButton(const QString &string) { - ui->pushButton_3->setText(string); + m_ui->pushButton_3->setText(string); } \ No newline at end of file diff --git a/MantidPlot/src/ProjectRecoveryGUIs/RecoveryFailureView.h b/MantidPlot/src/ProjectRecoveryGUIs/RecoveryFailureView.h index dc9e724f00c0f7c4771088f959f402060b298d57..6a6c63a7bf6bdd9fac2266ca6e2acc10e54edbc3 100644 --- a/MantidPlot/src/ProjectRecoveryGUIs/RecoveryFailureView.h +++ b/MantidPlot/src/ProjectRecoveryGUIs/RecoveryFailureView.h @@ -41,7 +41,7 @@ private slots: private: void addDataToTable(); - std::unique_ptr<Ui::RecoveryFailure> ui; + std::unique_ptr<Ui::RecoveryFailure> m_ui; ProjectRecoveryPresenter *m_presenter; };