1 files changed, 14 insertions, 51 deletions

diff --git a/src/qml/jsruntime/qv4typedarray_p.h b/src/qml/jsruntime/qv4typedarray_p.h
index e590083bc3..9747eac411 100644
--- a/src/qml/jsruntime/qv4typedarray_p.h
+++ b/src/qml/jsruntime/qv4typedarray_p.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtQml 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 QV4TYPEDARRAY_H
 #define QV4TYPEDARRAY_H
 
@@ -116,7 +80,7 @@ namespace Heap {
     Member(class, NoMark, uint, arrayType)
 
 DECLARE_HEAP_OBJECT(TypedArray, Object) {
-    DECLARE_MARKOBJECTS(TypedArray);
+    DECLARE_MARKOBJECTS(TypedArray)
     using Type = TypedArrayType;
 
     void init(Type t);
@@ -142,25 +106,24 @@ struct TypedArrayPrototype : Object {
 
 }
 
-struct Q_QML_PRIVATE_EXPORT TypedArray : Object
+struct Q_QML_EXPORT TypedArray : Object
 {
     V4_OBJECT2(TypedArray, Object)
 
     static Heap::TypedArray *create(QV4::ExecutionEngine *e, Heap::TypedArray::Type t);
 
-    uint byteLength() const {
-        return d()->byteLength;
-    }
-
-    uint length() const {
-        return d()->byteLength/d()->type->bytesPerElement;
-    }
+    uint byteOffset() const noexcept { return d()->byteOffset; }
+    uint byteLength() const noexcept { return d()->byteLength; }
+    int bytesPerElement() const noexcept { return d()->type->bytesPerElement; }
+    uint length() const noexcept  { return d()->byteLength / d()->type->bytesPerElement; }
 
-    QArrayDataPointer<char> *arrayData() {
-        return &d()->buffer->data();
-    }
+    char *arrayData() noexcept { return d()->buffer->arrayData(); }
+    const char *constArrayData() const noexcept { return d()->buffer->constArrayData(); }
+    bool hasDetachedArrayData() const noexcept { return d()->buffer->hasDetachedArrayData(); }
+    uint arrayDataLength() const noexcept { return d()->buffer->arrayDataLength(); }
 
-    Heap::TypedArray::Type arrayType() const {
+    Heap::TypedArray::Type arrayType() const noexcept
+    {
         return static_cast<Heap::TypedArray::Type>(d()->arrayType);
     }
     using Object::get;