diff options
author | Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-10-01 18:12:59 +0200 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2018-10-04 10:22:11 +0200 |
commit | 5a787305612c18ee9a442e4dd6067d3c35f05f87 (patch) | |
tree | c3456b3c5eb99131480d6a227ac71f4f591c81be /desktop-widgets/divelogimportdialog.cpp | |
parent | 3f51849dc3582d34683c111e5fd3a53f414ab1c2 (diff) | |
download | subsurface-5a787305612c18ee9a442e4dd6067d3c35f05f87.tar.gz |
Import: Make DiveLogImportDialog modal
By making this modal, we can use a local variable and remove the
nasty "deleteLater()" hack to reclaim the resources after the
dialog closes.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets/divelogimportdialog.cpp')
-rw-r--r-- | desktop-widgets/divelogimportdialog.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/desktop-widgets/divelogimportdialog.cpp b/desktop-widgets/divelogimportdialog.cpp index 61549a7f1..5df477349 100644 --- a/desktop-widgets/divelogimportdialog.cpp +++ b/desktop-widgets/divelogimportdialog.cpp @@ -1010,22 +1010,6 @@ void DiveLogImportDialog::on_buttonBox_accepted() MainWindow::instance()->refreshDisplay(); } -// Since this is a non-modal dialog, the caller can't delete it at the call-site. -// Therefore, hook into the accept() and reject() functions and schedule the object -// for deletion with deleteLater(). Horrible, but absolutely the "Qt-way". -// TODO: Think about making the dialog modal. -void DiveLogImportDialog::accept() -{ - QDialog::accept(); - deleteLater(); -} - -void DiveLogImportDialog::reject() -{ - QDialog::reject(); - deleteLater(); -} - TagDragDelegate::TagDragDelegate(QObject *parent) : QStyledItemDelegate(parent) { } |