1 files changed, 17 insertions, 51 deletions

diff --git a/src/corelib/text/qtextboundaryfinder.h b/src/corelib/text/qtextboundaryfinder.h
index b1e5008f54..04e64fd69b 100644
--- a/src/corelib/text/qtextboundaryfinder.h
+++ b/src/corelib/text/qtextboundaryfinder.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** 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 QTEXTBOUNDARYFINDER_H
 #define QTEXTBOUNDARYFINDER_H
@@ -46,7 +10,7 @@
 QT_BEGIN_NAMESPACE
 
 
-class QTextBoundaryFinderPrivate;
+struct QCharAttributes;
 
 class Q_CORE_EXPORT QTextBoundaryFinder
 {
@@ -74,33 +38,35 @@ public:
     Q_DECLARE_FLAGS( BoundaryReasons, BoundaryReason )
 
     QTextBoundaryFinder(BoundaryType type, const QString &string);
-    QTextBoundaryFinder(BoundaryType type, const QChar *chars, int length, unsigned char *buffer = nullptr, int bufferSize = 0);
+    QTextBoundaryFinder(BoundaryType type, const QChar *chars, qsizetype length, unsigned char *buffer = nullptr, qsizetype bufferSize = 0)
+        : QTextBoundaryFinder(type, QStringView(chars, length), buffer, bufferSize)
+    {}
+    QTextBoundaryFinder(BoundaryType type, QStringView str, unsigned char *buffer = nullptr, qsizetype bufferSize = 0);
 
-    inline bool isValid() const { return d; }
+    inline bool isValid() const { return attributes; }
 
     inline BoundaryType type() const { return t; }
     QString string() const;
 
     void toStart();
     void toEnd();
-    int position() const;
-    void setPosition(int position);
+    qsizetype position() const;
+    void setPosition(qsizetype position);
 
-    int toNextBoundary();
-    int toPreviousBoundary();
+    qsizetype toNextBoundary();
+    qsizetype toPreviousBoundary();
 
     bool isAtBoundary() const;
     BoundaryReasons boundaryReasons() const;
 
 private:
-    BoundaryType t;
+    BoundaryType t = Grapheme;
     QString s;
-    const QChar *chars;
-    int length;
-    int pos;
-    uint freePrivate : 1;
+    QStringView sv;
+    qsizetype pos = 0;
+    uint freeBuffer : 1;
     uint unused : 31;
-    QTextBoundaryFinderPrivate *d;
+    QCharAttributes *attributes = nullptr;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QTextBoundaryFinder::BoundaryReasons)