mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup: fix SkipEmptyParts warning for mobile

Browse source 
And while doing that, have all the cases where we already include
qthelper.h simply use a define in that header file - but keep the two
other instances of the define where the C++ source don't need qthelper.h
otherwise.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2021-11-21 17:20:25 -08:00
parent d15ecef706
commit cfd6a1634f
7 changed files with 8 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/filterconstraint.cpp
View file

@ -26,12 +26,6 @@ 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

6
core/metadata.cpp
View file

@ -13,12 +13,6 @@
#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>(...)].

6
core/qthelper.cpp
View file

@ -1300,12 +1300,6 @@ 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(",", SKIP_EMPTY);

6
core/qthelper.h
View file

@ -23,6 +23,12 @@ enum watertypes {FRESHWATER, BRACKISHWATER, EN13319WATER, SALTWATER, DC_WATERTYP
#include "core/gettextfromc.h"
class QImage;
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
#define SKIP_EMPTY Qt::SkipEmptyParts
#else
#define SKIP_EMPTY QString::SkipEmptyParts
#endif
QString weight_string(int weight_in_grams);
QString distance_string(int distanceInMeters);
bool gpsHasChanged(struct dive *dive, struct dive *master, const QString &gps_text, bool *parsed_out = 0);