From 3669ceb77968e55225fecc7f4232b5545c98a69b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Wed, 4 Apr 2012 14:04:03 +0200 Subject: Rename realloc -> reallocData This avoids confusion with standard ::realloc. Change-Id: Ibeccf2f702ec37161033febf4f3926bee8f7aea6 Reviewed-by: Marius Storm-Olsen Reviewed-by: Thiago Macieira --- src/corelib/tools/qbytearray.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/corelib/tools/qbytearray.h') diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h index 62273c55fd..37c5f72040 100644 --- a/src/corelib/tools/qbytearray.h +++ b/src/corelib/tools/qbytearray.h @@ -406,7 +406,7 @@ private: static const QStaticByteArrayData<1> shared_null; static const QStaticByteArrayData<1> shared_empty; Data *d; - void realloc(int alloc, bool grow = false); + void reallocData(int alloc, bool grow = false); void expand(int i); QByteArray nulTerminated() const; @@ -445,7 +445,7 @@ inline const char *QByteArray::data() const inline const char *QByteArray::constData() const { return d->data(); } inline void QByteArray::detach() -{ if (d->ref.isShared() || (d->offset != sizeof(QByteArrayData))) realloc(d->size); } +{ if (d->ref.isShared() || (d->offset != sizeof(QByteArrayData))) reallocData(d->size); } inline bool QByteArray::isDetached() const { return !d->ref.isShared(); } inline QByteArray::QByteArray(const QByteArray &a) : d(a.d) @@ -457,7 +457,7 @@ inline int QByteArray::capacity() const inline void QByteArray::reserve(int asize) { if (d->ref.isShared() || asize > int(d->alloc)) - realloc(asize); + reallocData(asize); if (!d->capacityReserved) { // cannot set unconditionally, since d could be the shared_null/shared_empty (which is const) @@ -468,7 +468,7 @@ inline void QByteArray::reserve(int asize) inline void QByteArray::squeeze() { if (d->ref.isShared() || d->size < int(d->alloc)) - realloc(d->size); + reallocData(d->size); if (d->capacityReserved) { // cannot set unconditionally, since d could be shared_null or -- cgit v1.2.3