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/qrenderpass.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/qrenderpass.cpp')
| -rw-r--r-- | src/render/frontend/qrenderpass.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/render/frontend/qrenderpass.cpp b/src/render/frontend/qrenderpass.cpp index 4fdcb71cf..eb6fc4d89 100644 --- a/src/render/frontend/qrenderpass.cpp +++ b/src/render/frontend/qrenderpass.cpp @@ -108,7 +108,7 @@ void QRenderPass::setShaderProgram(QShaderProgram *shaderProgram) if (d->m_shader != Q_NULLPTR && d->m_changeArbiter != Q_NULLPTR) { QScenePropertyChangePtr e(new QScenePropertyChange(NodeRemoved, this)); e->setPropertyName(QByteArrayLiteral("shaderProgram")); - e->setValue(QVariant::fromValue(d->m_shader->uuid())); + e->setValue(QVariant::fromValue(d->m_shader->id())); d->notifyObservers(e); } @@ -125,7 +125,7 @@ void QRenderPass::setShaderProgram(QShaderProgram *shaderProgram) if (d->m_changeArbiter != Q_NULLPTR) { QScenePropertyChangePtr e(new QScenePropertyChange(NodeAdded, this)); e->setPropertyName(QByteArrayLiteral("shaderProgram")); - e->setValue(QVariant::fromValue(shaderProgram->uuid())); + e->setValue(QVariant::fromValue(shaderProgram->id())); d->notifyObservers(e); } } @@ -153,7 +153,7 @@ void QRenderPass::addAnnotation(QAnnotation *annotation) if (d->m_changeArbiter != Q_NULLPTR) { QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, this)); change->setPropertyName(QByteArrayLiteral("annotation")); - change->setValue(QVariant::fromValue(annotation->uuid())); + change->setValue(QVariant::fromValue(annotation->id())); d->notifyObservers(change); } } @@ -165,7 +165,7 @@ void QRenderPass::removeAnnotation(QAnnotation *annotation) if (d->m_changeArbiter != Q_NULLPTR) { QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, this)); change->setPropertyName(QByteArrayLiteral("annotation")); - change->setValue(QVariant::fromValue(annotation->uuid())); + change->setValue(QVariant::fromValue(annotation->id())); d->notifyObservers(change); } d->m_annotationList.removeOne(annotation); @@ -201,7 +201,7 @@ void QRenderPass::removeBinding(QParameterMapping *binding) if (d->m_changeArbiter != Q_NULLPTR) { QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, this)); change->setPropertyName(QByteArrayLiteral("binding")); - change->setValue(QVariant::fromValue(binding->uuid())); + change->setValue(QVariant::fromValue(binding->id())); d->notifyObservers(change); } d->m_bindings.removeOne(binding); @@ -238,7 +238,7 @@ void QRenderPass::removeRenderState(QRenderState *state) if (d->m_changeArbiter != Q_NULLPTR) { QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, this)); change->setPropertyName(QByteArrayLiteral("renderState")); - change->setValue(QVariant::fromValue(state->uuid())); + change->setValue(QVariant::fromValue(state->id())); d->notifyObservers(change); } d->m_renderStates.removeOne(state); |