QtQuick: Fix const correctness in old style casts

Found with GCC's -Wcast-qual.

Change-Id: Ia0aac2f09e9245339951ffff13c9589afabc7ade
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

diff --git a/src/quick/items/qquickshadereffectnode.cpp b/src/quick/items/qquickshadereffectnode.cpp
index 6415c0ad2296413920bda730ea917b3519d978a3..de6cae0ea6f4e0006a3d881fdf03e0675556d5fc 100644 (file)
--- a/src/quick/items/qquickshadereffectnode.cpp
+++ b/src/quick/items/qquickshadereffectnode.cpp
@@ -341,7 +341,7 @@ bool QQuickShaderEffectMaterialKey::operator != (const QQuickShaderEffectMateria
 
 uint qHash(const QQuickShaderEffectMaterialKey &key)
 {
-    uint hash = qHash((void *)key.className);
+    uint hash = qHash((const void *)key.className);
     typedef QQuickShaderEffectMaterialKey Key;
     for (int shaderType = 0; shaderType < Key::ShaderTypeCount; ++shaderType)
         hash = hash * 31337 + qHash(key.sourceCode[shaderType]);

diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
index 886e6146207f7f18eb47f0a77172b8b3d64fd1eb..63938d50a94479eeac970699d0406778c9076d49 100644 (file)
--- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
@@ -1693,8 +1693,8 @@ void Renderer::uploadMergedElement(Element *e, int vaOffset, char **vertexData,
     if (((const QMatrix4x4_Accessor &) localx).flagBits == 1) {
         for (int i=0; i<vCount; ++i) {
             Pt *p = (Pt *) vdata;
-            p->x += ((QMatrix4x4_Accessor &) localx).m[3][0];
-            p->y += ((QMatrix4x4_Accessor &) localx).m[3][1];
+            p->x += ((const QMatrix4x4_Accessor &) localx).m[3][0];
+            p->y += ((const QMatrix4x4_Accessor &) localx).m[3][1];
             vdata += vSize;
         }
     } else if (((const QMatrix4x4_Accessor &) localx).flagBits > 1) {
@@ -1935,11 +1935,11 @@ void Renderer::uploadBatch(Batch *b)
                         if (attr.isVertexCoordinate)
                             dump << "* ";
                         for (int t=0; t<attr.tupleSize; ++t)
-                            dump << *(float *)(vd + offset + t * sizeof(float)) << " ";
+                            dump << *(const float *)(vd + offset + t * sizeof(float)) << " ";
                     } else if (attr.type == GL_UNSIGNED_BYTE) {
                         dump << "ubyte ";
                         for (int t=0; t<attr.tupleSize; ++t)
-                            dump << *(unsigned char *)(vd + offset + t * sizeof(unsigned char)) << " ";
+                            dump << *(const unsigned char *)(vd + offset + t * sizeof(unsigned char)) << " ";
                     }
                     dump << ") ";
                     offset += attr.tupleSize * size_of_type(attr.type);

diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h b/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
index 8996d5a092db45598e09add9378fec1a6c95d444..f87dd75c8c422d82b955d8ae8572a94290a192ac 100644 (file)
--- a/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
@@ -85,7 +85,12 @@ public:
         for (int i=0; i<PageSize; ++i) blocks[i] = i;
     }
 
-    Type *at(uint index) const
+    const Type *at(uint index) const
+    {
+        return (Type *) &data[index * sizeof(Type)];
+    }
+
+    Type *at(uint index)
     {
         return (Type *) &data[index * sizeof(Type)];
     }

diff --git a/src/quick/scenegraph/coreapi/qsgnode.cpp b/src/quick/scenegraph/coreapi/qsgnode.cpp
index e52713e8042d94d760fc36f0e4c0cf12a4174286..71f4f62db9c02a465f36b8e297b42d4633ad743a 100644 (file)
--- a/src/quick/scenegraph/coreapi/qsgnode.cpp
+++ b/src/quick/scenegraph/coreapi/qsgnode.cpp
@@ -1457,7 +1457,7 @@ QDebug operator<<(QDebug d, const QSGGeometryNode *n)
         d << "Geometry(null)";
         return d;
     }
-    d << "GeometryNode(" << hex << (void *) n << dec;
+    d << "GeometryNode(" << hex << (const void *) n << dec;
 
     const QSGGeometry *g = n->geometry();
 
@@ -1508,7 +1508,7 @@ QDebug operator<<(QDebug d, const QSGClipNode *n)
         d << "ClipNode(null)";
         return d;
     }
-    d << "ClipNode(" << hex << (void *) n << dec;
+    d << "ClipNode(" << hex << (const void *) n << dec;
 
     if (n->childCount())
         d << "children=" << n->childCount();
