diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2014-12-18 19:02:39 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-12-19 10:19:51 +0100 |
| commit | 249d000f4954dbab5013b97e5d61c1bdeca44917 (patch) | |
| tree | 40e62b7db99a44cbcc440fe2b2ce211011db6b28 /src/render/frontend/qtechnique.cpp | |
| parent | b93d45a312e1fc40a7dede177e46412f4f0e84cd (diff) | |
Change uuid -> id as it really isn't universally unique any longer
Change-Id: If25d1f71dfff62009db1cd4f72a1b0725b4c6d14
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Diffstat (limited to 'src/render/frontend/qtechnique.cpp')
| -rw-r--r-- | src/render/frontend/qtechnique.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/render/frontend/qtechnique.cpp b/src/render/frontend/qtechnique.cpp index 222439541..7afb10243 100644 --- a/src/render/frontend/qtechnique.cpp +++ b/src/render/frontend/qtechnique.cpp @@ -116,7 +116,7 @@ void QTechnique::addAnnotation(QAnnotation *criterion) if (d->m_changeArbiter != Q_NULLPTR) { QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, this)); change->setPropertyName(QByteArrayLiteral("annotation")); - change->setValue(QVariant::fromValue(criterion->uuid())); + change->setValue(QVariant::fromValue(criterion->id())); d->notifyObservers(change); } } @@ -128,7 +128,7 @@ void QTechnique::removeAnnotation(QAnnotation *criterion) if (d->m_changeArbiter != Q_NULLPTR) { QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, this)); change->setPropertyName(QByteArrayLiteral("annotation")); - change->setValue(QVariant::fromValue(criterion->uuid())); + change->setValue(QVariant::fromValue(criterion->id())); d->notifyObservers(change); } d->m_annotationList.removeOne(criterion); @@ -156,7 +156,7 @@ void QTechnique::addParameter(QParameter *parameter) if (d->m_changeArbiter != Q_NULLPTR) { QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, this)); change->setPropertyName(QByteArrayLiteral("parameter")); - change->setValue(QVariant::fromValue(parameter->uuid())); + change->setValue(QVariant::fromValue(parameter->id())); d->notifyObservers(change); } } @@ -169,7 +169,7 @@ void QTechnique::removeParameter(QParameter *parameter) if (d->m_changeArbiter != Q_NULLPTR) { QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, this)); change->setPropertyName(QByteArrayLiteral("parameter")); - change->setValue(QVariant::fromValue(parameter->uuid())); + change->setValue(QVariant::fromValue(parameter->id())); d->notifyObservers(change); } d->m_parameters.removeOne(parameter); @@ -196,7 +196,7 @@ void QTechnique::addPass(QRenderPass *pass) if (d->m_changeArbiter != Q_NULLPTR) { QScenePropertyChangePtr e(new QScenePropertyChange(NodeAdded, this)); e->setPropertyName(QByteArrayLiteral("pass")); - e->setValue(QVariant::fromValue(pass->uuid())); + e->setValue(QVariant::fromValue(pass->id())); d->notifyObservers(e); } } @@ -205,7 +205,7 @@ void QTechnique::addPass(QRenderPass *pass) /*! * Removes a \a pass from the technique. This posts a ComponentRemoved * QScenePropertyChange notification to the QChangeArbiter with the value - * being the \a pass' uuid and the property name being "pass". + * being the \a pass' id and the property name being "pass". */ void QTechnique::removePass(QRenderPass *pass) { @@ -213,7 +213,7 @@ void QTechnique::removePass(QRenderPass *pass) if (d->m_changeArbiter) { QScenePropertyChangePtr e(new QScenePropertyChange(NodeRemoved, this)); e->setPropertyName(QByteArrayLiteral("pass")); - e->setValue(QVariant::fromValue(pass->uuid())); + e->setValue(QVariant::fromValue(pass->id())); d->notifyObservers(e); } d->m_renderPasses.removeOne(pass); |