diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2020-02-25 16:49:05 +0100 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-02-28 15:37:11 +0100 |
commit | c158f881b30a28ab28ede0df538cbf1af4326c76 (patch) | |
tree | dc3501d9f9a9edd6ac74adfc8304fa1d04b85e89 /src/corelib/doc/snippets/qstring/main.cpp | |
parent | 8de66e1f244ee500b7df79ecbeaa32d889dc7d27 (diff) |
Docs: 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.
Applied suitable wrapping round various char and string literals,
since docs are meant to show best practice.
Change-Id: Ie061905fad26f9b4dda3eedba4612704f0a19126
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/doc/snippets/qstring/main.cpp')
-rw-r--r-- | src/corelib/doc/snippets/qstring/main.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/corelib/doc/snippets/qstring/main.cpp b/src/corelib/doc/snippets/qstring/main.cpp index ac7fc7d078..58d68d9375 100644 --- a/src/corelib/doc/snippets/qstring/main.cpp +++ b/src/corelib/doc/snippets/qstring/main.cpp @@ -766,7 +766,7 @@ void Widget::splitFunction() //! [60] str = "This time, a normal English sentence."; - list = str.split(QRegExp("\\W+"), QString::SkipEmptyParts); + list = str.split(QRegExp("\\W+"), Qt::SkipEmptyParts); // list: [ "This", "time", "a", "normal", "English", "sentence" ] //! [60] @@ -787,7 +787,7 @@ void Widget::splitFunction() //! [91] str = "This time, a normal English sentence."; - list = str.split(QRegularExpression("\\W+"), QString::SkipEmptyParts); + list = str.split(QRegularExpression("\\W+"), Qt::SkipEmptyParts); // list: [ "This", "time", "a", "normal", "English", "sentence" ] //! [91] @@ -801,24 +801,24 @@ void Widget::splitFunction() void Widget::splitCaseSensitiveFunction() { //! [62] - QString str = "a,,b,c"; + QString str = QStringLiteral("a,,b,c"); - QStringList list1 = str.split(','); + QStringList list1 = str.split(QLatin1Char(',')); // list1: [ "a", "", "b", "c" ] - QStringList list2 = str.split(',', QString::SkipEmptyParts); + QStringList list2 = str.split(QLatin1Char(','), Qt::SkipEmptyParts); // list2: [ "a", "b", "c" ] //! [62] //! [62-empty] QString str = "abc"; - auto parts = str.split(""); + auto parts = str.split(QString()); // parts: {"", "a", "b", "c", ""} //! [62-empty] //! [62-slashes] QString str = "/a/b/c/"; - auto parts = str.split('/'); + auto parts = str.split(QLatin1Char('/')); // parts: {"", "a", "b", "c", ""} //! [62-slashes] } |