1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qtextstream_p.h: fix -Wshadow in QDeviceClosedNotifier

Browse Source 
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 <david.faure@kdab.com>
(cherry picked from commit e585b937167b9746091c520e303657fbec2fe221)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2024-09-17 13:14:53 +02:00 committed by Qt Cherry-pick Bot
parent 339d339e9d
commit 2143044682
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/serialization/qtextstream_p.h
View File

@ -42,14 +42,14 @@ public:
connect(device, SIGNAL(aboutToClose()), this, SLOT(flushStream()), connect(device, SIGNAL(aboutToClose()), this, SLOT(flushStream()),
Qt::DirectConnection); Qt::DirectConnection);
} }
this->stream = stream; m_stream = stream;
} }
public Q_SLOTS: public Q_SLOTS:
inline void flushStream() { stream->flush(); } void flushStream() { m_stream->flush(); }
private: private:
QTextStream *stream; QTextStream *m_stream;
}; };
#endif #endif