1 files changed, 22 insertions, 57 deletions
diff --git a/src/qml/qml/qqmltypeloaderthread_p.h b/src/qml/qml/qqmltypeloaderthread_p.h
index 045d838528..4f65fc0cbd 100644
--- a/src/qml/qml/qqmltypeloaderthread_p.h
+++ b/src/qml/qml/qqmltypeloaderthread_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 QQMLTYPELOADERTHREAD_P_H
 #define QQMLTYPELOADERTHREAD_P_H
@@ -53,6 +17,7 @@
 
 #include <private/qqmlthread_p.h>
 #include <private/qv4compileddata_p.h>
+#include <private/qqmldatablob_p.h>
 
 #include <QtQml/qtqmlglobal.h>
 
@@ -63,11 +28,14 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQmlDataBlob;
 class QQmlTypeLoader;
 class QQmlEngineExtensionInterface;
 class QQmlExtensionInterface;
 
+namespace QQmlPrivate {
+struct CachedQmlUnit;
+}
+
 class QQmlTypeLoaderThread : public QQmlThread
 {
     typedef QQmlTypeLoaderThread This;
@@ -78,33 +46,30 @@ public:
     QNetworkAccessManager *networkAccessManager() const;
     QQmlTypeLoaderNetworkReplyProxy *networkReplyProxy() const;
 #endif // qml_network
-    void load(QQmlDataBlob *b);
-    void loadAsync(QQmlDataBlob *b);
-    void loadWithStaticData(QQmlDataBlob *b, const QByteArray &);
-    void loadWithStaticDataAsync(QQmlDataBlob *b, const QByteArray &);
-    void loadWithCachedUnit(QQmlDataBlob *b, const QQmlPrivate::CachedQmlUnit *unit);
-    void loadWithCachedUnitAsync(QQmlDataBlob *b, const QQmlPrivate::CachedQmlUnit *unit);
-    void callCompleted(QQmlDataBlob *b);
-    void callDownloadProgressChanged(QQmlDataBlob *b, qreal p);
+    void load(const QQmlDataBlob::Ptr &b);
+    void loadAsync(const QQmlDataBlob::Ptr &b);
+    void loadWithStaticData(const QQmlDataBlob::Ptr &b, const QByteArray &);
+    void loadWithStaticDataAsync(const QQmlDataBlob::Ptr &b, const QByteArray &);
+    void loadWithCachedUnit(const QQmlDataBlob::Ptr &b, const QQmlPrivate::CachedQmlUnit *unit);
+    void loadWithCachedUnitAsync(const QQmlDataBlob::Ptr &b, const QQmlPrivate::CachedQmlUnit *unit);
+    void callCompleted(const QQmlDataBlob::Ptr &b);
+    void callDownloadProgressChanged(const QQmlDataBlob::Ptr &b, qreal p);
     void initializeEngine(QQmlExtensionInterface *, const char *);
     void initializeEngine(QQmlEngineExtensionInterface *, const char *);
 
-protected:
-    void shutdownThread() override;
-
 private:
-    void loadThread(QQmlDataBlob *b);
-    void loadWithStaticDataThread(QQmlDataBlob *b, const QByteArray &);
-    void loadWithCachedUnitThread(QQmlDataBlob *b, const QQmlPrivate::CachedQmlUnit *unit);
-    void callCompletedMain(QQmlDataBlob *b);
-    void callDownloadProgressChangedMain(QQmlDataBlob *b, qreal p);
+    void loadThread(const QQmlDataBlob::Ptr &b);
+    void loadWithStaticDataThread(const QQmlDataBlob::Ptr &b, const QByteArray &);
+    void loadWithCachedUnitThread(const QQmlDataBlob::Ptr &b, const QQmlPrivate::CachedQmlUnit *unit);
+    void callCompletedMain(const QQmlDataBlob::Ptr &b);
+    void callDownloadProgressChangedMain(const QQmlDataBlob::Ptr &b, qreal p);
     void initializeExtensionMain(QQmlExtensionInterface *iface, const char *uri);
     void initializeEngineExtensionMain(QQmlEngineExtensionInterface *iface, const char *uri);
 
     QQmlTypeLoader *m_loader;
 #if QT_CONFIG(qml_network)
-    mutable QNetworkAccessManager *m_networkAccessManager;
-    mutable QQmlTypeLoaderNetworkReplyProxy *m_networkReplyProxy;
+    mutable QNetworkAccessManager *m_networkAccessManager = nullptr;
+    mutable QQmlTypeLoaderNetworkReplyProxy *m_networkReplyProxy = nullptr;
 #endif // qml_network
 };