Remove references to QTextDocumentPrivate from public API

The private object of QTextDocument has been exposed through
public APIs marked internal, which we should avoid as much as
possible, since it clutters the headers.

For accessing private data without adding friends, we have
a nice pattern of adding a static get() function to the
private class itself.

Fixes: QTBUG-55059
Change-Id: I03e949a677e03487e95f24e3608a06aa0a3511ab
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp
index fa323ef4bd..c579eca1ff 100644
--- a/src/gui/text/qtextcursor.cpp
+++ b/src/gui/text/qtextcursor.cpp
@@ -1052,7 +1052,7 @@ QTextCursor::QTextCursor()
     Constructs a cursor pointing to the beginning of the \a document.
  */
 QTextCursor::QTextCursor(QTextDocument *document)
-    : d(new QTextCursorPrivate(document->docHandle()))
+    : d(new QTextCursorPrivate(QTextDocumentPrivate::get(document)))
 {
 }
 
@@ -1060,7 +1060,7 @@ QTextCursor::QTextCursor(QTextDocument *document)
     Constructs a cursor pointing to the beginning of the \a frame.
 */
 QTextCursor::QTextCursor(QTextFrame *frame)
-    : d(new QTextCursorPrivate(frame->document()->docHandle()))
+    : d(new QTextCursorPrivate(QTextDocumentPrivate::get(frame->document())))
 {
     d->adjusted_anchor = d->anchor = d->position = frame->firstPosition();
 }
@@ -1070,7 +1070,7 @@ QTextCursor::QTextCursor(QTextFrame *frame)
     Constructs a cursor pointing to the beginning of the \a block.
 */
 QTextCursor::QTextCursor(const QTextBlock &block)
-    : d(new QTextCursorPrivate(block.docHandle()))
+    : d(new QTextCursorPrivate(const_cast<QTextDocumentPrivate *>(QTextDocumentPrivate::get(block))))
 {
     d->adjusted_anchor = d->anchor = d->position = block.position();
 }
@@ -2264,7 +2264,7 @@ void QTextCursor::insertFragment(const QTextDocumentFragment &fragment)
     d->setX();
 
     if (fragment.d && fragment.d->doc)
-        d->priv->mergeCachedResources(fragment.d->doc->docHandle());
+        d->priv->mergeCachedResources(QTextDocumentPrivate::get(fragment.d->doc));
 }
 
 /*!