diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-04-04 14:04:03 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-05 01:44:46 +0200 |
| commit | 3669ceb77968e55225fecc7f4232b5545c98a69b (patch) | |
| tree | e31e15825989b576714252092029e3a3da564b25 /src/corelib/tools/qstring.h | |
| parent | e5d10b2a3be77244d8db3a4dac86168ee9b91e6f (diff) | |
Rename realloc -> reallocData
This avoids confusion with standard ::realloc.
Change-Id: Ibeccf2f702ec37161033febf4f3926bee8f7aea6
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools/qstring.h')
| -rw-r--r-- | src/corelib/tools/qstring.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index 36acf322fc..c7629fdfdd 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -372,7 +372,7 @@ public: inline QString &operator+=(QChar c) { if (d->ref.isShared() || d->size + 1 > int(d->alloc)) - realloc(d->size + 1, true); + reallocData(d->size + 1, true); d->data()[d->size++] = c.unicode(); d->data()[d->size] = '\0'; return *this; @@ -650,7 +650,7 @@ private: Data *d; static void free(Data *); - void realloc(int alloc, bool grow = false); + void reallocData(int alloc, bool grow = false); void expand(int i); void updateProperties() const; QString multiArg(int numArgs, const QString **args) const; @@ -746,7 +746,7 @@ inline QChar *QString::data() inline const QChar *QString::constData() const { return reinterpret_cast<const QChar*>(d->data()); } inline void QString::detach() -{ if (d->ref.isShared() || (d->offset != sizeof(QStringData))) realloc(d->size); } +{ if (d->ref.isShared() || (d->offset != sizeof(QStringData))) reallocData(d->size); } inline bool QString::isDetached() const { return !d->ref.isShared(); } inline QString &QString::operator=(const QLatin1String &s) @@ -912,7 +912,7 @@ inline QString::~QString() { if (!d->ref.deref()) free(d); } inline void QString::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) @@ -923,7 +923,7 @@ inline void QString::reserve(int asize) inline void QString::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 |