diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-03-07 16:21:19 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-07-10 01:30:18 +0000 |
| commit | 4b4a2545cf8ad3e063a2ae922d193479366a9fa0 (patch) | |
| tree | c7618a2b9f1897542ea3b4fa69a6baf24debfe28 /src | |
| parent | c0c8c483182e035e1fbdad593ce2f033a710f0c3 (diff) | |
QtDeclarative: fix const correctness in old-style casts
Found by GCC's -Wcast-qual.
Change-Id: Ia0aac2f09e9245339951ffff13c95df89028fe1c
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qbitfield_p.h | 11 | ||||
| -rw-r--r-- | src/imports/shaders/scenegraph/qsggeometry.h | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/declarative/qml/qbitfield_p.h b/src/declarative/qml/qbitfield_p.h index 5a11de38..20f474ad 100644 --- a/src/declarative/qml/qbitfield_p.h +++ b/src/declarative/qml/qbitfield_p.h @@ -128,15 +128,16 @@ QBitField QBitField::united(const QBitField &o) rv.bits = max; rv.ownData = new quint32[length + 1]; *(rv.ownData) = 1; - rv.data = rv.ownData + 1; + quint32 *rvdata; + rv.data = rvdata = rv.ownData + 1; if (bits > o.bits) { - ::memcpy((quint32 *)rv.data, data, length * sizeof(quint32)); + ::memcpy(rvdata, data, length * sizeof(quint32)); for (quint32 ii = 0; ii < (o.bits + quint32(31)) / 32; ++ii) - ((quint32 *)rv.data)[ii] |= o.data[ii]; + rvdata[ii] |= o.data[ii]; } else { - ::memcpy((quint32 *)rv.data, o.data, length * sizeof(quint32)); + ::memcpy(rvdata, o.data, length * sizeof(quint32)); for (quint32 ii = 0; ii < (bits + quint32(31)) / 32; ++ii) - ((quint32 *)rv.data)[ii] |= data[ii]; + rvdata[ii] |= data[ii]; } return rv; } diff --git a/src/imports/shaders/scenegraph/qsggeometry.h b/src/imports/shaders/scenegraph/qsggeometry.h index f61489c9..53c61674 100644 --- a/src/imports/shaders/scenegraph/qsggeometry.h +++ b/src/imports/shaders/scenegraph/qsggeometry.h @@ -136,13 +136,13 @@ inline quint16 *QSGGeometry::indexDataAsUShort() inline const uint *QSGGeometry::indexDataAsUInt() const { Q_ASSERT(m_index_type == GL_UNSIGNED_INT); - return (uint *) indexData(); + return (const uint *) indexData(); } inline const quint16 *QSGGeometry::indexDataAsUShort() const { Q_ASSERT(m_index_type == GL_UNSIGNED_SHORT); - return (quint16 *) indexData(); + return (const quint16 *) indexData(); } inline QSGGeometry::Point2D *QSGGeometry::vertexDataAsPoint2D() |