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>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp
index 280409fde8..a688ae1c1a 100644
--- a/src/corelib/tools/qmap.cpp
+++ b/src/corelib/tools/qmap.cpp
@@ -85,7 +85,7 @@ void QMapData::continueFreeData(int offset)
         if (strictAlignment)
             qFreeAligned(reinterpret_cast<char *>(prev) - offset);
         else
-            qFree(reinterpret_cast<char *>(prev) - offset);
+            free(reinterpret_cast<char *>(prev) - offset);
     }
     delete this;
 }
@@ -127,7 +127,7 @@ QMapData::Node *QMapData::node_create(Node *update[], int offset, int alignment)
 
     void *concreteNode = strictAlignment ?
                          qMallocAligned(offset + sizeof(Node) + level * sizeof(Node *), alignment) :
-                         qMalloc(offset + sizeof(Node) + level * sizeof(Node *));
+                         malloc(offset + sizeof(Node) + level * sizeof(Node *));
     Q_CHECK_PTR(concreteNode);
 
     Node *abstractNode = reinterpret_cast<Node *>(reinterpret_cast<char *>(concreteNode) + offset);
@@ -157,7 +157,7 @@ void QMapData::node_delete(Node *update[], int offset, Node *node)
     if (strictAlignment)
         qFreeAligned(reinterpret_cast<char *>(node) - offset);
     else
-        qFree(reinterpret_cast<char *>(node) - offset);
+        free(reinterpret_cast<char *>(node) - offset);
 }
 
 #ifdef QT_QMAP_DEBUG