mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup: remove current_dive parameter from divesSelected signal

Browse source 
The diveListNotifier.divesSelected() signal is used to inform the
models of a selection change. It sent the current dive as a second
parameter. This is redundant, because the only sender of the signal
sets current_dive just before sending the signal. Remove the
parameter, which appears to be an artifact.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-03-11 22:21:18 +01:00 • committed by Dirk Hohndel
parent 950ae951bc
commit 7387b10b29
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/selection.cpp
View file

@ -192,7 +192,7 @@ void setSelection(const std::vector<dive *> &selection, dive *currentDive)
}
// Send the new selection
emit diveListNotifier.divesSelected(divesToSelect, current_dive);
emit diveListNotifier.divesSelected(divesToSelect);
}
extern "C" void select_single_dive(dive *d)

2
core/subsurface-qt/divelistnotifier.h
View file

@ -94,7 +94,7 @@ signals:
void tripChanged(dive_trip *trip, TripField field);
// Selection changes
void divesSelected(const QVector<dive *> &dives, dive *current);
void divesSelected(const QVector<dive *> &dives);
// Dive site signals. Add and delete events are sent per dive site and
// provide an index into the global dive site table.

6
qt-models/divetripmodel.cpp
View file

@ -475,7 +475,7 @@ void DiveTripModelBase::clear()
clear_dive_file_data();
clearData();
oldCurrent = nullptr;
emit diveListNotifier.divesSelected({}, nullptr); // Inform profile, etc of changed selection
emit diveListNotifier.divesSelected({}); // Inform profile, etc of changed selection
endResetModel();
emit diveListNotifier.numShownChanged();
}
@ -1404,7 +1404,7 @@ QModelIndex DiveTripModelTree::diveToIdx(const dive *d) const
}
}
void DiveTripModelTree::divesSelected(const QVector<dive *> &divesIn, dive *current)
void DiveTripModelTree::divesSelected(const QVector<dive *> &divesIn)
{
QVector <dive *> dives = visibleDives(divesIn);
@ -1664,7 +1664,7 @@ QModelIndex DiveTripModelList::diveToIdx(const dive *d) const
return createIndex(it - items.begin(), 0);
}
void DiveTripModelList::divesSelected(const QVector<dive *> &divesIn, dive *current)
void DiveTripModelList::divesSelected(const QVector<dive *> &divesIn)
{
QVector<dive *> dives = visibleDives(divesIn);

4
qt-models/divetripmodel.h
View file

@ -113,7 +113,7 @@ public slots:
void diveSiteChanged(dive_site *ds, int field);
void divesChanged(const QVector<dive *> &dives);
void divesTimeChanged(timestamp_t delta, const QVector<dive *> &dives);
void divesSelected(const QVector<dive *> &dives, dive *current);
void divesSelected(const QVector<dive *> &dives);
void tripChanged(dive_trip *trip, TripField);
void filterReset();
@ -190,7 +190,7 @@ public slots:
void divesTimeChanged(timestamp_t delta, const QVector<dive *> &dives);
// Does nothing in list view.
//void divesMovedBetweenTrips(dive_trip *from, dive_trip *to, bool deleteFrom, bool createTo, const QVector<dive *> &dives);
void divesSelected(const QVector<dive *> &dives, dive *current);
void divesSelected(const QVector<dive *> &dives);
void filterReset();
public: