summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qcontiguouscache.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-08-08 14:54:32 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-09 03:26:06 +0200
commit9f71ff69f2cabd70f89f764b1f9df757c68c0e10 (patch)
treeffb1d53a9e38dfb9a56bb5088657237833a0ea98 /src/corelib/tools/qcontiguouscache.cpp
parent649cd987439d87875c05983908823aa3062cdee9 (diff)
Rename QContiguousCache allocate and free functions to say "Data"
The important change is to use functions not called malloc and free. On some old systems or under some weird circumstances, they might be #defined to something different. More importantly, this allows us to quickly verify whether we're using the stdlib.h functions in our public headers. Change-Id: I66b963ac2bc75d64028c04542e62a929e4b36b19 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/tools/qcontiguouscache.cpp')
-rw-r--r--src/corelib/tools/qcontiguouscache.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qcontiguouscache.cpp b/src/corelib/tools/qcontiguouscache.cpp
index 6a320b82eb..719ca2f4da 100644
--- a/src/corelib/tools/qcontiguouscache.cpp
+++ b/src/corelib/tools/qcontiguouscache.cpp
@@ -56,12 +56,12 @@ void QContiguousCacheData::dump() const
}
#endif
-QContiguousCacheData *QContiguousCacheData::allocate(int size, int alignment)
+QContiguousCacheData *QContiguousCacheData::allocateData(int size, int alignment)
{
return static_cast<QContiguousCacheData *>(qMallocAligned(size, alignment));
}
-void QContiguousCacheData::free(QContiguousCacheData *data)
+void QContiguousCacheData::freeData(QContiguousCacheData *data)
{
qFreeAligned(data);
}