diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-03-15 17:52:19 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-04-12 18:19:07 +0300 |
| commit | 3a3089770a5af9ef421779186f4dd47b01611ad2 (patch) | |
| tree | c50384a9d2fa3e94666ce7c5ab13ec904d8bf95d | |
| parent | 59239cec02aedda8c2651a04c65c580a9ff190a9 (diff) | |
| download | subsurface-3a3089770a5af9ef421779186f4dd47b01611ad2.tar.gz | |
Cleanup: remove LocationInformationWidget::endEditDiveSite signal
The signal was caught by the MainWindow to:
1) call setDefaultState()
2) call refreshDisplay()
3) call refreshDisplayedDiveSite()
1) Let's call that directly from the widget. The reason is that in
the future there might be multiple way to get into the widget and
therefore the widget needs finer control.
2) Remove this call as it produces an unsteady UI.
3) This should be done by undo commands, not only when finishing
dive site editing.
Thus, the signal becomes unnecessary and can be removed.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
| -rw-r--r-- | desktop-widgets/locationinformation.cpp | 1 | ||||
| -rw-r--r-- | desktop-widgets/locationinformation.h | 3 | ||||
| -rw-r--r-- | desktop-widgets/mainwindow.cpp | 5 |
3 files changed, 0 insertions, 9 deletions
diff --git a/desktop-widgets/locationinformation.cpp b/desktop-widgets/locationinformation.cpp index 330ccd6f5..3c09656f1 100644 --- a/desktop-widgets/locationinformation.cpp +++ b/desktop-widgets/locationinformation.cpp @@ -164,7 +164,6 @@ void LocationInformationWidget::acceptChanges() MapWidget::instance()->endGetDiveCoordinates(); MapWidget::instance()->repopulateLabels(); MultiFilterSortModel::instance()->stopFilterDiveSite(); - emit endEditDiveSite(); } void LocationInformationWidget::initFields(dive_site *ds) diff --git a/desktop-widgets/locationinformation.h b/desktop-widgets/locationinformation.h index 8188893bf..161ce26ef 100644 --- a/desktop-widgets/locationinformation.h +++ b/desktop-widgets/locationinformation.h @@ -32,9 +32,6 @@ public slots: private slots: void updateLabels(); void diveSiteChanged(struct dive_site *ds, int field); -signals: - void endEditDiveSite(); - private: void clearLabels(); Ui::LocationInformation ui; diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 651d77053..7c9cf9ba2 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -168,11 +168,6 @@ MainWindow::MainWindow() : QMainWindow(), profileContainer->setLayout(profLayout); diveSiteEdit = new LocationInformationWidget(this); - connect(diveSiteEdit, &LocationInformationWidget::endEditDiveSite, - this, &MainWindow::setDefaultState); - connect(diveSiteEdit, SIGNAL(endEditDiveSite()), this, SLOT(refreshDisplay())); - connect(diveSiteEdit, &LocationInformationWidget::endEditDiveSite, - mainTab, &MainTab::refreshDisplayedDiveSite); std::pair<QByteArray, QVariant> enabled = std::make_pair("enabled", QVariant(true)); std::pair<QByteArray, QVariant> disabled = std::make_pair("enabled", QVariant(false)); |