aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/ftw
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2012-04-20 19:55:49 +0200
committerQt by Nokia <qt-info@nokia.com>2012-04-23 09:52:33 +0200
commit42e93ffffa23b466f6641f86de18e6a7dd71166c (patch)
treec86d77224c72acdd3e52b4a7f2d6be4832db0a77 /src/qml/qml/ftw
parentb50aa539e854f1a10c5f012a448ab6977c3fc9ac (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/ftw')
-rw-r--r--src/qml/qml/ftw/qfinitestack_p.h4
-rw-r--r--src/qml/qml/ftw/qrecyclepool_p.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/qml/ftw/qfinitestack_p.h b/src/qml/qml/ftw/qfinitestack_p.h
index c5a9fbaedb..8ebcd062a7 100644
--- a/src/qml/qml/ftw/qfinitestack_p.h
+++ b/src/qml/qml/ftw/qfinitestack_p.h
@@ -160,7 +160,7 @@ void QFiniteStack<T>::allocate(int size)
if (!size) return;
- _array = (T *)qMalloc(size * sizeof(T));
+ _array = (T *)malloc(size * sizeof(T));
_alloc = size;
}
@@ -173,7 +173,7 @@ void QFiniteStack<T>::deallocate()
(--i)->~T();
}
- qFree(_array);
+ free(_array);
_array = 0;
_alloc = 0;
diff --git a/src/qml/qml/ftw/qrecyclepool_p.h b/src/qml/qml/ftw/qrecyclepool_p.h
index 8d0f060ab3..002eee4885 100644
--- a/src/qml/qml/ftw/qrecyclepool_p.h
+++ b/src/qml/qml/ftw/qrecyclepool_p.h
@@ -170,7 +170,7 @@ void QRecyclePoolPrivate<T, Step>::releaseIfPossible()
Page *p = currentPage;
while (p) {
Page *n = p->nextPage;
- qFree(p);
+ free(p);
p = n;
}
@@ -188,7 +188,7 @@ T *QRecyclePoolPrivate<T, Step>::allocate()
rv = (PoolType *)(currentPage->array + (Step - currentPage->free) * sizeof(PoolType));
currentPage->free--;
} else {
- Page *p = (Page *)qMalloc(sizeof(Page));
+ Page *p = (Page *)malloc(sizeof(Page));
p->nextPage = currentPage;
p->free = Step;
currentPage = p;