Clean up file/error handling in the type loader

Fold the functionality of reading QFile contents via QQmlFile into
QQmlDataBlob::Data. This reduces the dependency on QQmlFile - which is
scheduled for removal - and it makes it possible in the future to avoid
reading the file altogether if we have a cached compilation unit on
disk.

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

1 files changed, 4 insertions, 43 deletions

diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h
index 20f701514a..d476056ef1 100644
--- a/src/qml/qml/qqmltypeloader_p.h
+++ b/src/qml/qml/qqmltypeloader_p.h
@@ -131,21 +131,14 @@ public:
 
     class Data {
     public:
-        inline const char *data() const;
-        inline int size() const;
-
-        inline QByteArray asByteArray() const;
-
-        inline bool isFile() const;
-        inline QQmlFile *asFile() const;
-
+        QByteArray readAll(QString *error) const;
     private:
         friend class QQmlDataBlob;
         friend class QQmlTypeLoader;
         inline Data();
         Data(const Data &);
         Data &operator=(const Data &);
-        QBiPointer<const QByteArray, QQmlFile> d;
+        QBiPointer<const QByteArray, const QString> d;
     };
 
 protected:
@@ -153,6 +146,7 @@ protected:
     void setError(const QQmlError &);
     void setError(const QList<QQmlError> &errors);
     void setError(const QQmlCompileError &error);
+    void setError(const QString &description);
     void addDependency(QQmlDataBlob *);
 
     // Callbacks made in load thread
@@ -342,7 +336,7 @@ private:
 #endif
 
     void setData(QQmlDataBlob *, const QByteArray &);
-    void setData(QQmlDataBlob *, QQmlFile *);
+    void setData(QQmlDataBlob *, const QString &fileName);
     void setData(QQmlDataBlob *, const QQmlDataBlob::Data &);
     void setCachedUnit(QQmlDataBlob *blob, const QQmlPrivate::CachedQmlUnit *unit);
 
@@ -582,40 +576,7 @@ QQmlDataBlob::Data::Data()
 {
 }
 
-const char *QQmlDataBlob::Data::data() const
-{
-    Q_ASSERT(!d.isNull());
-
-    if (d.isT1()) return d.asT1()->constData();
-    else return d.asT2()->data();
-}
-
-int QQmlDataBlob::Data::size() const
-{
-    Q_ASSERT(!d.isNull());
-
-    if (d.isT1()) return d.asT1()->size();
-    else return d.asT2()->size();
-}
 
-bool QQmlDataBlob::Data::isFile() const
-{
-    return d.isT2();
-}
-
-QByteArray QQmlDataBlob::Data::asByteArray() const
-{
-    Q_ASSERT(!d.isNull());
-
-    if (d.isT1()) return *d.asT1();
-    else return d.asT2()->dataByteArray();
-}
-
-QQmlFile *QQmlDataBlob::Data::asFile() const
-{
-    if (d.isT2()) return d.asT2();
-    else return 0;
-}
 
 QT_END_NAMESPACE