whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Undeprecate operator casts on QByteArray. 

This reverts part of commit 8397a44bed.

Change-Id: I1d2ec018167faeb23a9343b209bb0ff2d8db311d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
bb10
Stephen Kelly 2012-03-15 17:47:31 +01:00 committed by Qt by Nokia
parent c67efb6506
commit cd1e62ffc1
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,10 +205,8 @@ public:
void squeeze();
#ifndef QT_NO_CAST_FROM_BYTEARRAY
#if QT_DEPRECATED_SINCE(5, 0)
QT_DEPRECATED operator const char *() const { return constData(); }
QT_DEPRECATED operator const void *() const { return constData(); }
#endif
operator const char *() const;
operator const void *() const;
#endif
char *data();
const char *data() const;
@ -415,6 +413,12 @@ inline char QByteArray::operator[](uint i) const
inline bool QByteArray::isEmpty() const
{ return d->size == 0; }
#ifndef QT_NO_CAST_FROM_BYTEARRAY
inline QByteArray::operator const char *() const
{ return d->data(); }
inline QByteArray::operator const void *() const
{ return d->data(); }
#endif
inline char *QByteArray::data()
{ detach(); return d->data(); }
inline const char *QByteArray::data() const