From f8bdb6fd195ec04e5b49e84a5077c012d95ff58d Mon Sep 17 00:00:00 2001
From: Debao Zhang <dbzhang800@gmail.com>
Date: Fri, 27 Apr 2012 01:53:37 -0700
Subject: qMalloc, qFree and qRealloc are deprecated.

Use the stdlib version directly instead

Change-Id: Ib289b37c9a00b7da1926e20cc1c1b5a52388fb2f
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
---
 src/script/parser/qscript.g                         | 12 ++++++------
 src/script/parser/qscriptparser.cpp                 |  6 +++---
 tests/auto/qscriptv8testsuite/abstracttestsuite.cpp |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/script/parser/qscript.g b/src/script/parser/qscript.g
index 620f523..e7f28dc 100644
--- a/src/script/parser/qscript.g
+++ b/src/script/parser/qscript.g
@@ -268,9 +268,9 @@ inline void QScriptParser::reallocateStack()
     else
         stack_size <<= 1;
 
-    sym_stack = reinterpret_cast<Value*> (qRealloc(sym_stack, stack_size * sizeof(Value)));
-    state_stack = reinterpret_cast<int*> (qRealloc(state_stack, stack_size * sizeof(int)));
-    location_stack = reinterpret_cast<Location*> (qRealloc(location_stack, stack_size * sizeof(Location)));
+    sym_stack = reinterpret_cast<Value*> (realloc(sym_stack, stack_size * sizeof(Value)));
+    state_stack = reinterpret_cast<int*> (realloc(state_stack, stack_size * sizeof(int)));
+    location_stack = reinterpret_cast<Location*> (realloc(location_stack, stack_size * sizeof(Location)));
 }
 
 :/
@@ -307,9 +307,9 @@ QScriptParser::QScriptParser():
 QScriptParser::~QScriptParser()
 {
     if (stack_size) {
-        qFree(sym_stack);
-        qFree(state_stack);
-        qFree(location_stack);
+        free(sym_stack);
+        free(state_stack);
+        free(location_stack);
     }
 }
 
diff --git a/src/script/parser/qscriptparser.cpp b/src/script/parser/qscriptparser.cpp
index 650ab98..46b6f42 100644
--- a/src/script/parser/qscriptparser.cpp
+++ b/src/script/parser/qscriptparser.cpp
@@ -66,9 +66,9 @@ QScriptParser::QScriptParser():
 QScriptParser::~QScriptParser()
 {
     if (stack_size) {
-        qFree(sym_stack);
-        qFree(state_stack);
-        qFree(location_stack);
+        free(sym_stack);
+        free(state_stack);
+        free(location_stack);
     }
 }
 
diff --git a/tests/auto/qscriptv8testsuite/abstracttestsuite.cpp b/tests/auto/qscriptv8testsuite/abstracttestsuite.cpp
index d6eec1d..866edbd 100644
--- a/tests/auto/qscriptv8testsuite/abstracttestsuite.cpp
+++ b/tests/auto/qscriptv8testsuite/abstracttestsuite.cpp
@@ -320,7 +320,7 @@ AbstractTestSuite::AbstractTestSuite(const QByteArray &className,
 
 AbstractTestSuite::~AbstractTestSuite()
 {
-    qFree(dynamicMetaObject);
+    free(dynamicMetaObject);
 }
 
 void AbstractTestSuite::addTestFunction(const QString &name,
-- 
cgit v1.2.1