Simplify internal source access API

All call sites of QQmlDataBlob::Data immediately convert the data to
UTf-8 - for .qml, .js and qmldir files. We can simplify the code by
reflecting that in the API and that also opens up the possibility for
future optimizations.

This means that the bi-pointer has to go, but at the moment the Data
object is stack-allocated anyway.

Since the "Data" class always represents source code, it is now called
SourceCodeData.

Change-Id: Icd262ed1e35f9edd64945ba6c16d80f9917eae72
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 10 insertions, 17 deletions

diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h
index 915b1bcc4c..c1b3548fa6 100644
--- a/src/qml/qml/qqmltypeloader_p.h
+++ b/src/qml/qml/qqmltypeloader_p.h
@@ -130,16 +130,14 @@ public:
 
     QList<QQmlError> errors() const;
 
-    class Data {
+    class SourceCodeData {
     public:
-        QByteArray readAll(QString *error, qint64 *sourceTimeStamp = 0) const;
+        QString readAll(QString *error, qint64 *sourceTimeStamp = 0) const;
     private:
         friend class QQmlDataBlob;
         friend class QQmlTypeLoader;
-        inline Data();
-        Data(const Data &);
-        Data &operator=(const Data &);
-        QBiPointer<const QByteArray, const QString> d;
+        QString inlineSourceCodeOrFileName;
+        bool sourceCodeAvailable = false;
     };
 
 protected:
@@ -152,7 +150,7 @@ protected:
     void addDependency(QQmlDataBlob *);
 
     // Callbacks made in load thread
-    virtual void dataReceived(const Data &) = 0;
+    virtual void dataReceived(const SourceCodeData &) = 0;
     virtual void initializeFromCachedUnit(const QQmlPrivate::CachedQmlUnit*) = 0;
     virtual void done();
 #if QT_CONFIG(qml_network)
@@ -339,7 +337,7 @@ private:
 
     void setData(QQmlDataBlob *, const QByteArray &);
     void setData(QQmlDataBlob *, const QString &fileName);
-    void setData(QQmlDataBlob *, const QQmlDataBlob::Data &);
+    void setData(QQmlDataBlob *, const QQmlDataBlob::SourceCodeData &);
     void setCachedUnit(QQmlDataBlob *blob, const QQmlPrivate::CachedQmlUnit *unit);
 
     template<typename T>
@@ -436,7 +434,7 @@ public:
 protected:
     void done() override;
     void completed() override;
-    void dataReceived(const Data &) override;
+    void dataReceived(const SourceCodeData &) override;
     void initializeFromCachedUnit(const QQmlPrivate::CachedQmlUnit *unit) override;
     void allDependenciesDone() override;
     void downloadProgressChanged(qreal) override;
@@ -463,7 +461,7 @@ private:
 
 
     qint64 m_sourceTimeStamp = 0;
-    QByteArray m_backupSourceCode; // used when cache verification fails.
+    QString m_backupSourceCode; // used when cache verification fails.
     QScopedPointer<QmlIR::Document> m_document;
     QV4::CompiledData::TypeReferenceMap m_typeReferences;
 
@@ -547,7 +545,7 @@ public:
     QQmlScriptData *scriptData() const;
 
 protected:
-    void dataReceived(const Data &) override;
+    void dataReceived(const SourceCodeData &) override;
     void initializeFromCachedUnit(const QQmlPrivate::CachedQmlUnit *unit) override;
     void done() override;
 
@@ -578,7 +576,7 @@ public:
     void setPriority(int);
 
 protected:
-    void dataReceived(const Data &) override;
+    void dataReceived(const SourceCodeData &) override;
     void initializeFromCachedUnit(const QQmlPrivate::CachedQmlUnit*) override;
 
 private:
@@ -587,11 +585,6 @@ private:
     int m_priority;
 };
 
-QQmlDataBlob::Data::Data()
-{
-}
-
-
 
 QT_END_NAMESPACE