From cda16ba0fbc763ff9d57573ac9191421fcc0e48c Mon Sep 17 00:00:00 2001 From: Martin Kleusberg Date: Tue, 8 Jan 2013 21:24:45 +0100 Subject: [PATCH] Remove the modified flag in the EditTableDialog Remove the flag storing the mofification status in the edit table dialog. It's only been used in one place and there it was not even really needed - so why bothering updating and maintaining it? --- src/EditTableDialog.cpp | 6 ------ src/EditTableDialog.h | 1 - src/MainWindow.cpp | 4 +--- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/EditTableDialog.cpp b/src/EditTableDialog.cpp index cfc99ca9..e9590d89 100644 --- a/src/EditTableDialog.cpp +++ b/src/EditTableDialog.cpp @@ -7,7 +7,6 @@ EditTableDialog::EditTableDialog(QWidget* parent) : QDialog(parent), - modified(false), pdb(0), ui(new Ui::EditTableDialog) { @@ -79,7 +78,6 @@ void EditTableDialog::accept() QMessageBox::warning(this, QApplication::applicationName(), QString("Error creating table. Message from database engine:\n%1").arg(pdb->lastErrorMessage)); return; } - modified = true; } else { // Editing of old table @@ -87,7 +85,6 @@ void EditTableDialog::accept() if(ui->editTableName->text() != curTable) { QApplication::setOverrideCursor( Qt::WaitCursor ); // this might take time - modified = true; if(!pdb->renameTable(curTable, ui->editTableName->text())) { QApplication::restoreOverrideCursor(); @@ -139,7 +136,6 @@ void EditTableDialog::editField() dialog.setInitialValues(pdb, curTable == "", curTable, item->text(0), item->text(1)); if(dialog.exec()) { - modified = true; item->setText(0, dialog.field_name); item->setText(1, dialog.field_type); } @@ -154,7 +150,6 @@ void EditTableDialog::addField() QTreeWidgetItem *tbitem = new QTreeWidgetItem(ui->treeWidget); tbitem->setText(0, dialog.field_name); tbitem->setText(1, dialog.field_type); - modified = true; ui->treeWidget->addTopLevelItem(tbitem); checkInput(); } @@ -185,7 +180,6 @@ void EditTableDialog::removeField() QMessageBox::warning(0, QApplication::applicationName(), pdb->lastErrorMessage); } else { delete ui->treeWidget->currentItem(); - modified = true; } } } diff --git a/src/EditTableDialog.h b/src/EditTableDialog.h index b9cc1307..e484431c 100644 --- a/src/EditTableDialog.h +++ b/src/EditTableDialog.h @@ -16,7 +16,6 @@ public: EditTableDialog(QWidget* parent = 0); ~EditTableDialog(); - bool modified; QString curTable; public slots: diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 29772f79..abc66170 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -627,9 +627,7 @@ void MainWindow::editTable() EditTableDialog dialog(this); dialog.setActiveTable(&db, tableToEdit); - dialog.exec(); - //check modified status - if(dialog.modified) + if(dialog.exec()) { populateStructure(); resetBrowser();