cleanup: fix SkipEmptyParts warning for mobile

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

View file

@ -537,12 +537,6 @@ QString TextHyperlinkEventFilter::tryToFormulateUrl(QTextCursor *cursor)
return stringMeetsOurUrlRequirements(maybeUrlStr) ? maybeUrlStr : QString();
}
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
#define SKIP_EMPTY Qt::SkipEmptyParts
#else
#define SKIP_EMPTY QString::SkipEmptyParts
#endif
QString TextHyperlinkEventFilter::fromCursorTilWhitespace(QTextCursor *cursor, bool searchBackwards)
{
// fromCursorTilWhitespace calls cursor->movePosition repeatedly, while