Consolidate content setting into QQuickTextPrivate::updateDocumentText()

Factor out code that was repeated inconsistently.

Begin removing code from QQuickTextDocumentWithImageResources, in
preparation for removing the whole thing.

Change-Id: I5f7ddefb9223fb95e50c282e33fac7bc8f4ca27b
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 4 insertions, 26 deletions

diff --git a/src/quick/items/qquicktextdocument.cpp b/src/quick/items/qquicktextdocument.cpp
index ce0efb4d2a..ff28abe600 100644
--- a/src/quick/items/qquicktextdocument.cpp
+++ b/src/quick/items/qquicktextdocument.cpp
@@ -65,7 +65,10 @@ QQuickTextDocumentWithImageResources::QQuickTextDocumentWithImageResources(QQuic
 {
     setUndoRedoEnabled(false);
     documentLayout()->registerHandler(QTextFormat::ImageObject, this);
-    connect(this, SIGNAL(baseUrlChanged(QUrl)), this, SLOT(reset()));
+    connect(this, &QTextDocument::baseUrlChanged, [this]() {
+        clearResources();
+        markContentsDirty(0, characterCount());
+    });
 }
 
 QQuickTextDocumentWithImageResources::~QQuickTextDocumentWithImageResources()
@@ -149,12 +152,6 @@ QImage QQuickTextDocumentWithImageResources::image(const QTextImageFormat &forma
     return res.value<QImage>();
 }
 
-void QQuickTextDocumentWithImageResources::reset()
-{
-    clearResources();
-    markContentsDirty(0, characterCount());
-}
-
 QQuickPixmap *QQuickTextDocumentWithImageResources::loadPixmap(
         QQmlContext *context, const QUrl &url)
 {
@@ -190,25 +187,6 @@ void QQuickTextDocumentWithImageResources::clearResources()
     outstanding = 0;
 }
 
-void QQuickTextDocumentWithImageResources::setText(const QString &text)
-{
-    clearResources();
-
-#if QT_CONFIG(texthtmlparser)
-    setHtml(text);
-#else
-    setPlainText(text);
-#endif
-}
-
-#if QT_CONFIG(textmarkdownreader)
-void QQuickTextDocumentWithImageResources::setMarkdownText(const QString &text)
-{
-    clearResources();
-    QTextDocument::setMarkdown(text);
-}
-#endif
-
 QSet<QUrl> QQuickTextDocumentWithImageResources::errors;
 
 QT_END_NAMESPACE