QQuickTextDocumentWithImageResources: use QTextDocument::baseUrl

QTextDocument::baseUrl was introduced in qtbase commit 1f22c1d. The
ultimate goal is to get rid of QQuickTextDocumentWithImageResources
and eventually make QQuickTextEdit's document interchangeable.

Change-Id: Ibafeecc395b52f7200d8164f809bf76538e5620c
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

1 files changed, 3 insertions, 6 deletions

diff --git a/src/quick/items/qquicktext_p_p.h b/src/quick/items/qquicktext_p_p.h
index 1f6cd3eab5..12113f416c 100644
--- a/src/quick/items/qquicktext_p_p.h
+++ b/src/quick/items/qquicktext_p_p.h
@@ -195,16 +195,13 @@ public:
     void setText(const QString &);
     int resourcesLoading() const { return outstanding; }
 
-    void clearResources();
-
-    void clear();
-
     QSizeF intrinsicSize(QTextDocument *doc, int posInDocument, const QTextFormat &format);
     void drawObject(QPainter *p, const QRectF &rect, QTextDocument *doc, int posInDocument, const QTextFormat &format);
 
     QImage image(const QTextImageFormat &format);
 
-    void setBaseUrl(const QUrl &url, bool clear = true);
+public Q_SLOTS:
+    void clearResources();
 
 Q_SIGNALS:
     void imagesLoaded();
@@ -215,11 +212,11 @@ protected:
     QQuickPixmap *loadPixmap(QQmlContext *context, const QUrl &name);
 
 private Q_SLOTS:
+    void reset();
     void requestFinished();
 
 private:
     QHash<QUrl, QQuickPixmap *> m_resources;
-    QUrl m_baseUrl;
 
     int outstanding;
     static QSet<QUrl> errors;