diff options
| -rw-r--r-- | commands/command_divelist.cpp | 6 | ||||
| -rw-r--r-- | commands/command_divesite.cpp | 2 | ||||
| -rw-r--r-- | qt-models/completionmodels.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/commands/command_divelist.cpp b/commands/command_divelist.cpp index acb44f88f..bf030546b 100644 --- a/commands/command_divelist.cpp +++ b/commands/command_divelist.cpp @@ -544,7 +544,7 @@ void ImportDives::undoit() 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())); } @@ -604,7 +604,7 @@ void ShiftTime::redoit() emit diveListNotifier.divesChanged(diveList, DiveField::DATETIME); // 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 timeChanged = -timeChanged; @@ -985,7 +985,7 @@ MergeDives::MergeDives(const QVector <dive *> &dives) mergedDive.dives[0].dive = std::move(d); mergedDive.dives[0].trip = preferred_trip; mergedDive.dives[0].site = preferred_site; - divesToMerge.dives = dives.toStdVector(); + divesToMerge.dives = std::vector<dive *>(dives.begin(), dives.end()); } bool MergeDives::workToBeDone() diff --git a/commands/command_divesite.cpp b/commands/command_divesite.cpp index 45d0abcaf..47c46f84e 100644 --- a/commands/command_divesite.cpp +++ b/commands/command_divesite.cpp @@ -131,7 +131,7 @@ void ImportDiveSites::undo() 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())); } diff --git a/qt-models/completionmodels.cpp b/qt-models/completionmodels.cpp index 957b8c7fd..0ffc8075e 100644 --- a/qt-models/completionmodels.cpp +++ b/qt-models/completionmodels.cpp @@ -36,7 +36,7 @@ set.insert(value.trimmed()); \ } \ } \ - QStringList setList = set.toList(); \ + QStringList setList = set.values(); \ std::sort(setList.begin(), setList.end()); \ setStringList(setList); \ } |