diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2015-02-23 08:35:05 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2015-02-28 16:28:43 +0000 |
commit | a563b09776cbb1151d804b07c48b3028a1807efd (patch) | |
tree | 8962fd34ca18c79396b21a7c5cb9771694dde716 /src/render/frontend/qrenderpass.cpp | |
parent | 7ccaf0f9a917f49e1cde551c2a4f4dcff575406c (diff) |
Fix: remove QByteArrayLiteral used when setting SceneChange property names
This was probably forgotten when the property name was changed fron QByteArray
to char *.
Change-Id: Idd6a988703a241519b3aba7b1d127adae5e1375e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/frontend/qrenderpass.cpp')
-rw-r--r-- | src/render/frontend/qrenderpass.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/render/frontend/qrenderpass.cpp b/src/render/frontend/qrenderpass.cpp index bd4e95ac1..89f831f0b 100644 --- a/src/render/frontend/qrenderpass.cpp +++ b/src/render/frontend/qrenderpass.cpp @@ -102,7 +102,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->setPropertyName("shaderProgram"); e->setValue(QVariant::fromValue(d->m_shader->id())); d->notifyObservers(e); } @@ -119,7 +119,7 @@ void QRenderPass::setShaderProgram(QShaderProgram *shaderProgram) if (d->m_changeArbiter != Q_NULLPTR) { QScenePropertyChangePtr e(new QScenePropertyChange(NodeAdded, this)); - e->setPropertyName(QByteArrayLiteral("shaderProgram")); + e->setPropertyName("shaderProgram"); e->setValue(QVariant::fromValue(shaderProgram->id())); d->notifyObservers(e); } @@ -147,7 +147,7 @@ void QRenderPass::addAnnotation(QAnnotation *annotation) if (d->m_changeArbiter != Q_NULLPTR) { QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, this)); - change->setPropertyName(QByteArrayLiteral("annotation")); + change->setPropertyName("annotation"); change->setValue(QVariant::fromValue(annotation->id())); d->notifyObservers(change); } @@ -159,7 +159,7 @@ void QRenderPass::removeAnnotation(QAnnotation *annotation) Q_D(QRenderPass); if (d->m_changeArbiter != Q_NULLPTR) { QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, this)); - change->setPropertyName(QByteArrayLiteral("annotation")); + change->setPropertyName("annotation"); change->setValue(QVariant::fromValue(annotation->id())); d->notifyObservers(change); } @@ -183,7 +183,7 @@ void QRenderPass::addBinding(QParameterMapping *binding) if (d->m_changeArbiter != Q_NULLPTR) { QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, this)); - change->setPropertyName(QByteArrayLiteral("binding")); + change->setPropertyName("binding"); change->setValue(QVariant::fromValue(QNode::clone(binding))); d->notifyObservers(change); } @@ -195,7 +195,7 @@ void QRenderPass::removeBinding(QParameterMapping *binding) Q_D(QRenderPass); if (d->m_changeArbiter != Q_NULLPTR) { QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, this)); - change->setPropertyName(QByteArrayLiteral("binding")); + change->setPropertyName("binding"); change->setValue(QVariant::fromValue(binding->id())); d->notifyObservers(change); } @@ -220,7 +220,7 @@ void QRenderPass::addRenderState(QRenderState *state) if (d->m_changeArbiter != Q_NULLPTR) { QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, this)); - change->setPropertyName(QByteArrayLiteral("renderState")); + change->setPropertyName("renderState"); change->setValue(QVariant::fromValue(QNode::clone(state))); d->notifyObservers(change); } @@ -232,7 +232,7 @@ void QRenderPass::removeRenderState(QRenderState *state) Q_D(QRenderPass); if (d->m_changeArbiter != Q_NULLPTR) { QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, this)); - change->setPropertyName(QByteArrayLiteral("renderState")); + change->setPropertyName("renderState"); change->setValue(QVariant::fromValue(state->id())); d->notifyObservers(change); } |