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: SkipEmptyParts syntax has changed

Browse source 
Sadly, the new enum has only been available since Qt 5.14, so this is a rather
ugly replacement.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-10-26 07:27:47 -07:00
parent f8f83a9986
commit ffecc00f42
6 changed files with 44 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
desktop-widgets/simplewidgets.cpp
View file

@ -629,6 +629,12 @@ 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
@ -666,7 +672,7 @@ QString TextHyperlinkEventFilter::fromCursorTilWhitespace(QTextCursor *cursor, b
"mn.abcd." for the url (wrong). So we have to go to 'i', to
capture "mn.abcd.edu " (with trailing space), and then clean it up.
*/
QStringList list = grownText.split(QRegExp("\\s"), QString::SkipEmptyParts);
QStringList list = grownText.split(QRegExp("\\s"), SKIP_EMPTY);
if (!list.isEmpty()) {
result = list[0];
}

8
desktop-widgets/tagwidget.cpp
View file

@ -39,6 +39,12 @@ void TagWidget::setCompleter(QCompleter *completer)
connect(m_completer, SIGNAL(highlighted(QString)), this, SLOT(completionHighlighted(QString)));
}
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
#define SKIP_EMPTY Qt::SkipEmptyParts
#else
#define SKIP_EMPTY QString::SkipEmptyParts
#endif
QPair<int, int> TagWidget::getCursorTagPosition()
{
int i = 0, start = 0, end = 0;
@ -71,7 +77,7 @@ void TagWidget::highlight()
{
removeAllBlocks();
int lastPos = 0;
const auto l = text().split(QChar(','), QString::SkipEmptyParts);
const auto l = text().split(QChar(','), SKIP_EMPTY);
for (const QString &s: l) {
QString trimmed = s.trimmed();
if (trimmed.isEmpty())