Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 02:42:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove void pointer operator for QByteArray

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2016-11-16 00:43:41 +00:00
parent aed413cfbf
commit 18b57053cf
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/global/qglobal.h.cmake
View file

@ -957,8 +957,6 @@ redefine to built-in booleans to make autotests work properly */
# define QT_FASTCALL # define QT_FASTCALL
#endif #endif
typedef int QNoImplicitBoolCast;
#if defined(QT_ARCH_ARM) || defined(QT_ARCH_ARMV6) || defined(QT_ARCH_AVR32) || defined(QT_ARCH_SH) || defined(QT_ARCH_SH4A) #if defined(QT_ARCH_ARM) || defined(QT_ARCH_ARMV6) || defined(QT_ARCH_AVR32) || defined(QT_ARCH_SH) || defined(QT_ARCH_SH4A)
#define QT_NO_FPU #define QT_NO_FPU
#endif #endif

5
src/core/tools/qbytearray.h
View file

@ -147,7 +147,6 @@ public:
#ifndef QT_NO_CAST_FROM_BYTEARRAY #ifndef QT_NO_CAST_FROM_BYTEARRAY
operator const char *() const; operator const char *() const;
operator const void *() const;
#endif #endif
char *data(); char *data();
const char *data() const; const char *data() const;
@ -320,7 +319,7 @@ public:
bool isNull() const; bool isNull() const;
private: private:
operator QNoImplicitBoolCast() const; operator bool() const;
static Data shared_null; static Data shared_null;
static Data shared_empty; static Data shared_empty;
Data *d; Data *d;
@ -355,8 +354,6 @@ inline bool QByteArray::isEmpty() const
#ifndef QT_NO_CAST_FROM_BYTEARRAY #ifndef QT_NO_CAST_FROM_BYTEARRAY
inline QByteArray::operator const char *() const inline QByteArray::operator const char *() const
{ return d->data; } { return d->data; }
inline QByteArray::operator const void *() const
{ return d->data; }
#endif #endif
inline char *QByteArray::data() inline char *QByteArray::data()
{ detach(); return d->data; } { detach(); return d->data; }