diff options
Diffstat (limited to 'src/corelib/text/qbytearraymatcher.h')
| -rw-r--r-- | src/corelib/text/qbytearraymatcher.h | 73 |
1 files changed, 8 insertions, 65 deletions
diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h index 4aac69f30a..1de9c23f10 100644 --- a/src/corelib/text/qbytearraymatcher.h +++ b/src/corelib/text/qbytearraymatcher.h @@ -1,47 +1,13 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://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) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QBYTEARRAYMATCHER_H #define QBYTEARRAYMATCHER_H #include <QtCore/qbytearray.h> +#include <QtCore/q20algorithm.h> +#include <iterator> #include <limits> QT_BEGIN_NAMESPACE @@ -65,7 +31,7 @@ public: void setPattern(const QByteArray &pattern); -#if QT_REMOVED_SINCE(6, 3) +#if QT_CORE_REMOVED_SINCE(6, 3) qsizetype indexIn(const QByteArray &ba, qsizetype from = 0) const; #else Q_WEAK_OVERLOAD @@ -107,7 +73,7 @@ protected: // compiler-generated copy/more ctors/assignment operators are ok! ~QStaticByteArrayMatcherBase() = default; -#if QT_REMOVED_SINCE(6, 3) && QT_POINTER_SIZE != 4 +#if QT_CORE_REMOVED_SINCE(6, 3) && QT_POINTER_SIZE != 4 Q_CORE_EXPORT int indexOfIn(const char *needle, uint nlen, const char *haystack, int hlen, int from) const noexcept; #endif Q_CORE_EXPORT qsizetype indexOfIn(const char *needle, size_t nlen, @@ -119,31 +85,8 @@ private: { const auto uchar_max = (std::numeric_limits<uchar>::max)(); uchar max = n > uchar_max ? uchar_max : uchar(n); - Skiptable table = { - // this verbose initialization code aims to avoid some opaque error messages - // even on powerful compilers such as GCC 5.3. Even though for GCC a loop - // format can be found that v5.3 groks, it's probably better to go with this - // for the time being: - { - max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, - max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, - max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, - max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, - max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, - max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, - max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, - max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, - - max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, - max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, - max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, - max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, - max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, - max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, - max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, - max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, max, - } - }; + Skiptable table = {}; + q20::fill(std::begin(table.data), std::end(table.data), max); pattern += n - max; while (max--) table.data[uchar(*pattern++)] = max; |