diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2012-04-20 19:55:49 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-23 09:52:33 +0200 |
commit | 42e93ffffa23b466f6641f86de18e6a7dd71166c (patch) | |
tree | c86d77224c72acdd3e52b4a7f2d6be4832db0a77 /src/qml/qml/parser | |
parent | b50aa539e854f1a10c5f012a448ab6977c3fc9ac (diff) |
qMalloc, qFree, qRealloc, qMemCopy, qMemSet are deprecated
Use the stdlib version directly instead
Change-Id: Ifc600f6c418b395c4ada9e5beb207ad3985575e3
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'src/qml/qml/parser')
-rw-r--r-- | src/qml/qml/parser/qqmljsmemorypool_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/qml/parser/qqmljsmemorypool_p.h b/src/qml/qml/parser/qqmljsmemorypool_p.h index fd52fd25e4..facad4474d 100644 --- a/src/qml/qml/parser/qqmljsmemorypool_p.h +++ b/src/qml/qml/parser/qqmljsmemorypool_p.h @@ -84,10 +84,10 @@ public: if (_blocks) { for (int i = 0; i < _allocatedBlocks; ++i) { if (char *b = _blocks[i]) - qFree(b); + free(b); } - qFree(_blocks); + free(_blocks); } } @@ -119,7 +119,7 @@ private: else _allocatedBlocks *= 2; - _blocks = (char **) qRealloc(_blocks, sizeof(char *) * _allocatedBlocks); + _blocks = (char **) realloc(_blocks, sizeof(char *) * _allocatedBlocks); for (int index = _blockCount; index < _allocatedBlocks; ++index) _blocks[index] = 0; @@ -128,7 +128,7 @@ private: char *&block = _blocks[_blockCount]; if (! block) - block = (char *) qMalloc(BLOCK_SIZE); + block = (char *) malloc(BLOCK_SIZE); _ptr = block; _end = _ptr + BLOCK_SIZE; |