From 57f5d4b7843da573c6c254d6f023270fddaf8e5c Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 6 Jan 2020 12:21:14 -0800 Subject: [PATCH] code cleanup: replace deprecated fromStdVector() method Replacement was only introduced in Qt 5.14 Signed-off-by: Dirk Hohndel --- commands/command_edit.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/commands/command_edit.cpp b/commands/command_edit.cpp index 89e10b000..02939ac6d 100644 --- a/commands/command_edit.cpp +++ b/commands/command_edit.cpp @@ -112,7 +112,11 @@ void EditBase::undo() // Send signals. DiveField id = fieldId(); +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + emit diveListNotifier.divesChanged(QVector(dives.begin(), dives.end()), id); +#else emit diveListNotifier.divesChanged(QVector::fromStdVector(dives), id); +#endif setSelection(selectedDives, current); } @@ -679,7 +683,11 @@ void EditTagsBase::undo() // Send signals. DiveField id = fieldId(); +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + emit diveListNotifier.divesChanged(QVector(dives.begin(), dives.end()), id); +#else emit diveListNotifier.divesChanged(QVector::fromStdVector(dives), id); +#endif setSelection(selectedDives, current); }