diff options
| author | Robin Burchell <robin.burchell@collabora.com> | 2011-12-20 21:39:12 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-06 14:11:14 +0100 |
| commit | b08daaedd45457b775cb90d2c2650510daff1c8d (patch) | |
| tree | d68ea8016a15ee851813133a51897a7a81aedc16 /src/corelib/codecs | |
| parent | 514ef34d1f838be119961003c0411a88352ba535 (diff) | |
Remove all non-inline of qMalloc/qFree/qRealloc.
We're trying to deprecate these, so don't use them anymore.
The inline uses of these have been left intact, for the moment. Inline code will
need to create their own non-inline allocation methods (for future-proofing to
allow alterations in how e.g. individual containers allocate)
Change-Id: I1071a487c25e95b7bb81a3327b20c5481fb5ed22
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/corelib/codecs')
| -rw-r--r-- | src/corelib/codecs/qtextcodec.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/codecs/qtextcodec_symbian.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index ff1db7c67e..071bd1e319 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -842,7 +842,7 @@ QTextCodec::ConverterState::~ConverterState() if (flags & FreeFunction) (QTextCodecUnalignedPointer::decode(state_data))(this); else if (d) - qFree(d); + free(d); } /*! diff --git a/src/corelib/codecs/qtextcodec_symbian.cpp b/src/corelib/codecs/qtextcodec_symbian.cpp index 2b1c98f91d..a4628ccf06 100644 --- a/src/corelib/codecs/qtextcodec_symbian.cpp +++ b/src/corelib/codecs/qtextcodec_symbian.cpp @@ -239,7 +239,7 @@ QString QSymbianTextCodec::convertToUnicode(const char *str, int len, ConverterS str2 = helperBA.data(); if (state->remainingChars > 3) { // doesn't happen usually memcpy(str2, state->d, state->remainingChars); - qFree(state->d); + free(state->d); state->d = 0; } else { char charTbl[3]; @@ -326,7 +326,7 @@ QString QSymbianTextCodec::convertToUnicode(const char *str, int len, ConverterS } const unsigned char *charPtr = remainderOfForeignText.Right(remainingChars).Ptr(); if (remainingChars > 3) { // doesn't happen usually - state->d = (void*)qMalloc(remainingChars); + state->d = (void*)malloc(remainingChars); if (!state->d) return QString(); // copy characters there |