diff options
author | Kevin Ottens <kevin.ottens@kdab.com> | 2014-10-15 08:07:03 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2014-10-15 19:37:44 +0200 |
commit | a4b9ce44ae244104a941981405742ee42d53ebe0 (patch) | |
tree | cd66ef6dd859f1faf26874af62ab65830ce35a09 /src/render/frontend/qrenderattachment.cpp | |
parent | 8fe8aa479905b486959d956fb5637d825b8f3b4c (diff) |
Automate the NodeUpdated notifications
Now, each time a signal known to be the notification of a property
change is emitted, we notify the observers automatically. Properties
for which no NOTIFY has been provided are ignored.
This change also allowed to drop quite some redundant code in QNode
subclasses.
Change-Id: Ib4fbeb8311148a6b8789f19ebe437fc7d413a599
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/frontend/qrenderattachment.cpp')
-rw-r--r-- | src/render/frontend/qrenderattachment.cpp | 40 |
1 files changed, 1 insertions, 39 deletions
diff --git a/src/render/frontend/qrenderattachment.cpp b/src/render/frontend/qrenderattachment.cpp index f75bbc321..9070876d9 100644 --- a/src/render/frontend/qrenderattachment.cpp +++ b/src/render/frontend/qrenderattachment.cpp @@ -80,12 +80,6 @@ void QRenderAttachment::setType(QRenderAttachment::RenderAttachmentType type) if (type != d->m_type) { d->m_type = type; emit typeChanged(); - if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeUpdated, this)); - change->setPropertyName(QByteArrayLiteral("type")); - change->setValue(type); - d->notifyObservers(change); - } } } @@ -100,19 +94,11 @@ void QRenderAttachment::setTexture(QTexture *texture) Q_D(QRenderAttachment); if (texture != d->m_texture) { d->m_texture = texture; - emit textureChanged(); // Handle inline declaration if (!texture->parent()) texture->setParent(this); - - if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeUpdated, this)); - change->setPropertyName(QByteArrayLiteral("texture")); - // TO DO: Send a clone once Texture is a QNode subclass - change->setValue(QVariant::fromValue(texture)); - d->notifyObservers(change); - } + emit textureChanged(); } } @@ -128,12 +114,6 @@ void QRenderAttachment::setMipLevel(int level) if (d->m_mipLevel != level) { d->m_mipLevel = level; emit mipLevelChanged(); - if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeUpdated, this)); - change->setPropertyName(QByteArrayLiteral("mipLevel")); - change->setValue(level); - d->notifyObservers(change); - } } } @@ -149,12 +129,6 @@ void QRenderAttachment::setLayer(int layer) if (d->m_layer != layer) { d->m_layer = layer; emit layerChanged(); - if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeUpdated, this)); - change->setPropertyName(QByteArrayLiteral("layer")); - change->setValue(layer); - d->notifyObservers(change); - } } } @@ -170,12 +144,6 @@ void QRenderAttachment::setFace(QRenderAttachment::CubeMapFace face) if (d->m_face != face) { d->m_face = face; emit faceChanged(); - if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeUpdated, this)); - change->setPropertyName(QByteArrayLiteral("face")); - change->setValue(face); - d->notifyObservers(change); - } } } @@ -191,12 +159,6 @@ void QRenderAttachment::setName(const QString &name) if (d->m_name != name) { d->m_name = name; emit nameChanged(); - if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeUpdated, this)); - change->setPropertyName(QByteArrayLiteral("name")); - change->setValue(name); - d->notifyObservers(change); - } } } |