QtQml: Fix const correctness in old style casts

Found with GCC's -Wcast-qual.

Change-Id: Ia0aac2f09e9245339951ffff13c958364a2e9859
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

4 files changed, 17 insertions, 17 deletions

diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index ba6f5a3b79..2dbdcfc526 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -1447,7 +1447,7 @@ QV4::ReturnedValue QV4::ExecutionEngine::fromVariant(const QVariant &variant)
         QV4::Scope scope(this);
         if (type == qMetaTypeId<QQmlListReference>()) {
             typedef QQmlListReferencePrivate QDLRP;
-            QDLRP *p = QDLRP::get((QQmlListReference*)ptr);
+            QDLRP *p = QDLRP::get((QQmlListReference*)const_cast<void *>(ptr));
             if (p->object) {
                 return QV4::QmlListWrapper::create(scope.engine, p->property, p->propertyType);
             } else {
@@ -1459,7 +1459,7 @@ QV4::ReturnedValue QV4::ExecutionEngine::fromVariant(const QVariant &variant)
         } else if (type == qMetaTypeId<QList<QObject *> >()) {
             // XXX Can this be made more by using Array as a prototype and implementing
             // directly against QList<QObject*>?
-            const QList<QObject *> &list = *(QList<QObject *>*)ptr;
+            const QList<QObject *> &list = *(const QList<QObject *>*)ptr;
             QV4::ScopedArrayObject a(scope, newArrayObject());
             a->arrayReserve(list.count());
             QV4::ScopedValue v(scope);
diff --git a/src/qml/jsruntime/qv4serialize.cpp b/src/qml/jsruntime/qv4serialize.cpp
index e669924d4a..31d85df13e 100644
--- a/src/qml/jsruntime/qv4serialize.cpp
+++ b/src/qml/jsruntime/qv4serialize.cpp
@@ -116,21 +116,21 @@ static inline void reserve(QByteArray &data, int extra)
 
 static inline quint32 popUint32(const char *&data)
 {
-    quint32 rv = *((quint32 *)data);
+    quint32 rv = *((const quint32 *)data);
     data += sizeof(quint32);
     return rv;
 }
 
 static inline double popDouble(const char *&data)
 {
-    double rv = *((double *)data);
+    double rv = *((const double *)data);
     data += sizeof(double);
     return rv;
 }
 
 static inline void *popPtr(const char *&data)
 {
-    void *rv = *((void **)data);
+    void *rv = *((void *const *)data);
     data += sizeof(void *);
     return rv;
 }
@@ -297,7 +297,7 @@ ReturnedValue Serialize::deserialize(const char *&data, ExecutionEngine *engine)
     case WorkerString:
     {
         quint32 size = headersize(header);
-        QString qstr((QChar *)data, size);
+        QString qstr((const QChar *)data, size);
         data += ALIGN(size * sizeof(quint16));
         return QV4::Encode(engine->newString(qstr));
     }
@@ -342,7 +342,7 @@ ReturnedValue Serialize::deserialize(const char *&data, ExecutionEngine *engine)
     {
         quint32 flags = headersize(header);
         quint32 length = popUint32(data);
-        QString pattern = QString((QChar *)data, length - 1);
+        QString pattern = QString((const QChar *)data, length - 1);
         data += ALIGN(length * sizeof(quint16));
         return Encode(engine->newRegExpObject(pattern, flags));
     }
diff --git a/src/qml/jsruntime/qv4typedarray.cpp b/src/qml/jsruntime/qv4typedarray.cpp
index c355207d94..19e541dba8 100644
--- a/src/qml/jsruntime/qv4typedarray.cpp
+++ b/src/qml/jsruntime/qv4typedarray.cpp
@@ -106,7 +106,7 @@ void UInt8ClampedArrayWrite(ExecutionEngine *e, char *data, int index, const Val
 
 ReturnedValue Int16ArrayRead(const char *data, int index)
 {
-    return Encode((int)*(short *)(data + index));
+    return Encode((int)*(const short *)(data + index));
 }
 
 void Int16ArrayWrite(ExecutionEngine *e, char *data, int index, const Value &value)
@@ -119,7 +119,7 @@ void Int16ArrayWrite(ExecutionEngine *e, char *data, int index, const Value &val
 
 ReturnedValue UInt16ArrayRead(const char *data, int index)
 {
-    return Encode((int)*(unsigned short *)(data + index));
+    return Encode((int)*(const unsigned short *)(data + index));
 }
 
 void UInt16ArrayWrite(ExecutionEngine *e, char *data, int index, const Value &value)
@@ -132,7 +132,7 @@ void UInt16ArrayWrite(ExecutionEngine *e, char *data, int index, const Value &va
 
 ReturnedValue Int32ArrayRead(const char *data, int index)
 {
-    return Encode(*(int *)(data + index));
+    return Encode(*(const int *)(data + index));
 }
 
 void Int32ArrayWrite(ExecutionEngine *e, char *data, int index, const Value &value)
@@ -145,7 +145,7 @@ void Int32ArrayWrite(ExecutionEngine *e, char *data, int index, const Value &val
 
 ReturnedValue UInt32ArrayRead(const char *data, int index)
 {
-    return Encode(*(unsigned int *)(data + index));
+    return Encode(*(const unsigned int *)(data + index));
 }
 
 void UInt32ArrayWrite(ExecutionEngine *e, char *data, int index, const Value &value)
@@ -158,7 +158,7 @@ void UInt32ArrayWrite(ExecutionEngine *e, char *data, int index, const Value &va
 
 ReturnedValue Float32ArrayRead(const char *data, int index)
 {
-    return Encode(*(float *)(data + index));
+    return Encode(*(const float *)(data + index));
 }
 
 void Float32ArrayWrite(ExecutionEngine *e, char *data, int index, const Value &value)
@@ -171,7 +171,7 @@ void Float32ArrayWrite(ExecutionEngine *e, char *data, int index, const Value &v
 
 ReturnedValue Float64ArrayRead(const char *data, int index)
 {
-    return Encode(*(double *)(data + index));
+    return Encode(*(const double *)(data + index));
 }
 
 void Float64ArrayWrite(ExecutionEngine *e, char *data, int index, const Value &value)
diff --git a/src/qml/jsruntime/qv4vme_moth.cpp b/src/qml/jsruntime/qv4vme_moth.cpp
index dda5848f0b..390bbf5ee3 100644
--- a/src/qml/jsruntime/qv4vme_moth.cpp
+++ b/src/qml/jsruntime/qv4vme_moth.cpp
@@ -593,7 +593,7 @@ QV4::ReturnedValue VME::run(ExecutionEngine *engine, const uchar *code
     MOTH_END_INSTR(CallGlobalLookup)
 
     MOTH_BEGIN_INSTR(SetExceptionHandler)
-        exceptionHandler = instr.offset ? ((uchar *)&instr.offset) + instr.offset : 0;
+        exceptionHandler = instr.offset ? ((const uchar *)&instr.offset) + instr.offset : 0;
     MOTH_END_INSTR(SetExceptionHandler)
 
     MOTH_BEGIN_INSTR(CallBuiltinThrow)
@@ -727,21 +727,21 @@ QV4::ReturnedValue VME::run(ExecutionEngine *engine, const uchar *code
     MOTH_END_INSTR(ConstructGlobalLookup)
 
     MOTH_BEGIN_INSTR(Jump)
-        code = ((uchar *)&instr.offset) + instr.offset;
+        code = ((const uchar *)&instr.offset) + instr.offset;
     MOTH_END_INSTR(Jump)
 
     MOTH_BEGIN_INSTR(JumpEq)
         bool cond = VALUEPTR(instr.condition)->toBoolean();
         TRACE(condition, "%s", cond ? "TRUE" : "FALSE");
         if (cond)
-            code = ((uchar *)&instr.offset) + instr.offset;
+            code = ((const uchar *)&instr.offset) + instr.offset;
     MOTH_END_INSTR(JumpEq)
 
     MOTH_BEGIN_INSTR(JumpNe)
         bool cond = VALUEPTR(instr.condition)->toBoolean();
         TRACE(condition, "%s", cond ? "TRUE" : "FALSE");
         if (!cond)
-            code = ((uchar *)&instr.offset) + instr.offset;
+            code = ((const uchar *)&instr.offset) + instr.offset;
     MOTH_END_INSTR(JumpNe)
 
     MOTH_BEGIN_INSTR(UNot)