From 0e15154c9f0d982096a551efc53fd363d2b2f68d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Tue, 8 Dec 2015 11:50:37 +0200 Subject: Added parameters to signals and made setters Q_SLOTS Change-Id: Icec2f9f207221e35ffdeeb594bb9b4dc6ef890f1 Task-number: QTBUG-49797 Reviewed-by: Paul Lemire --- src/render/geometry/qgeometryrenderer.h | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'src/render/geometry/qgeometryrenderer.h') diff --git a/src/render/geometry/qgeometryrenderer.h b/src/render/geometry/qgeometryrenderer.h index 4898b15bc..e58b648b3 100644 --- a/src/render/geometry/qgeometryrenderer.h +++ b/src/render/geometry/qgeometryrenderer.h @@ -93,8 +93,11 @@ public: bool primitiveRestart() const; QGeometry *geometry() const; PrimitiveType primitiveType() const; + QGeometryFunctorPtr geometryFunctor() const; + void setGeometryFunctor(const QGeometryFunctorPtr &functor); +public Q_SLOTS: void setInstanceCount(int instanceCount); void setPrimitiveCount(int primitiveCount); void setBaseVertex(int baseVertex); @@ -103,17 +106,16 @@ public: void setPrimitiveRestart(bool enabled); void setGeometry(QGeometry *geometry); void setPrimitiveType(PrimitiveType primitiveType); - void setGeometryFunctor(const QGeometryFunctorPtr &functor); Q_SIGNALS: - void instanceCountChanged(); - void primitiveCountChanged(); - void baseVertexChanged(); - void baseInstanceChanged(); - void restartIndexChanged(); - void primitiveRestartChanged(); - void geometryChanged(); - void primitiveTypeChanged(); + void instanceCountChanged(int instanceCount); + void primitiveCountChanged(int primitiveCount); + void baseVertexChanged(int baseVertex); + void baseInstanceChanged(int baseInstance); + void restartIndexChanged(int restartIndex); + void primitiveRestartChanged(bool primitiveRestart); + void geometryChanged(QGeometry *geometry); + void primitiveTypeChanged(PrimitiveType primitiveType); protected: QGeometryRenderer(QGeometryRendererPrivate &dd, Qt3DCore::QNode *parent = 0); -- cgit v1.2.3