1 files changed, 19 insertions, 54 deletions

diff --git a/src/corelib/text/qstringmatcher.h b/src/corelib/text/qstringmatcher.h
index 104d4879b0..937f17df0a 100644
--- a/src/corelib/text/qstringmatcher.h
+++ b/src/corelib/text/qstringmatcher.h
@@ -1,42 +1,6 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Copyright (C) 2019 Mail.ru Group.
-** 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) 2020 The Qt Company Ltd.
+// Copyright (C) 2019 Mail.ru Group.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #ifndef QSTRINGMATCHER_H
 #define QSTRINGMATCHER_H
@@ -53,11 +17,13 @@ class Q_CORE_EXPORT QStringMatcher
 {
     void updateSkipTable();
 public:
-    QStringMatcher();
+    QStringMatcher() = default;
     explicit QStringMatcher(const QString &pattern,
                    Qt::CaseSensitivity cs = Qt::CaseSensitive);
-    QStringMatcher(const QChar *uc, int len,
-                   Qt::CaseSensitivity cs = Qt::CaseSensitive);
+    QStringMatcher(const QChar *uc, qsizetype len,
+                   Qt::CaseSensitivity cs = Qt::CaseSensitive)
+        : QStringMatcher(QStringView(uc, len), cs)
+    {}
     QStringMatcher(QStringView pattern,
                    Qt::CaseSensitivity cs = Qt::CaseSensitive);
     QStringMatcher(const QStringMatcher &other);
@@ -68,24 +34,23 @@ public:
     void setPattern(const QString &pattern);
     void setCaseSensitivity(Qt::CaseSensitivity cs);
 
-    int indexIn(const QString &str, qsizetype from = 0) const;
-    int indexIn(const QChar *str, qsizetype length, qsizetype from = 0) const;
+    qsizetype indexIn(const QString &str, qsizetype from = 0) const
+    { return indexIn(QStringView(str), from); }
+    qsizetype indexIn(const QChar *str, qsizetype length, qsizetype from = 0) const
+    { return indexIn(QStringView(str, length), from); }
     qsizetype indexIn(QStringView str, qsizetype from = 0) const;
     QString pattern() const;
+    QStringView patternView() const noexcept
+    { return q_sv; }
+
     inline Qt::CaseSensitivity caseSensitivity() const { return q_cs; }
 
 private:
-    QStringMatcherPrivate *d_ptr;
+    QStringMatcherPrivate *d_ptr = nullptr;
+    Qt::CaseSensitivity q_cs = Qt::CaseSensitive;
     QString q_pattern;
-    Qt::CaseSensitivity q_cs;
-    struct Data {
-        uchar q_skiptable[256];
-        QStringView sv;
-    };
-    union {
-        uint q_data[256];
-        Data p;
-    };
+    QStringView q_sv;
+    uchar q_skiptable[256] = {};
 };
 
 QT_END_NAMESPACE