From 21430446826eb69edf8076fa7178e8058bcaa7a2 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 17 Sep 2024 13:14:53 +0200 Subject: [PATCH] qtextstream_p.h: fix -Wshadow in QDeviceClosedNotifier Rename the data member to m_stream, as is idiomatic. Amends 327b2ba3b77e7a738ccfbe84c6ca5e9525010630. Pick-to: 6.7 6.5 6.2 5.15 Task-number: QTBUG-126219 Change-Id: I830e90e0a6c88acf95de8394e45cad075d4c924e Reviewed-by: David Faure (cherry picked from commit e585b937167b9746091c520e303657fbec2fe221) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/serialization/qtextstream_p.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/corelib/serialization/qtextstream_p.h b/src/corelib/serialization/qtextstream_p.h index 909b75d0de3..db7bb7ba0dd 100644 --- a/src/corelib/serialization/qtextstream_p.h +++ b/src/corelib/serialization/qtextstream_p.h @@ -42,14 +42,14 @@ public: connect(device, SIGNAL(aboutToClose()), this, SLOT(flushStream()), Qt::DirectConnection); } - this->stream = stream; + m_stream = stream; } public Q_SLOTS: - inline void flushStream() { stream->flush(); } + void flushStream() { m_stream->flush(); } private: - QTextStream *stream; + QTextStream *m_stream; }; #endif