diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2013-08-05 22:12:40 -0700 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-06 18:14:53 +0200 |
commit | 503a45b2c1167c47594aab2d1442465aa521cccb (patch) | |
tree | f0249b8a3a98491cdea9349a19fbc6cde3defa44 /src | |
parent | 65d08c6d214c59c380cce0d88f0de02254afa06d (diff) |
Remove C-style casts from public headers.
Task-number: QTBUG-32735
Change-Id: I14c313d17b80dce1826290ddd634f449b315190e
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/quick/scenegraph/coreapi/qsggeometry.h | 24 | ||||
-rw-r--r-- | src/quick/scenegraph/util/qsgtexturematerial.h | 8 |
2 files changed, 16 insertions, 16 deletions
diff --git a/src/quick/scenegraph/coreapi/qsggeometry.h b/src/quick/scenegraph/coreapi/qsggeometry.h index 78ad03e411..f1d8c875b6 100644 --- a/src/quick/scenegraph/coreapi/qsggeometry.h +++ b/src/quick/scenegraph/coreapi/qsggeometry.h @@ -151,10 +151,10 @@ public: static void updateTexturedRectGeometry(QSGGeometry *g, const QRectF &rect, const QRectF &sourceRect); void setIndexDataPattern(DataPattern p); - DataPattern indexDataPattern() const { return (DataPattern) m_index_usage_pattern; } + DataPattern indexDataPattern() const { return DataPattern(m_index_usage_pattern); } void setVertexDataPattern(DataPattern p); - DataPattern vertexDataPattern() const { return (DataPattern) m_vertex_usage_pattern; } + DataPattern vertexDataPattern() const { return DataPattern(m_vertex_usage_pattern); } void markIndexDataDirty(); void markVertexDataDirty(); @@ -190,25 +190,25 @@ private: inline uint *QSGGeometry::indexDataAsUInt() { Q_ASSERT(m_index_type == GL_UNSIGNED_INT); - return (uint *) indexData(); + return static_cast<uint *>(indexData()); } inline quint16 *QSGGeometry::indexDataAsUShort() { Q_ASSERT(m_index_type == GL_UNSIGNED_SHORT); - return (quint16 *) indexData(); + return static_cast<quint16 *>(indexData()); } inline const uint *QSGGeometry::indexDataAsUInt() const { Q_ASSERT(m_index_type == GL_UNSIGNED_INT); - return (uint *) indexData(); + return static_cast<const uint *>(indexData()); } inline const quint16 *QSGGeometry::indexDataAsUShort() const { Q_ASSERT(m_index_type == GL_UNSIGNED_SHORT); - return (quint16 *) indexData(); + return static_cast<const quint16 *>(indexData()); } inline QSGGeometry::Point2D *QSGGeometry::vertexDataAsPoint2D() @@ -218,7 +218,7 @@ inline QSGGeometry::Point2D *QSGGeometry::vertexDataAsPoint2D() Q_ASSERT(m_attributes.attributes[0].tupleSize == 2); Q_ASSERT(m_attributes.attributes[0].type == GL_FLOAT); Q_ASSERT(m_attributes.attributes[0].position == 0); - return (Point2D *) m_data; + return static_cast<Point2D *>(m_data); } inline QSGGeometry::TexturedPoint2D *QSGGeometry::vertexDataAsTexturedPoint2D() @@ -231,7 +231,7 @@ inline QSGGeometry::TexturedPoint2D *QSGGeometry::vertexDataAsTexturedPoint2D() Q_ASSERT(m_attributes.attributes[1].position == 1); Q_ASSERT(m_attributes.attributes[1].tupleSize == 2); Q_ASSERT(m_attributes.attributes[1].type == GL_FLOAT); - return (TexturedPoint2D *) m_data; + return static_cast<TexturedPoint2D *>(m_data); } inline QSGGeometry::ColoredPoint2D *QSGGeometry::vertexDataAsColoredPoint2D() @@ -244,7 +244,7 @@ inline QSGGeometry::ColoredPoint2D *QSGGeometry::vertexDataAsColoredPoint2D() Q_ASSERT(m_attributes.attributes[1].position == 1); Q_ASSERT(m_attributes.attributes[1].tupleSize == 4); Q_ASSERT(m_attributes.attributes[1].type == GL_UNSIGNED_BYTE); - return (ColoredPoint2D *) m_data; + return static_cast<ColoredPoint2D *>(m_data); } inline const QSGGeometry::Point2D *QSGGeometry::vertexDataAsPoint2D() const @@ -254,7 +254,7 @@ inline const QSGGeometry::Point2D *QSGGeometry::vertexDataAsPoint2D() const Q_ASSERT(m_attributes.attributes[0].tupleSize == 2); Q_ASSERT(m_attributes.attributes[0].type == GL_FLOAT); Q_ASSERT(m_attributes.attributes[0].position == 0); - return (const Point2D *) m_data; + return static_cast<const Point2D *>(m_data); } inline const QSGGeometry::TexturedPoint2D *QSGGeometry::vertexDataAsTexturedPoint2D() const @@ -267,7 +267,7 @@ inline const QSGGeometry::TexturedPoint2D *QSGGeometry::vertexDataAsTexturedPoin Q_ASSERT(m_attributes.attributes[1].position == 1); Q_ASSERT(m_attributes.attributes[1].tupleSize == 2); Q_ASSERT(m_attributes.attributes[1].type == GL_FLOAT); - return (const TexturedPoint2D *) m_data; + return static_cast<const TexturedPoint2D *>(m_data); } inline const QSGGeometry::ColoredPoint2D *QSGGeometry::vertexDataAsColoredPoint2D() const @@ -280,7 +280,7 @@ inline const QSGGeometry::ColoredPoint2D *QSGGeometry::vertexDataAsColoredPoint2 Q_ASSERT(m_attributes.attributes[1].position == 1); Q_ASSERT(m_attributes.attributes[1].tupleSize == 4); Q_ASSERT(m_attributes.attributes[1].type == GL_UNSIGNED_BYTE); - return (const ColoredPoint2D *) m_data; + return static_cast<const ColoredPoint2D *>(m_data); } int QSGGeometry::sizeOfIndex() const diff --git a/src/quick/scenegraph/util/qsgtexturematerial.h b/src/quick/scenegraph/util/qsgtexturematerial.h index b842779716..ff7933ec54 100644 --- a/src/quick/scenegraph/util/qsgtexturematerial.h +++ b/src/quick/scenegraph/util/qsgtexturematerial.h @@ -60,16 +60,16 @@ public: QSGTexture *texture() const { return m_texture; } void setMipmapFiltering(QSGTexture::Filtering filteringType) { m_mipmap_filtering = filteringType; } - QSGTexture::Filtering mipmapFiltering() const { return (QSGTexture::Filtering) m_mipmap_filtering; } + QSGTexture::Filtering mipmapFiltering() const { return QSGTexture::Filtering(m_mipmap_filtering); } void setFiltering(QSGTexture::Filtering filteringType) { m_filtering = filteringType; } - QSGTexture::Filtering filtering() const { return (QSGTexture::Filtering) m_filtering; } + QSGTexture::Filtering filtering() const { return QSGTexture::Filtering(m_filtering); } void setHorizontalWrapMode(QSGTexture::WrapMode mode) { m_horizontal_wrap = mode; } - QSGTexture::WrapMode horizontalWrapMode() const { return (QSGTexture::WrapMode) m_horizontal_wrap; } + QSGTexture::WrapMode horizontalWrapMode() const { return QSGTexture::WrapMode(m_horizontal_wrap); } void setVerticalWrapMode(QSGTexture::WrapMode mode) { m_vertical_wrap = mode; } - QSGTexture::WrapMode verticalWrapMode() const { return (QSGTexture::WrapMode) m_vertical_wrap; } + QSGTexture::WrapMode verticalWrapMode() const { return QSGTexture::WrapMode(m_vertical_wrap); } protected: QSGTexture *m_texture; |