From f3a3d93b85c61a9b51c75409341a0473a965e911 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Wed, 19 Feb 2020 20:18:21 +0100 Subject: filter: remove diveContainsText() This function checked a dive for a search string. Its functionality was replaced by a fulltext index. Signed-off-by: Berthold Stoeger --- core/qthelper.cpp | 17 ----------------- core/qthelper.h | 1 - 2 files changed, 18 deletions(-) diff --git a/core/qthelper.cpp b/core/qthelper.cpp index ea5514824..2bb2c5d72 100644 --- a/core/qthelper.cpp +++ b/core/qthelper.cpp @@ -1426,23 +1426,6 @@ QString getUUID() return uuidString; } -static bool contains(const char *s, const QString &filterstring, Qt::CaseSensitivity cs) -{ - return !empty_string(s) && QString(s).contains(filterstring, cs); -} - -bool diveContainsText(const struct dive *d, const QString &filterstring, Qt::CaseSensitivity cs, bool includeNotes) -{ - if (!d) - return false; - return contains(get_dive_location(d), filterstring, cs) || - (d->divetrip && contains(d->divetrip->location, filterstring, cs)) || - contains(d->buddy, filterstring, cs) || - contains(d->divemaster, filterstring, cs) || - contains(d->suit, filterstring, cs) || - get_taglist_string(d->tag_list).contains(filterstring, cs) || - (includeNotes && contains(d->notes, filterstring, cs)); -} int parse_seabear_header(const char *filename, char **params, int pnr) { QFile f(filename); diff --git a/core/qthelper.h b/core/qthelper.h index bd205228b..6dc6c4d6f 100644 --- a/core/qthelper.h +++ b/core/qthelper.h @@ -81,7 +81,6 @@ QLocale getLocale(); QVector> selectedDivesGasUsed(); QString getUserAgent(); QString printGPSCoords(const location_t *loc); -bool diveContainsText(const struct dive *d, const QString &filterstring, Qt::CaseSensitivity cs, bool includeNotes); #if defined __APPLE__ #define TITLE_OR_TEXT(_t, _m) "", _t + "\n" + _m -- cgit v1.2.3-70-g09d2