AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QCharRef/QByteRef: schedule for Qt 7 removal

Browse Source 
With all of their special behavior deprecated, QCharRef and QByteRef
can simply be removed. Add a comment.

Change-Id: I8bad95424207ae281b5edf348b9ad81c6807dc12
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Giuseppe D'Angelo 2019-05-19 16:25:52 +02:00
parent 2c289c6c1e
commit da0f40f9ac
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/tools/qbytearray.h
View File

@ -548,7 +548,7 @@ class
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
Q_CORE_EXPORT Q_CORE_EXPORT
#endif #endif
QByteRef { QByteRef { // ### Qt 7: remove
QByteArray &a; QByteArray &a;
int i; int i;
inline QByteRef(QByteArray &array, int idx) inline QByteRef(QByteArray &array, int idx)

2
src/corelib/tools/qstring.h
View File

@ -1103,7 +1103,7 @@ class
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
Q_CORE_EXPORT Q_CORE_EXPORT
#endif #endif
QCharRef { QCharRef { // ### Qt 7: remove
QString &s; QString &s;
int i; int i;
inline QCharRef(QString &str, int idx) inline QCharRef(QString &str, int idx)