Skip to content
Snippets Groups Projects
Commit b1ebe149 authored by Samuel Jones's avatar Samuel Jones
Browse files

Re #23570 Correcting name of member variable

parent 53283500
Branches 28238_updated_indirect_release_notes
No related tags found
No related merge requests found
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
ProjectRecoveryView::ProjectRecoveryView(QWidget *parent, ProjectRecoveryView::ProjectRecoveryView(QWidget *parent,
ProjectRecoveryPresenter *presenter) ProjectRecoveryPresenter *presenter)
: QDialog(parent), ui(std::make_unique<Ui::ProjectRecoveryWidget>()), : QDialog(parent), m_ui(std::make_unique<Ui::ProjectRecoveryWidget>()),
m_presenter(presenter) { m_presenter(presenter) {
ui->setupUi(this); m_ui->setupUi(this);
ui->tableWidget->horizontalHeader()->setResizeMode(QHeaderView::Stretch); m_ui->tableWidget->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
ui->tableWidget->verticalHeader()->setResizeMode(QHeaderView::Stretch); m_ui->tableWidget->verticalHeader()->setResizeMode(QHeaderView::Stretch);
ui->progressBar->setMinimum(0); m_ui->progressBar->setMinimum(0);
// Set the table information // Set the table information
addDataToTable(); addDataToTable();
Mantid::Kernel::UsageService::Instance().registerFeatureUsage( Mantid::Kernel::UsageService::Instance().registerFeatureUsage(
...@@ -31,8 +31,8 @@ ProjectRecoveryView::ProjectRecoveryView(QWidget *parent, ...@@ -31,8 +31,8 @@ ProjectRecoveryView::ProjectRecoveryView(QWidget *parent,
void ProjectRecoveryView::addDataToTable() { void ProjectRecoveryView::addDataToTable() {
const QStringList row = m_presenter->getRow(0); const QStringList row = m_presenter->getRow(0);
ui->tableWidget->setItem(0, 0, new QTableWidgetItem(row[0])); m_ui->tableWidget->setItem(0, 0, new QTableWidgetItem(row[0]));
ui->tableWidget->setItem(0, 1, new QTableWidgetItem(row[1])); m_ui->tableWidget->setItem(0, 1, new QTableWidgetItem(row[1]));
} }
void ProjectRecoveryView::onClickLastCheckpoint() { void ProjectRecoveryView::onClickLastCheckpoint() {
...@@ -65,12 +65,12 @@ void ProjectRecoveryView::reject() { ...@@ -65,12 +65,12 @@ void ProjectRecoveryView::reject() {
void ProjectRecoveryView::updateProgressBar(int newValue, bool err) { void ProjectRecoveryView::updateProgressBar(int newValue, bool err) {
if (!err) { if (!err) {
ui->progressBar->setValue(newValue); m_ui->progressBar->setValue(newValue);
} }
} }
void ProjectRecoveryView::setProgressBarMaximum(int newValue) { void ProjectRecoveryView::setProgressBarMaximum(int newValue) {
ui->progressBar->setMaximum(newValue); m_ui->progressBar->setMaximum(newValue);
} }
void ProjectRecoveryView::connectProgressBar() { void ProjectRecoveryView::connectProgressBar() {
...@@ -88,5 +88,5 @@ void ProjectRecoveryView::emitAbortScript() { ...@@ -88,5 +88,5 @@ void ProjectRecoveryView::emitAbortScript() {
} }
void ProjectRecoveryView::changeStartMantidButton(const QString &string) { void ProjectRecoveryView::changeStartMantidButton(const QString &string) {
ui->startmantidButton->setText(string); m_ui->startmantidButton->setText(string);
} }
\ No newline at end of file
...@@ -39,7 +39,7 @@ private slots: ...@@ -39,7 +39,7 @@ private slots:
private: private:
void addDataToTable(); void addDataToTable();
std::unique_ptr<Ui::ProjectRecoveryWidget> ui; std::unique_ptr<Ui::ProjectRecoveryWidget> m_ui;
ProjectRecoveryPresenter *m_presenter; ProjectRecoveryPresenter *m_presenter;
}; };
......
...@@ -15,12 +15,12 @@ ...@@ -15,12 +15,12 @@
RecoveryFailureView::RecoveryFailureView(QWidget *parent, RecoveryFailureView::RecoveryFailureView(QWidget *parent,
ProjectRecoveryPresenter *presenter) ProjectRecoveryPresenter *presenter)
: QDialog(parent), ui(std::make_unique<Ui::RecoveryFailure>()), : QDialog(parent), m_ui(std::make_unique<Ui::RecoveryFailure>()),
m_presenter(presenter) { m_presenter(presenter) {
ui->setupUi(this); m_ui->setupUi(this);
ui->tableWidget->horizontalHeader()->setResizeMode(QHeaderView::Stretch); m_ui->tableWidget->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
ui->tableWidget->verticalHeader()->setResizeMode(QHeaderView::Stretch); m_ui->tableWidget->verticalHeader()->setResizeMode(QHeaderView::Stretch);
// Make sure the UI has all the data it needs to display // Make sure the ui has all the data it needs to display
m_presenter->fillAllRows(); m_presenter->fillAllRows();
// Set the table information // Set the table information
addDataToTable(); addDataToTable();
...@@ -35,7 +35,7 @@ void RecoveryFailureView::addDataToTable() { ...@@ -35,7 +35,7 @@ void RecoveryFailureView::addDataToTable() {
for (auto i = 0; i < numberOfRows; ++i) { for (auto i = 0; i < numberOfRows; ++i) {
const auto row = m_presenter->getRow(i); const auto row = m_presenter->getRow(i);
for (auto j = 0; j < row.size(); ++j) { 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() { ...@@ -49,7 +49,7 @@ void RecoveryFailureView::onClickLastCheckpoint() {
void RecoveryFailureView::onClickSelectedCheckpoint() { void RecoveryFailureView::onClickSelectedCheckpoint() {
// Recover Selected // Recover Selected
QList<QTableWidgetItem *> selectedRows = ui->tableWidget->selectedItems(); QList<QTableWidgetItem *> selectedRows = m_ui->tableWidget->selectedItems();
if (selectedRows.size() > 0) { if (selectedRows.size() > 0) {
const QString text = selectedRows[0]->text(); const QString text = selectedRows[0]->text();
if (text.toStdString().empty()) { if (text.toStdString().empty()) {
...@@ -64,7 +64,7 @@ void RecoveryFailureView::onClickSelectedCheckpoint() { ...@@ -64,7 +64,7 @@ void RecoveryFailureView::onClickSelectedCheckpoint() {
void RecoveryFailureView::onClickOpenSelectedInScriptWindow() { void RecoveryFailureView::onClickOpenSelectedInScriptWindow() {
// Open checkpoint in script window // Open checkpoint in script window
QList<QTableWidgetItem *> selectedRows = ui->tableWidget->selectedItems(); QList<QTableWidgetItem *> selectedRows = m_ui->tableWidget->selectedItems();
if (selectedRows.size() > 0) { if (selectedRows.size() > 0) {
const QString text = selectedRows[0]->text(); const QString text = selectedRows[0]->text();
if (text.toStdString().empty()) { if (text.toStdString().empty()) {
...@@ -94,12 +94,12 @@ void RecoveryFailureView::reject() { ...@@ -94,12 +94,12 @@ void RecoveryFailureView::reject() {
void RecoveryFailureView::updateProgressBar(const int newValue, void RecoveryFailureView::updateProgressBar(const int newValue,
const bool err) { const bool err) {
if (!err) { if (!err) {
ui->progressBar->setValue(newValue); m_ui->progressBar->setValue(newValue);
} }
} }
void RecoveryFailureView::setProgressBarMaximum(const int newValue) { void RecoveryFailureView::setProgressBarMaximum(const int newValue) {
ui->progressBar->setMaximum(newValue); m_ui->progressBar->setMaximum(newValue);
} }
void RecoveryFailureView::connectProgressBar() { void RecoveryFailureView::connectProgressBar() {
...@@ -117,5 +117,5 @@ void RecoveryFailureView::emitAbortScript() { ...@@ -117,5 +117,5 @@ void RecoveryFailureView::emitAbortScript() {
} }
void RecoveryFailureView::changeStartMantidButton(const QString &string) { void RecoveryFailureView::changeStartMantidButton(const QString &string) {
ui->pushButton_3->setText(string); m_ui->pushButton_3->setText(string);
} }
\ No newline at end of file
...@@ -41,7 +41,7 @@ private slots: ...@@ -41,7 +41,7 @@ private slots:
private: private:
void addDataToTable(); void addDataToTable();
std::unique_ptr<Ui::RecoveryFailure> ui; std::unique_ptr<Ui::RecoveryFailure> m_ui;
ProjectRecoveryPresenter *m_presenter; ProjectRecoveryPresenter *m_presenter;
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment