diff options
Diffstat (limited to 'src/corelib/text/qstringtokenizer.cpp')
| -rw-r--r-- | src/corelib/text/qstringtokenizer.cpp | 66 |
1 files changed, 15 insertions, 51 deletions
diff --git a/src/corelib/text/qstringtokenizer.cpp b/src/corelib/text/qstringtokenizer.cpp index 44999425ae..fc6faed27f 100644 --- a/src/corelib/text/qstringtokenizer.cpp +++ b/src/corelib/text/qstringtokenizer.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Marc Mutz <marc.mutz@kdab.com> -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Marc Mutz <marc.mutz@kdab.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qstringtokenizer.h" #include "qstringalgorithms.h" @@ -73,7 +37,7 @@ QT_BEGIN_NAMESPACE Argument Deduction (CTAD), you may write \c{QStringTokenizer{string, separator}} (without template arguments). If you can't use C++17 CTAD, you must use the - QStringView::split() or QLatin1String::split() member functions + QStringView::split() or QLatin1StringView::split() member functions and store the return value only in \c{auto} variables: \code @@ -147,26 +111,26 @@ QT_BEGIN_NAMESPACE */ /*! - \typedef template <typename Haystack, typename Needle> QStringTokenizer<Haystack, Needle>::value_type + \typealias QStringTokenizer::value_type - Alias for \c{const QStringView} or \c{const QLatin1String}, + Alias for \c{const QStringView} or \c{const QLatin1StringView}, depending on the tokenizer's \c Haystack template argument. */ /*! - \typedef template <typename Haystack, typename Needle> QStringTokenizer<Haystack, Needle>::difference_type + \typealias QStringTokenizer::difference_type Alias for qsizetype. */ /*! - \typedef template <typename Haystack, typename Needle> QStringTokenizer<Haystack, Needle>::size_type + \typealias QStringTokenizer::size_type Alias for qsizetype. */ /*! - \typedef template <typename Haystack, typename Needle> QStringTokenizer<Haystack, Needle>::reference + \typealias QStringTokenizer::reference Alias for \c{value_type &}. @@ -175,13 +139,13 @@ QT_BEGIN_NAMESPACE */ /*! - \typedef template <typename Haystack, typename Needle> QStringTokenizer<Haystack, Needle>::const_reference + \typealias QStringTokenizer::const_reference Alias for \c{value_type &}. */ /*! - \typedef template <typename Haystack, typename Needle> QStringTokenizer<Haystack, Needle>::pointer + \typealias QStringTokenizer::pointer Alias for \c{value_type *}. @@ -190,13 +154,13 @@ QT_BEGIN_NAMESPACE */ /*! - \typedef template <typename Haystack, typename Needle> QStringTokenizer<Haystack, Needle>::const_pointer + \typealias QStringTokenizer::const_pointer Alias for \c{value_type *}. */ /*! - \typedef template <typename Haystack, typename Needle> QStringTokenizer<Haystack, Needle>::iterator + \typealias QStringTokenizer::iterator This typedef provides an STL-style const iterator for QStringTokenizer. @@ -208,7 +172,7 @@ QT_BEGIN_NAMESPACE */ /*! - \typedef template <typename Haystack, typename Needle> QStringTokenizer<Haystack, Needle>::const_iterator + \typedef QStringTokenizer::const_iterator This typedef provides an STL-style const iterator for QStringTokenizer. @@ -217,7 +181,7 @@ QT_BEGIN_NAMESPACE */ /*! - \typedef template <typename Haystack, typename Needle> QStringTokenizer<Haystack, Needle>::sentinel + \typealias QStringTokenizer::sentinel This typedef provides an STL-style sentinel for QStringTokenizer::iterator and QStringTokenizer::const_iterator. @@ -251,7 +215,7 @@ QT_BEGIN_NAMESPACE Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first token in the list. - \sa end(), cbegin() + \sa end(), cend() */ /*! |