@@ -1531,7 +1531,7 @@ QDebug operator<<(QDebug d, const QSGTransformNode *n)
     }
     const QMatrix4x4 m = n->matrix();
     d << "TransformNode(";
-    d << hex << (void *) n << dec;
+    d << hex << (const void *) n << dec;
     if (m.isIdentity())
         d << "identity";
     else if (m.determinant() == 1 && m(0, 0) == 1 && m(1, 1) == 1 && m(2, 2) == 1)
@@ -1553,7 +1553,7 @@ QDebug operator<<(QDebug d, const QSGOpacityNode *n)
         return d;
     }
     d << "OpacityNode(";
-    d << hex << (void *) n << dec;
+    d << hex << (const void *) n << dec;
     d << "opacity=" << n->opacity()
       << "combined=" << n->combinedOpacity()
       << (n->isSubtreeBlocked() ? "*BLOCKED*" : "");
@@ -1571,7 +1571,7 @@ QDebug operator<<(QDebug d, const QSGRootNode *n)
         d << "RootNode(null)";
         return d;
     }
-    d << "RootNode" << hex << (void *) n << (n->isSubtreeBlocked() ? "*BLOCKED*" : "");
+    d << "RootNode" << hex << (const void *) n << (n->isSubtreeBlocked() ? "*BLOCKED*" : "");
 #ifdef QSG_RUNTIME_DESCRIPTION
     d << QSGNodePrivate::description(n);
 #endif
@@ -1604,7 +1604,7 @@ QDebug operator<<(QDebug d, const QSGNode *n)
         d << static_cast<const QSGOpacityNode *>(n);
         break;
     case QSGNode::RenderNodeType:
-        d << "RenderNode(" << hex << (void *) n << dec
+        d << "RenderNode(" << hex << (const void *) n << dec
           << "flags=" << (int) n->flags() << dec
           << (n->isSubtreeBlocked() ? "*BLOCKED*" : "");
 #ifdef QSG_RUNTIME_DESCRIPTION
@@ -1613,7 +1613,7 @@ QDebug operator<<(QDebug d, const QSGNode *n)
         d << ')';
         break;
     default:
-        d << "Node(" << hex << (void *) n << dec
+        d << "Node(" << hex << (const void *) n << dec
           << "flags=" << (int) n->flags() << dec
           << (n->isSubtreeBlocked() ? "*BLOCKED*" : "");
 #ifdef QSG_RUNTIME_DESCRIPTION

diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp
index dd071d757ed9d092e8c01572ed6b04d96d71ae6c..418d571ae66de90b2cefd50c9fa69e47d0d5673c 100644 (file)
--- a/src/quick/scenegraph/qsgcontext.cpp
+++ b/src/quick/scenegraph/qsgcontext.cpp
@@ -315,11 +315,11 @@ QSGContext::QSGContext(QObject *parent) :
 
     // Adds compatibility with Qt 5.3 and earlier's QSG_RENDER_TIMING
     if (qEnvironmentVariableIsSet("QSG_RENDER_TIMING")) {
-        ((QLoggingCategory &) QSG_LOG_TIME_GLYPH()).setEnabled(QtDebugMsg, true);
-        ((QLoggingCategory &) QSG_LOG_TIME_TEXTURE()).setEnabled(QtDebugMsg, true);
-        ((QLoggingCategory &) QSG_LOG_TIME_RENDERER()).setEnabled(QtDebugMsg, true);
-        ((QLoggingCategory &) QSG_LOG_TIME_RENDERLOOP()).setEnabled(QtDebugMsg, true);
-        ((QLoggingCategory &) QSG_LOG_TIME_COMPILATION()).setEnabled(QtDebugMsg, true);
+        const_cast<QLoggingCategory &>(QSG_LOG_TIME_GLYPH()).setEnabled(QtDebugMsg, true);
+        const_cast<QLoggingCategory &>(QSG_LOG_TIME_TEXTURE()).setEnabled(QtDebugMsg, true);
+        const_cast<QLoggingCategory &>(QSG_LOG_TIME_RENDERER()).setEnabled(QtDebugMsg, true);
+        const_cast<QLoggingCategory &>(QSG_LOG_TIME_RENDERLOOP()).setEnabled(QtDebugMsg, true);
+        const_cast<QLoggingCategory &>(QSG_LOG_TIME_COMPILATION()).setEnabled(QtDebugMsg, true);
     }
 }
 

diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp
index b7a6475c231bdc5b389059509b6cdc238556c26d..781e82fbc4d040bde4ec02bbe6c42ecde85084fe 100644 (file)
--- a/src/quick/scenegraph/qsgrenderloop.cpp
+++ b/src/quick/scenegraph/qsgrenderloop.cpp
@@ -152,7 +152,7 @@ QSGRenderLoop *QSGRenderLoop::instance()
 
         // For compatibility with 5.3 and earlier's QSG_INFO environment variables
         if (qEnvironmentVariableIsSet("QSG_INFO"))
-            ((QLoggingCategory &) QSG_LOG_INFO()).setEnabled(QtDebugMsg, true);
+            const_cast<QLoggingCategory &>(QSG_LOG_INFO()).setEnabled(QtDebugMsg, true);
 
         s_instance = QSGContext::createWindowManager();
 

diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp
index a39d734de394a150707ce777c29d77b736e91702..3a0c19e3d20f5f6503888b356683f1667fb5ae8f 100644 (file)
--- a/src/quick/util/qquickanimation.cpp
+++ b/src/quick/util/qquickanimation.cpp
@@ -867,7 +867,7 @@ void QActionAnimation::updateState(State newState, State oldState)
 
 void QActionAnimation::debugAnimation(QDebug d) const
 {
-    d << "ActionAnimation(" << hex << (void *) this << dec << ")";
+    d << "ActionAnimation(" << hex << (const void *) this << dec << ")";
 
     if (animAction) {
         int indentLevel = 1;
@@ -1960,7 +1960,7 @@ void QQuickBulkValueAnimator::topLevelAnimationLoopChanged()
 
 void QQuickBulkValueAnimator::debugAnimation(QDebug d) const
 {
-    d << "BulkValueAnimation(" << hex << (void *) this << dec << ")" << "duration:" << duration();
+    d << "BulkValueAnimation(" << hex << (const void *) this << dec << ")" << "duration:" << duration();
 
     if (animValue) {
         int indentLevel = 1;

diff --git a/src/quick/util/qquicksmoothedanimation.cpp b/src/quick/util/qquicksmoothedanimation.cpp
index 71dacfcb1d472beba2bc174789999e717329da92..6d585d38a7d25edb48d5d99378ae691665695e9a 100644 (file)
--- a/src/quick/util/qquicksmoothedanimation.cpp
+++ b/src/quick/util/qquicksmoothedanimation.cpp
@@ -307,7 +307,7 @@ void QSmoothedAnimation::init()
 
 void QSmoothedAnimation::debugAnimation(QDebug d) const
 {
-    d << "SmoothedAnimationJob(" << hex << (void *) this << dec << ")" << "duration:" << userDuration
+    d << "SmoothedAnimationJob(" << hex << (const void *) this << dec << ")" << "duration:" << userDuration
       << "velocity:" << velocity << "target:" << target.object() << "property:" << target.name()
       << "to:" << to << "current velocity:" << trackVelocity;
 }

diff --git a/src/quick/util/qquickspringanimation.cpp b/src/quick/util/qquickspringanimation.cpp
index b68afbecdde03be815e87d47594360e0086e0683..125d6f5ef620a7feee03b022a087cb6e001872f7 100644 (file)
--- a/src/quick/util/qquickspringanimation.cpp
+++ b/src/quick/util/qquickspringanimation.cpp
@@ -313,7 +313,7 @@ void QSpringAnimation::updateState(QAbstractAnimationJob::State newState, QAbstr
 
 void QSpringAnimation::debugAnimation(QDebug d) const
 {
-    d << "SpringAnimationJob(" << hex << (void *) this << dec << ")" << "velocity:" << maxVelocity
+    d << "SpringAnimationJob(" << hex << (const void *) this << dec << ")" << "velocity:" << maxVelocity
       << "spring:" << spring << "damping:" << damping << "epsilon:" << epsilon << "modulus:" << modulus
       << "mass:" << mass << "target:" << target.object() << "property:" << target.name()
       << "to:" << to << "current velocity:" << velocity;

diff --git a/src/quick/util/qquicktimeline.cpp b/src/quick/util/qquicktimeline.cpp
index 8cd9b349d80e3aebf833fcf2626d8c77b1be9179..74754a0bfbd7a6dd036685a6f37f8a8aaa6de97e 100644 (file)
--- a/src/quick/util/qquicktimeline.cpp
+++ b/src/quick/util/qquicktimeline.cpp
@@ -717,7 +717,7 @@ void QQuickTimeLine::updateCurrentTime(int v)
 
 void QQuickTimeLine::debugAnimation(QDebug d) const
 {
-    d << "QuickTimeLine(" << hex << (void *) this << dec << ")";
+    d << "QuickTimeLine(" << hex << (const void *) this << dec << ")";
 }
 
 bool operator<(const QPair<int, Update> &lhs,