diff options
| author | Alan Alpert <416365416c@gmail.com> | 2013-09-10 00:38:55 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-10 19:51:37 +0200 |
| commit | d68e1bc83666a29bcec6c67af79ba7fca4757e80 (patch) | |
| tree | caf389f4c61a37d122ebcff18624b5ead4e4f929 /src/quick/scenegraph | |
| parent | 84e83e5ab553a22fccdc17e274fc1f7f89bdd4e1 (diff) | |
Add Q_UNUSED for reserved fields.
Prevents the following compiler errors with Clang
src/quick/scenegraph/coreapi/qsggeometry.h:183:10: error: private field
'm_reserved_bits' is not used [-Werror,-Wunused-private-field]
uint m_reserved_bits : 25;
^
src/quick/scenegraph/util/qsgsimplerectnode.h:66:11: error: private field
'reserved' is not used [-Werror,-Wunused-private-field]
void *reserved;
^
src/quick/items/qquickclipnode_p.h:66:10: error: private field 'm_reserved' is not
used [-Werror,-Wunused-private-field]
uint m_reserved : 31;
^
src/quick/scenegraph/coreapi/qsgmaterial.h:143:11: error: private field
'm_reserved' is not used [-Werror,-Wunused-private-field]
void *m_reserved;
^
src/quick/scenegraph/coreapi/qsgnode.h:267:10: error: private field 'm_reserved'
is not used [-Werror,-Wunused-private-field]
uint m_reserved : 31;
Change-Id: I0ea00fbd4b45156dedabfd16a3cb3e5f6170f2ff
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src/quick/scenegraph')
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsggeometry.cpp | 1 | ||||
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgmaterial.cpp | 2 | ||||
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgnode.cpp | 1 | ||||
| -rw-r--r-- | src/quick/scenegraph/util/qsgsimplerectnode.cpp | 1 |
4 files changed, 5 insertions, 0 deletions
diff --git a/src/quick/scenegraph/coreapi/qsggeometry.cpp b/src/quick/scenegraph/coreapi/qsggeometry.cpp index 7f09af4da3..ffb11fc6fa 100644 --- a/src/quick/scenegraph/coreapi/qsggeometry.cpp +++ b/src/quick/scenegraph/coreapi/qsggeometry.cpp @@ -406,6 +406,7 @@ QSGGeometry::QSGGeometry(const QSGGeometry::AttributeSet &attributes, , m_vertex_usage_pattern(AlwaysUploadPattern) , m_line_width(1.0) { + Q_UNUSED(m_reserved_bits); Q_ASSERT(m_attributes.count > 0); Q_ASSERT(m_attributes.stride > 0); diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.cpp b/src/quick/scenegraph/coreapi/qsgmaterial.cpp index 713469f94a..fab3287087 100644 --- a/src/quick/scenegraph/coreapi/qsgmaterial.cpp +++ b/src/quick/scenegraph/coreapi/qsgmaterial.cpp @@ -166,6 +166,7 @@ static bool qsg_leak_check = !qgetenv("QML_LEAK_CHECK").isEmpty(); */ QSGMaterialShader::QSGMaterialShader() { + Q_UNUSED(m_reserved); } /*! @@ -544,6 +545,7 @@ static void qt_print_material_count() QSGMaterial::QSGMaterial() : m_flags(0) { + Q_UNUSED(m_reserved); #ifndef QT_NO_DEBUG if (qsg_leak_check) { ++qt_material_count; diff --git a/src/quick/scenegraph/coreapi/qsgnode.cpp b/src/quick/scenegraph/coreapi/qsgnode.cpp index a55a5abb0a..9d3d08e057 100644 --- a/src/quick/scenegraph/coreapi/qsgnode.cpp +++ b/src/quick/scenegraph/coreapi/qsgnode.cpp @@ -1053,6 +1053,7 @@ void QSGGeometryNode::setInheritedOpacity(qreal opacity) QSGClipNode::QSGClipNode() : QSGBasicGeometryNode(ClipNodeType) { + Q_UNUSED(m_reserved); } diff --git a/src/quick/scenegraph/util/qsgsimplerectnode.cpp b/src/quick/scenegraph/util/qsgsimplerectnode.cpp index 1e77ef5b0c..55e5ee9e3b 100644 --- a/src/quick/scenegraph/util/qsgsimplerectnode.cpp +++ b/src/quick/scenegraph/util/qsgsimplerectnode.cpp @@ -61,6 +61,7 @@ QT_BEGIN_NAMESPACE QSGSimpleRectNode::QSGSimpleRectNode(const QRectF &rect, const QColor &color) : m_geometry(QSGGeometry::defaultAttributes_Point2D(), 4) { + Q_UNUSED(reserved); QSGGeometry::updateRectGeometry(&m_geometry, rect); m_material.setColor(color); setMaterial(&m_material); |