1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QStringTokenizer: update docs for a world in which C++17 is required

Browse Source 
Remove mentions of pre-C++17 behavior.

Don't recommend against qTokenize() any longer (it's shorter than
"QStringTokenizer") and mention it in the QStringTokenizer class
documentation, too.

Pick-to: 6.7 6.5 6.2
Change-Id: I8cf3310fc9de80db0a89aecfdf695a49d390da47
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit c1fc85df109a4dff57d7615a353bfcc7e172b0c9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2024-08-27 09:08:21 +02:00 committed by Qt Cherry-pick Bot
parent 20429da06a
commit abcee9eb99
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/corelib/text/qstringtokenizer.cpp
View File

@ -24,8 +24,8 @@ QT_BEGIN_NAMESPACE
enumerations Qt::SplitBehavior and Qt::CaseSensitivity further enumerations Qt::SplitBehavior and Qt::CaseSensitivity further
control the output. control the output.
QStringTokenizer drives QStringView::tokenize(), but, at least with a QStringTokenizer drives QStringView::tokenize(), but you can use it
recent compiler, you can use it directly, too: directly, too:
\code \code
for (auto it : QStringTokenizer{string, separator}) for (auto it : QStringTokenizer{string, separator})
@ -33,10 +33,9 @@ QT_BEGIN_NAMESPACE
\endcode \endcode
\note You should never, ever, name the template arguments of a \note You should never, ever, name the template arguments of a
QStringTokenizer explicitly. If you can use C++17 Class Template QStringTokenizer explicitly. You may write
Argument Deduction (CTAD), you may write
\c{QStringTokenizer{string, separator}} (without template \c{QStringTokenizer{string, separator}} (without template
arguments). If you can't use C++17 CTAD, you must use the arguments), or use the qTokenize() function, or the
QStringView::split() or QLatin1StringView::split() member functions QStringView::split() or QLatin1StringView::split() member functions
and store the return value only in \c{auto} variables: and store the return value only in \c{auto} variables:
@ -320,10 +319,6 @@ QT_BEGIN_NAMESPACE
Pass values from Qt::CaseSensitivity and Qt::SplitBehavior enumerators Pass values from Qt::CaseSensitivity and Qt::SplitBehavior enumerators
as \a flags to modify the behavior of the tokenizer. as \a flags to modify the behavior of the tokenizer.
You can use this function if your compiler doesn't, yet, support C++17 Class
Template Argument Deduction (CTAD). We recommend direct use of QStringTokenizer
with CTAD instead.
*/ */
QT_END_NAMESPACE QT_END_NAMESPACE