diff options
| author | Linus Jahn <lnj@kaidan.im> | 2020-07-02 18:25:10 +0200 |
|---|---|---|
| committer | LNJ <lnj@kaidan.im> | 2020-07-03 13:13:31 +0200 |
| commit | 3dd3cb24f419b1a1cac2b7a0121507fd86000986 (patch) | |
| tree | da79e1c5e9b8ef9117120935e47a925acfd5e5df /src/base | |
| parent | b15c8827529aea6203df27a5c584349f0fedb31f (diff) | |
| download | qxmpp-3dd3cb24f419b1a1cac2b7a0121507fd86000986.tar.gz | |
Replace deprecated QString::contains(QRegExp)
It has been removed in Qt 6.0.
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/QXmppJingleIq.cpp | 8 | ||||
| -rw-r--r-- | src/base/QXmppStream.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/base/QXmppJingleIq.cpp b/src/base/QXmppJingleIq.cpp index 64650d29..c5004916 100644 --- a/src/base/QXmppJingleIq.cpp +++ b/src/base/QXmppJingleIq.cpp @@ -29,7 +29,7 @@ #include <QDate> #include <QDateTime> #include <QDomElement> -#include <QRegExp> +#include <QRegularExpression> static const int RTP_COMPONENT = 1; @@ -516,10 +516,10 @@ bool QXmppJingleIq::Content::parseSdp(const QString &sdp) if (payload.name() == QStringLiteral("telephone-event")) { params.insert(QStringLiteral("events"), paramStr); } else { - for (const auto &p : paramStr.split(QRegExp(";\\s*"))) { - QStringList bits = p.split('='); + for (const auto &p : paramStr.split(QRegularExpression(";\\s*"))) { + const QStringList bits = p.split('='); if (bits.size() == 2) - params.insert(bits[0], bits[1]); + params.insert(bits.at(0), bits.at(1)); } } payload.setParameters(params); diff --git a/src/base/QXmppStream.cpp b/src/base/QXmppStream.cpp index 0cd893a9..54a7a630 100644 --- a/src/base/QXmppStream.cpp +++ b/src/base/QXmppStream.cpp @@ -237,12 +237,12 @@ void QXmppStream::_q_socketReadyRead() QByteArray completeXml = d->dataBuffer; const QString strData = QString::fromUtf8(d->dataBuffer); bool streamStart = false; - if (d->streamStart.isEmpty() && strData.contains(startStreamRegex)) + if (d->streamStart.isEmpty() && startStreamRegex.indexIn(strData) != -1) streamStart = true; else completeXml.prepend(d->streamStart); bool streamEnd = false; - if (strData.contains(endStreamRegex)) + if (endStreamRegex.indexIn(strData) != -1) streamEnd = true; else completeXml.append(streamRootElementEnd); |
