From db992e132240b1dae46cbd76693968af4eeefc62 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Mon, 13 May 2024 13:26:49 +0200
Subject: [PATCH] QTextStream: port from QScopedPointer to unique_ptr

In preparation of adding QT_NO_SCOPED_PONTER, which would be rather
pointless for users if public headers continued to mention the type.

Task-number: QTBUG-132213
Change-Id: I6539e83158ab34e4fa4bd22b6d0ac5629a3b6db9
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit b815c6f7fd71086c97fe6e9aa9472154be5fcc57)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 6eb41440cd098d5d23405d70198fcdbaca5570fb)
---
 src/corelib/io/qdebug.cpp               | 4 ++--
 src/corelib/serialization/qtextstream.h | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/corelib/io/qdebug.cpp b/src/corelib/io/qdebug.cpp
index 16d2aa5135c..697d3733f04 100644
--- a/src/corelib/io/qdebug.cpp
+++ b/src/corelib/io/qdebug.cpp
@@ -318,7 +318,7 @@ void QDebug::putString(const QChar *begin, size_t length)
         // we'll reset the QTextStream formatting mechanisms, so save the state
         QDebugStateSaver saver(*this);
         stream->ts.d_ptr->params.reset();
-        putEscapedString(stream->ts.d_ptr.data(), reinterpret_cast<const char16_t *>(begin), length);
+        putEscapedString(stream->ts.d_ptr.get(), reinterpret_cast<const char16_t *>(begin), length);
     }
 }
 
@@ -338,7 +338,7 @@ void QDebug::putByteArray(const char *begin, size_t length, Latin1Content conten
         // we'll reset the QTextStream formatting mechanisms, so save the state
         QDebugStateSaver saver(*this);
         stream->ts.d_ptr->params.reset();
-        putEscapedString(stream->ts.d_ptr.data(), reinterpret_cast<const uchar *>(begin),
+        putEscapedString(stream->ts.d_ptr.get(), reinterpret_cast<const uchar *>(begin),
                          length, content == ContainsLatin1);
     }
 }
diff --git a/src/corelib/serialization/qtextstream.h b/src/corelib/serialization/qtextstream.h
index 7a0fc42a68b..84fa14ec5ed 100644
--- a/src/corelib/serialization/qtextstream.h
+++ b/src/corelib/serialization/qtextstream.h
@@ -6,9 +6,10 @@
 
 #include <QtCore/qiodevicebase.h>
 #include <QtCore/qchar.h>
-#include <QtCore/qscopedpointer.h>
 #include <QtCore/qstringconverter_base.h>
 
+#include <memory>
+
 #include <stdio.h>
 
 #if 0
@@ -174,7 +175,7 @@ private:
     friend class QDebugStateSaverPrivate;
     friend class QDebug;
 
-    QScopedPointer<QTextStreamPrivate> d_ptr;
+    std::unique_ptr<QTextStreamPrivate> d_ptr;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QTextStream::NumberFlags)