don't use deprecated Qt API

Change-Id: I97b0aefa94a2ba027628c4d1335e8c833f8249ac
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

3 files changed, 9 insertions, 9 deletions

diff --git a/src/jomlib/ppexpr.g b/src/jomlib/ppexpr.g
index 14f13b6..23c815b 100644
--- a/src/jomlib/ppexpr.g
+++ b/src/jomlib/ppexpr.g
@@ -134,8 +134,8 @@ PPExprParser::PPExprParser()
 PPExprParser::~PPExprParser()
 {
     if (stack_size) {
-        qFree(sym_stack);
-        qFree(state_stack);
+        free(sym_stack);
+        free(state_stack);
     }
 }
 
@@ -146,8 +146,8 @@ inline void PPExprParser::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)));
+    sym_stack = reinterpret_cast<Value*> (realloc(sym_stack, stack_size * sizeof(Value)));
+    state_stack = reinterpret_cast<int*> (realloc(state_stack, stack_size * sizeof(int)));
 }
 
 bool PPExprParser::parse(const char* str)
diff --git a/src/jomlib/ppexprparser.cpp b/src/jomlib/ppexprparser.cpp
index 0c89e6d..c8759e5 100644
--- a/src/jomlib/ppexprparser.cpp
+++ b/src/jomlib/ppexprparser.cpp
@@ -14,8 +14,8 @@ PPExprParser::PPExprParser()
 PPExprParser::~PPExprParser()
 {
     if (stack_size) {
-        qFree(sym_stack);
-        qFree(state_stack);
+        free(sym_stack);
+        free(state_stack);
     }
 }
 
@@ -26,8 +26,8 @@ inline void PPExprParser::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)));
+    sym_stack = reinterpret_cast<Value*> (realloc(sym_stack, stack_size * sizeof(Value)));
+    state_stack = reinterpret_cast<int*> (realloc(state_stack, stack_size * sizeof(int)));
 }
 
 bool PPExprParser::parse(const char* str)
diff --git a/src/jomlib/preprocessor.cpp b/src/jomlib/preprocessor.cpp
index f914a19..4fbec6c 100644
--- a/src/jomlib/preprocessor.cpp
+++ b/src/jomlib/preprocessor.cpp
@@ -381,7 +381,7 @@ int Preprocessor::evaluateExpression(const QString& expr)
     if (!m_expressionParser->parse(qPrintable(m_macroTable->expandMacros(expr)))) {
         QString msg = QLatin1String("Can't evaluate preprocessor expression.");
         msg += QLatin1String("\nerror: ");
-        msg += QString::fromAscii(m_expressionParser->errorMessage());
+        msg += QString::fromLatin1(m_expressionParser->errorMessage());
         msg += QLatin1String("\nexpression: ");
         msg += expr;
         error(msg);