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

code cleanup: replace use of toStdVector()

Browse source 
Frankly, I find the old API easier...

Also, replace toList() with values()

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-01-06 12:47:53 -08:00
parent daf3821fcc
commit e9dcac7514
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
commands/command_divelist.cpp
View file

@ -544,7 +544,7 @@ void ImportDives::undoit()
DeleteDive::DeleteDive(const QVector<struct dive*> &divesToDeleteIn) DeleteDive::DeleteDive(const QVector<struct dive*> &divesToDeleteIn)
{ {
divesToDelete.dives = divesToDeleteIn.toStdVector(); divesToDelete.dives = std::vector<dive *>(divesToDeleteIn.begin(), divesToDeleteIn.end());
setText(tr("delete %n dive(s)", "", divesToDelete.dives.size())); setText(tr("delete %n dive(s)", "", divesToDelete.dives.size()));
} }
@ -604,7 +604,7 @@ void ShiftTime::redoit()
emit diveListNotifier.divesChanged(diveList, DiveField::DATETIME); emit diveListNotifier.divesChanged(diveList, DiveField::DATETIME);
// Select the changed dives // Select the changed dives
setSelection(diveList.toStdVector(), diveList[0]); setSelection(std::vector<dive *>(diveList.begin(), diveList.end()), diveList[0]);
// Negate the time-shift so that the next call does the reverse // Negate the time-shift so that the next call does the reverse
timeChanged = -timeChanged; timeChanged = -timeChanged;
@ -985,7 +985,7 @@ MergeDives::MergeDives(const QVector <dive *> &dives)
mergedDive.dives[0].dive = std::move(d); mergedDive.dives[0].dive = std::move(d);
mergedDive.dives[0].trip = preferred_trip; mergedDive.dives[0].trip = preferred_trip;
mergedDive.dives[0].site = preferred_site; mergedDive.dives[0].site = preferred_site;
divesToMerge.dives = dives.toStdVector(); divesToMerge.dives = std::vector<dive *>(dives.begin(), dives.end());
} }
bool MergeDives::workToBeDone() bool MergeDives::workToBeDone()

2
commands/command_divesite.cpp
View file

@ -131,7 +131,7 @@ void ImportDiveSites::undo()
sitesToAdd = removeDiveSites(sitesToRemove); sitesToAdd = removeDiveSites(sitesToRemove);
} }
DeleteDiveSites::DeleteDiveSites(const QVector<dive_site *> &sites) : sitesToRemove(sites.toStdVector()) DeleteDiveSites::DeleteDiveSites(const QVector<dive_site *> &sites) : sitesToRemove(std::vector<dive_site *>(sites.begin(),sites.end()))
{ {
setText(tr("delete %n dive site(s)", "", sites.size())); setText(tr("delete %n dive site(s)", "", sites.size()));
} }

2
qt-models/completionmodels.cpp
View file

@ -36,7 +36,7 @@
set.insert(value.trimmed()); \ set.insert(value.trimmed()); \
} \ } \
} \ } \
QStringList setList = set.toList(); \ QStringList setList = set.values(); \
std::sort(setList.begin(), setList.end()); \ std::sort(setList.begin(), setList.end()); \
setStringList(setList); \ setStringList(setList); \
} }