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 --- desktop-widgets/divelogimportdialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'desktop-widgets/divelogimportdialog.cpp') diff --git a/desktop-widgets/divelogimportdialog.cpp b/desktop-widgets/divelogimportdialog.cpp index f3d512009..d613a810a 100644 --- a/desktop-widgets/divelogimportdialog.cpp +++ b/desktop-widgets/divelogimportdialog.cpp @@ -1023,7 +1023,7 @@ void DiveLogImportDialog::on_buttonBox_accepted() } QString source = fileNames.size() == 1 ? fileNames[0] : tr("multiple files"); - Command::importDives(&table, &trips, &sites, IMPORT_MERGE_ALL_TRIPS, source); + Command::importDives(&table, &trips, &sites, nullptr, IMPORT_MERGE_ALL_TRIPS, source); } TagDragDelegate::TagDragDelegate(QObject *parent) : QStyledItemDelegate(parent) -- cgit v1.2.3-70-g09d2