diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/filterconstraint.cpp | 12 | ||||
| -rw-r--r-- | core/metadata.cpp | 8 | ||||
| -rw-r--r-- | core/qthelper.cpp | 8 |
3 files changed, 23 insertions, 5 deletions
diff --git a/core/filterconstraint.cpp b/core/filterconstraint.cpp index 54654457f..0468a935c 100644 --- a/core/filterconstraint.cpp +++ b/core/filterconstraint.cpp @@ -25,6 +25,12 @@ enum filter_constraint_units { FILTER_CONSTRAINT_PERCENTAGE_UNIT }; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) +#define SKIP_EMPTY Qt::SkipEmptyParts +#else +#define SKIP_EMPTY QString::SkipEmptyParts +#endif + static struct type_description { filter_constraint_type type; const char *token; // untranslated token, which will be written to the log and should not contain spaces @@ -680,7 +686,7 @@ void filter_constraint_set_stringlist(filter_constraint &c, const QString &s) return; } c.data.string_list->clear(); - for (const QString &s: s.split(",", QString::SkipEmptyParts)) + for (const QString &s: s.split(",", SKIP_EMPTY)) c.data.string_list->push_back(s.trimmed()); } @@ -859,9 +865,9 @@ static bool has_tags(const filter_constraint &c, const struct dive *d) static bool has_people(const filter_constraint &c, const struct dive *d) { QStringList dive_people; - for (const QString &s: QString(d->buddy).split(",", QString::SkipEmptyParts)) + for (const QString &s: QString(d->buddy).split(",", SKIP_EMPTY)) dive_people.push_back(s.trimmed()); - for (const QString &s: QString(d->divemaster).split(",", QString::SkipEmptyParts)) + for (const QString &s: QString(d->divemaster).split(",", SKIP_EMPTY)) dive_people.push_back(s.trimmed()); return check(c, dive_people); } diff --git a/core/metadata.cpp b/core/metadata.cpp index 81371ba3f..bca750b73 100644 --- a/core/metadata.cpp +++ b/core/metadata.cpp @@ -12,6 +12,12 @@ #define UINT64_MAX (~0ULL) #endif +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) +#define SKIP_EMPTY Qt::SkipEmptyParts +#else +#define SKIP_EMPTY QString::SkipEmptyParts +#endif + // The following functions fetch an arbitrary-length _unsigned_ integer from either // a file or a memory location in big-endian or little-endian mode. The size of the // integer is passed via a template argument [e.g. getBE<uint16_t>(...)]. @@ -287,7 +293,7 @@ static bool parseDate(const QString &s_in, timestamp_t ×tamp) } // I've also seen "Weekday Mon Day hh:mm:ss yyyy"(!) - QStringList items = s.split(' ', QString::SkipEmptyParts); + QStringList items = s.split(' ', SKIP_EMPTY); if (items.size() < 4) return false; diff --git a/core/qthelper.cpp b/core/qthelper.cpp index d3e225639..1dacbab38 100644 --- a/core/qthelper.cpp +++ b/core/qthelper.cpp @@ -1260,9 +1260,15 @@ QString get_taglist_string(struct tag_entry *tag_list) return ret; } +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) +#define SKIP_EMPTY Qt::SkipEmptyParts +#else +#define SKIP_EMPTY QString::SkipEmptyParts +#endif + QStringList stringToList(const QString &s) { - QStringList res = s.split(",", QString::SkipEmptyParts); + QStringList res = s.split(",", SKIP_EMPTY); for (QString &str: res) str = str.trimmed(); return res; |