summaryrefslogtreecommitdiffstats
path: root/src/render/materialsystem/qparameter.h
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@theqtcompany.com>2015-12-08 11:50:37 +0200
committerTomi Korpipää <tomi.korpipaa@theqtcompany.com>2015-12-09 05:18:19 +0000
commit0e15154c9f0d982096a551efc53fd363d2b2f68d (patch)
tree4917ca73c44a92297db7cc3dbd72d2716481ccc7 /src/render/materialsystem/qparameter.h
parent036ea9fcfdd343c805e1a900528e7a2367d6c373 (diff)
Added parameters to signals and made setters Q_SLOTS
Change-Id: Icec2f9f207221e35ffdeeb594bb9b4dc6ef890f1 Task-number: QTBUG-49797 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/materialsystem/qparameter.h')
-rw-r--r--src/render/materialsystem/qparameter.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/render/materialsystem/qparameter.h b/src/render/materialsystem/qparameter.h
index 5278829c6..94b0f2889 100644
--- a/src/render/materialsystem/qparameter.h
+++ b/src/render/materialsystem/qparameter.h
@@ -57,22 +57,24 @@ class QT3DRENDERSHARED_EXPORT QParameter : public Qt3DCore::QNode
public:
explicit QParameter(Qt3DCore::QNode *parent = 0);
~QParameter();
- QParameter(const QString& name, const QVariant& value, Qt3DCore::QNode* parent = 0);
+ QParameter(const QString &name, const QVariant& value, Qt3DCore::QNode *parent = 0);
QParameter(const QString &name, QAbstractTextureProvider *texture, Qt3DCore::QNode *parent = 0);
- void setName(const QString &name);
QString name() const;
/**
* @brief setDefaultValue - for non-texture uniform parameters
* @param dv
*/
- void setValue(const QVariant& dv);
QVariant value() const;
+public Q_SLOTS:
+ void setName(const QString &name);
+ void setValue(const QVariant &dv);
+
Q_SIGNALS:
- void valueChanged();
- void nameChanged();
+ void valueChanged(const QVariant &value);
+ void nameChanged(const QString &name);
protected:
QParameter(QParameterPrivate &dd, Qt3DCore::QNode *parent = 0);