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 filterSelectedDives function in divetripmodel.cpp

Browse source 
The last users of the returned vector were removed in commit
e1abf9485c

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-02-10 21:59:51 +01:00 • committed by Dirk Hohndel
parent 50caf38694
commit 33b8cf8a36
1 changed files with 0 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
qt-models/divetripmodel.cpp
View file

@ -1137,16 +1137,6 @@ void DiveTripModelTree::tripChanged(dive_trip *trip, TripField)
dataChanged(createIndex(idx, 0, noParent), createIndex(idx, COLUMNS - 1, noParent)); dataChanged(createIndex(idx, 0, noParent), createIndex(idx, COLUMNS - 1, noParent));
} }
static QVector<dive *> filterSelectedDives(const QVector<dive *> &dives)
{
QVector<dive *> res;
res.reserve(dives.size());
for (dive *d: dives)
if (d->selected)
res.append(d);
return res;
}
void DiveTripModelTree::divesMovedBetweenTrips(dive_trip *from, dive_trip *to, bool deleteFrom, bool createTo, const QVector<dive *> &dives) void DiveTripModelTree::divesMovedBetweenTrips(dive_trip *from, dive_trip *to, bool deleteFrom, bool createTo, const QVector<dive *> &dives)
{ {
// Move dives between trips. This is an "interesting" problem, as we might // Move dives between trips. This is an "interesting" problem, as we might
@ -1163,7 +1153,6 @@ void DiveTripModelTree::divesMovedBetweenTrips(dive_trip *from, dive_trip *to, b
// Cheating! // Cheating!
// Unfortunately, removing the dives means that their selection is lost. // Unfortunately, removing the dives means that their selection is lost.
// Thus, remember the selection and re-add it later. // Thus, remember the selection and re-add it later.
QVector<dive *> selectedDives = filterSelectedDives(dives);
divesAdded(to, createTo, dives); divesAdded(to, createTo, dives);
divesDeleted(from, deleteFrom, dives); divesDeleted(from, deleteFrom, dives);
} }
@ -1186,7 +1175,6 @@ void DiveTripModelTree::divesTimeChangedTrip(dive_trip *trip, timestamp_t delta,
// Cheating! // Cheating!
// Unfortunately, removing the dives means that their selection is lost. // Unfortunately, removing the dives means that their selection is lost.
// Thus, remember the selection and re-add it later. // Thus, remember the selection and re-add it later.
QVector<dive *> selectedDives = filterSelectedDives(dives);
divesDeleted(trip, false, dives); divesDeleted(trip, false, dives);
divesAdded(trip, false, dives); divesAdded(trip, false, dives);
} }
@ -1451,7 +1439,6 @@ void DiveTripModelList::divesTimeChanged(timestamp_t delta, const QVector<dive *
std::sort(dives.begin(), dives.end(), dive_less_than); std::sort(dives.begin(), dives.end(), dive_less_than);
// See comment for DiveTripModelTree::divesTimeChanged above. // See comment for DiveTripModelTree::divesTimeChanged above.
QVector<dive *> selectedDives = filterSelectedDives(dives);
divesDeleted(nullptr, false, dives); divesDeleted(nullptr, false, dives);
divesAdded(nullptr, false, dives); divesAdded(nullptr, false, dives);
} }