Commit d2b8f2d1 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

QString::split(..., Qt::SplitBehavior, ...) is already in Qt 5.14

parent 49743594
Pipeline #47723 passed with stage
in 8 minutes and 12 seconds
...@@ -244,11 +244,7 @@ void LdapUrl::parseQuery() ...@@ -244,11 +244,7 @@ void LdapUrl::parseQuery()
it != end; ++it, i++) { it != end; ++it, i++) {
switch (i) { switch (i) {
case 0: case 0:
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
d->m_attributes = (*it).split(QLatin1Char(','), QString::SkipEmptyParts);
#else
d->m_attributes = (*it).split(QLatin1Char(','), Qt::SkipEmptyParts); d->m_attributes = (*it).split(QLatin1Char(','), Qt::SkipEmptyParts);
#endif
break; break;
case 1: case 1:
if ((*it) == QLatin1String("sub")) { if ((*it) == QLatin1String("sub")) {
...@@ -261,11 +257,7 @@ void LdapUrl::parseQuery() ...@@ -261,11 +257,7 @@ void LdapUrl::parseQuery()
d->m_filter = fromPercentEncoding((*it).toLatin1()); d->m_filter = fromPercentEncoding((*it).toLatin1());
break; break;
case 3: case 3:
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
extensions = (*it).split(QLatin1Char(','), QString::SkipEmptyParts);
#else
extensions = (*it).split(QLatin1Char(','), Qt::SkipEmptyParts); extensions = (*it).split(QLatin1Char(','), Qt::SkipEmptyParts);
#endif
break; break;
} }
} }
......
...@@ -209,11 +209,7 @@ void LdapClient::Private::finishCurrentObject() ...@@ -209,11 +209,7 @@ void LdapClient::Private::finishCurrentObject()
// No explicit mail address found so far? // No explicit mail address found so far?
// Fine, then we use the address stored in the DN. // Fine, then we use the address stored in the DN.
QString sMail; QString sMail;
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
const QStringList lMail = mCurrentObject.dn().toString().split(QStringLiteral(",dc="), QString::SkipEmptyParts);
#else
const QStringList lMail = mCurrentObject.dn().toString().split(QStringLiteral(",dc="), Qt::SkipEmptyParts); const QStringList lMail = mCurrentObject.dn().toString().split(QStringLiteral(",dc="), Qt::SkipEmptyParts);
#endif
const int n = lMail.count(); const int n = lMail.count();
if (n) { if (n) {
if (lMail.first().startsWith(QLatin1String("cn="), Qt::CaseInsensitive)) { if (lMail.first().startsWith(QLatin1String("cn="), Qt::CaseInsensitive)) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment