diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2017-11-26 10:01:11 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-11-26 18:50:40 -0800 |
| commit | 2a0520d57d18d9e188d7633b0d39506b36e196ac (patch) | |
| tree | f1a2dd77f6b362bcde729ed6ba96242fdde2e98a /desktop-widgets | |
| parent | bf65f1e507c508428e46b06152d08494b426f69f (diff) | |
| download | subsurface-2a0520d57d18d9e188d7633b0d39506b36e196ac.tar.gz | |
Simplify signal handling after dive site editing
Since commit 01d961086c1d175732c597dc9acdba7cc4cd2d26, MainWindow::refreshDisplay()
is called in the refreshDiveInfo() signal of maintab after editing a
dive site. Since this was the only use of the refreshDiveInfo signal,
remove this signal and instead connect to MainWindow::refreshDisplay directly.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets')
| -rw-r--r-- | desktop-widgets/mainwindow.cpp | 5 | ||||
| -rw-r--r-- | desktop-widgets/tab-widgets/maintab.cpp | 7 | ||||
| -rw-r--r-- | desktop-widgets/tab-widgets/maintab.h | 1 |
3 files changed, 1 insertions, 12 deletions
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 330ea7d05..f0133a0a0 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -159,10 +159,7 @@ MainWindow::MainWindow() : QMainWindow(), LocationInformationWidget * diveSiteEdit = new LocationInformationWidget(); connect(diveSiteEdit, &LocationInformationWidget::endEditDiveSite, this, &MainWindow::setDefaultState); - - connect(diveSiteEdit, &LocationInformationWidget::endEditDiveSite, - mainTab, &MainTab::refreshDiveInfo); - + connect(diveSiteEdit, SIGNAL(endEditDiveSite()), this, SLOT(refreshDisplay())); connect(diveSiteEdit, &LocationInformationWidget::endEditDiveSite, mainTab, &MainTab::refreshDisplayedDiveSite); diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp index c1e2d15af..adb73526c 100644 --- a/desktop-widgets/tab-widgets/maintab.cpp +++ b/desktop-widgets/tab-widgets/maintab.cpp @@ -382,13 +382,6 @@ void MainTab::showLocation() ui.location->clear(); } -// Seems wrong, since we can also call updateDiveInfo(), but since the updateDiveInfo -// has a parameter on it's definition it didn't worked on the signal slot connection. -void MainTab::refreshDiveInfo() -{ - MainWindow::instance()->refreshDisplay(); -} - void MainTab::updateDepthDuration() { ui.depth->setVisible(true); diff --git a/desktop-widgets/tab-widgets/maintab.h b/desktop-widgets/tab-widgets/maintab.h index d27b25d94..03eb5f320 100644 --- a/desktop-widgets/tab-widgets/maintab.h +++ b/desktop-widgets/tab-widgets/maintab.h @@ -64,7 +64,6 @@ public slots: void addCylinder_clicked(); void addWeight_clicked(); - void refreshDiveInfo(); void updateDiveInfo(bool clear = false); void updateDepthDuration(); void acceptChanges(); |