From f9721fce4b12faee87398d23fd2f8b4d1b9a0309 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sun, 28 Jun 2020 15:24:19 +0200 Subject: filter: implement importing of filter presets When importing a divelog, import filter presets. If there are equal names, import only if the presets differ. In that case, disambiguate the name. This made things a bit more complicated, as comparison of filter presets had to be implemented. Signed-off-by: Berthold Stoeger --- qt-models/diveimportedmodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qt-models') diff --git a/qt-models/diveimportedmodel.cpp b/qt-models/diveimportedmodel.cpp index 902d2099a..3413e03a5 100644 --- a/qt-models/diveimportedmodel.cpp +++ b/qt-models/diveimportedmodel.cpp @@ -194,7 +194,7 @@ void DiveImportedModel::recordDives(int flags) std::pair tables = consumeTables(); if (tables.first.nr > 0) { auto data = thread.data(); - Command::importDives(&tables.first, nullptr, &tables.second, flags, data->devName()); + Command::importDives(&tables.first, nullptr, &tables.second, nullptr, flags, data->devName()); } else { clear_dive_site_table(&tables.second); } -- cgit v1.2.3-70-g09d2