summaryrefslogtreecommitdiffstats
path: root/src/contacts/qcontactmanager_p.cpp
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-02-25 15:15:12 +0100
committerChris Adams <chris.adams@qinetic.com.au>2020-11-02 13:17:06 +1000
commit848d4a2b49adca12666081788a05a8fc5d9fbb56 (patch)
tree1832e9c71da16e7f2905b6565d113449d5a0851d /src/contacts/qcontactmanager_p.cpp
parent2515b36984e3b480543b8b08cb87cb1dcb0f0127 (diff)
Use Qt::SplitBehavior in preference to QString::SplitBehavior
The Qt version was added in 5.14 "for use as eventual replacement for QString::SplitBehavior." Move another step closer to that goal. De-UKified spelling of "behavior" in the process. Change-Id: I13b4fdc82fdee779b2e4d03ce287b749dadd1b71 Reviewed-by: Alberto Mardegan <mardy@users.sourceforge.net> Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Diffstat (limited to 'src/contacts/qcontactmanager_p.cpp')
-rw-r--r--src/contacts/qcontactmanager_p.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/contacts/qcontactmanager_p.cpp b/src/contacts/qcontactmanager_p.cpp
index 522668881..241a9e533 100644
--- a/src/contacts/qcontactmanager_p.cpp
+++ b/src/contacts/qcontactmanager_p.cpp
@@ -418,7 +418,7 @@ bool QContactManagerData::parseUri(const QString &uriString, QString *managerNam
// we assume that the prefix, managerid, and params cannot contain `:', `=', or `&'
// similarly, that neither param keys nor param values can contain these characters.
- const QStringList colonSplit = uriString.split(QLatin1Char(':'), QString::KeepEmptyParts);
+ const QStringList colonSplit = uriString.split(QLatin1Char(':'), Qt::KeepEmptyParts);
if ((colonSplit.size() != 3) && (strict || colonSplit.size() != 2))
return false;
@@ -432,10 +432,10 @@ bool QContactManagerData::parseUri(const QString &uriString, QString *managerNam
if (!paramString.isEmpty()) {
// Now we have to decode each parameter
QMap<QString, QString> outParams;
- const QStringList pairs = paramString.split(QRegularExpression(QStringLiteral("&(?!(amp;|equ;|#))")), QString::KeepEmptyParts);
+ const QStringList pairs = paramString.split(QRegularExpression(QStringLiteral("&(?!(amp;|equ;|#))")), Qt::KeepEmptyParts);
for (int i = 0; i < pairs.size(); ++i) {
// This should be something like "foo&amp;bar&equ;=grob&amp;"
- const QStringList pair = pairs.at(i).split(QLatin1Char('='), QString::KeepEmptyParts);
+ const QStringList pair = pairs.at(i).split(QLatin1Char('='), Qt::KeepEmptyParts);
if (pair.size() != 2)
return false;