diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2020-02-25 15:15:12 +0100 |
---|---|---|
committer | Chris Adams <chris.adams@qinetic.com.au> | 2020-11-02 13:17:06 +1000 |
commit | 848d4a2b49adca12666081788a05a8fc5d9fbb56 (patch) | |
tree | 1832e9c71da16e7f2905b6565d113449d5a0851d /src/organizer/qorganizermanager_p.cpp | |
parent | 2515b36984e3b480543b8b08cb87cb1dcb0f0127 (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/organizer/qorganizermanager_p.cpp')
-rw-r--r-- | src/organizer/qorganizermanager_p.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/organizer/qorganizermanager_p.cpp b/src/organizer/qorganizermanager_p.cpp index 82c2db1ba..d3e6f72d7 100644 --- a/src/organizer/qorganizermanager_p.cpp +++ b/src/organizer/qorganizermanager_p.cpp @@ -319,7 +319,7 @@ bool QOrganizerManagerData::parseUri(const QString &uriString, QString *managerN // 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; @@ -333,10 +333,10 @@ bool QOrganizerManagerData::parseUri(const QString &uriString, QString *managerN 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&bar&equ;=grob&" - 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; |