diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-04-26 10:00:41 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-02 09:33:35 +0200 |
| commit | d0c01c581a69649d189a4febea90be050100322f (patch) | |
| tree | f2642c9d032718d4f8befcbe2afe5b435bc82b64 /src/declarative/qml/parser/qdeclarativejsmemorypool_p.h | |
| parent | 951f97722792fee9601425120f0b64408ec18a4a (diff) | |
QtQuick1: Fix deprecation warnings.
Introduced by qtbase:0df1c9f1fa04c06d6105de3f312c6c752a58ad70
Change-Id: I61e330707a49efd09bad0efda386712fba207c8a
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src/declarative/qml/parser/qdeclarativejsmemorypool_p.h')
| -rw-r--r-- | src/declarative/qml/parser/qdeclarativejsmemorypool_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/declarative/qml/parser/qdeclarativejsmemorypool_p.h b/src/declarative/qml/parser/qdeclarativejsmemorypool_p.h index a86134dc..c20c0418 100644 --- a/src/declarative/qml/parser/qdeclarativejsmemorypool_p.h +++ b/src/declarative/qml/parser/qdeclarativejsmemorypool_p.h @@ -80,9 +80,9 @@ public: virtual ~MemoryPool() { for (int index = 0; index < m_blockIndex + 1; ++index) - qFree(m_storage[index]); + free(m_storage[index]); - qFree(m_storage); + free(m_storage); } char *allocate(int bytes) { @@ -91,9 +91,9 @@ public: ++m_blockIndex; m_currentBlockSize = defaultBlockSize << m_blockIndex; - m_storage = reinterpret_cast<char**>(qRealloc(m_storage, sizeof(char*) * (1 + m_blockIndex))); - m_currentBlock = m_storage[m_blockIndex] = reinterpret_cast<char*>(qMalloc(m_currentBlockSize)); - ::memset(m_currentBlock, 0, m_currentBlockSize); + m_storage = reinterpret_cast<char**>(realloc(m_storage, sizeof(char*) * (1 + m_blockIndex))); + m_currentBlock = m_storage[m_blockIndex] = reinterpret_cast<char*>(malloc(m_currentBlockSize)); + memset(m_currentBlock, 0, m_currentBlockSize); m_currentIndex = (8 - quintptr(m_currentBlock)) & 7; // ensure first chunk is 64-bit aligned Q_ASSERT(m_currentIndex + bytes <= m_currentBlockSize); |