mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: remove parameter from currentDiveChanged signal

Browse source 
The currentDiveChanged signal was emitted by the DiveListView
to inform the MainWindow of a change of current dive. The
new current dive was passed as a parameter. The slot in MainWindow
then called select_dive() on the dive.

This seems pointless because:
1) In both emits, selected_dive dive was passed as argument. But
   MainWindow can read this global variable itself.
2) Calling select_dive() again is a no-op, because obviously,
   this already *was* the selected dive.

Moreover it seems conceptually wrong to set the current dive in the
slot that is informed of the change of the current dive.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-07-30 20:41:33 +02:00 committed by Dirk Hohndel
parent d3f3d82abd
commit 5e1e6110ce
5 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
desktop-widgets/divelistview.cpp
View file

@ -342,7 +342,7 @@ void DiveListView::selectDives(const QList<int> &newDiveSelection)
scrollTo(idx);
}
// now that everything is up to date, update the widgets
Q_EMIT currentDiveChanged(selected_dive);
emit currentDiveChanged();
dontEmitDiveChangedSignal = false;
return;
}
@ -544,7 +544,7 @@ void DiveListView::selectionChanged(const QItemSelection &selected, const QItemS
connect(selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), this, SLOT(selectionChanged(QItemSelection, QItemSelection)));
connect(selectionModel(), SIGNAL(currentChanged(QModelIndex, QModelIndex)), this, SLOT(currentChanged(QModelIndex, QModelIndex)));
if (!dontEmitDiveChangedSignal)
Q_EMIT currentDiveChanged(selected_dive);
emit currentDiveChanged();
}
enum asked_user {NOTYET, MERGE, DONTMERGE};

2
desktop-widgets/divelistview.h
View file

@ -59,7 +59,7 @@ slots:
void loadWebImages();
signals:
void currentDiveChanged(int divenr);
void currentDiveChanged();
private:
bool mouseClickSelection;

7
desktop-widgets/mainwindow.cpp
View file

@ -193,7 +193,7 @@ MainWindow::MainWindow() : QMainWindow(),
if (!QIcon::hasThemeIcon("window-close")) {
QIcon::setThemeName("subsurface");
}
connect(dive_list(), SIGNAL(currentDiveChanged(int)), this, SLOT(current_dive_changed(int)));
connect(dive_list(), &DiveListView::currentDiveChanged, this, &MainWindow::current_dive_changed);
connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), this, SLOT(readSettings()));
connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), diveListView, SLOT(update()));
connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), diveListView, SLOT(reloadHeaderActions()));
@ -535,11 +535,8 @@ void MainWindow::configureToolbar() {
}
}
void MainWindow::current_dive_changed(int divenr)
void MainWindow::current_dive_changed()
{
if (divenr >= 0) {
select_dive(divenr);
}
graphics()->plotDive(nullptr, false, true);
information()->updateDiveInfo();
configureToolbar();

2
desktop-widgets/mainwindow.h
View file

@ -138,7 +138,7 @@ slots:
void on_action_Check_for_Updates_triggered();
void on_actionDiveSiteEdit_triggered();
void current_dive_changed(int divenr);
void current_dive_changed();
void initialUiSetup();
void on_actionImportDiveLog_triggered();

4
desktop-widgets/starwidget.cpp
View file

@ -57,7 +57,7 @@ void StarWidget::mouseReleaseEvent(QMouseEvent *event)
else
current = starClicked;
Q_EMIT valueChanged(current);
emit valueChanged(current);
update();
}
@ -88,7 +88,7 @@ void StarWidget::setCurrentStars(int value)
{
current = value;
update();
Q_EMIT valueChanged(current);
emit valueChanged(current);
}
StarWidget::StarWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f),