diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2016-05-10 12:45:08 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-10 19:09:26 +0000 |
commit | 8cb8811e1ff4beda5c54f826eec150f3864f397b (patch) | |
tree | 5d5506c5edecf2c8a0306dd5476696094a174870 /src/render/materialsystem | |
parent | daa14a660276da4e2b82483d15eb0a929bef9857 (diff) |
QNodePropertyChange -> QPropertyUpdatedChange
Task-number: QTBUG-51494
Change-Id: Ic326499f80b5a91b2d19c09770de926f220cc805
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/materialsystem')
-rw-r--r-- | src/render/materialsystem/effect.cpp | 2 | ||||
-rw-r--r-- | src/render/materialsystem/filterkey.cpp | 4 | ||||
-rw-r--r-- | src/render/materialsystem/material.cpp | 4 | ||||
-rw-r--r-- | src/render/materialsystem/parameter.cpp | 4 | ||||
-rw-r--r-- | src/render/materialsystem/qeffect.cpp | 2 | ||||
-rw-r--r-- | src/render/materialsystem/qfilterkey.cpp | 2 | ||||
-rw-r--r-- | src/render/materialsystem/qmaterial.cpp | 2 | ||||
-rw-r--r-- | src/render/materialsystem/qparameter.cpp | 2 | ||||
-rw-r--r-- | src/render/materialsystem/qrenderpass.cpp | 2 | ||||
-rw-r--r-- | src/render/materialsystem/qshaderprogram.cpp | 2 | ||||
-rw-r--r-- | src/render/materialsystem/qtechnique.cpp | 4 | ||||
-rw-r--r-- | src/render/materialsystem/renderpass.cpp | 2 | ||||
-rw-r--r-- | src/render/materialsystem/shader.cpp | 4 | ||||
-rw-r--r-- | src/render/materialsystem/shaderdata.cpp | 4 | ||||
-rw-r--r-- | src/render/materialsystem/technique.cpp | 4 |
15 files changed, 22 insertions, 22 deletions
diff --git a/src/render/materialsystem/effect.cpp b/src/render/materialsystem/effect.cpp index 01df33f14..141652855 100644 --- a/src/render/materialsystem/effect.cpp +++ b/src/render/materialsystem/effect.cpp @@ -43,7 +43,7 @@ #include <Qt3DRender/qparameter.h> #include <Qt3DRender/private/qeffect_p.h> -#include <Qt3DCore/qnodepropertychange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qnodeaddedpropertychange.h> #include <Qt3DCore/qnoderemovedpropertychange.h> diff --git a/src/render/materialsystem/filterkey.cpp b/src/render/materialsystem/filterkey.cpp index 83e039a82..db139f1fe 100644 --- a/src/render/materialsystem/filterkey.cpp +++ b/src/render/materialsystem/filterkey.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "filterkey_p.h" -#include <Qt3DCore/qnodepropertychange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/private/qfilterkey_p.h> QT_BEGIN_NAMESPACE @@ -84,7 +84,7 @@ void FilterKey::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { switch (e->type()) { case PropertyUpdated: { - QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); + QPropertyUpdatedChangePtr propertyChange = qSharedPointerCast<QPropertyUpdatedChange>(e); if (propertyChange->propertyName() == QByteArrayLiteral("value")) m_value = propertyChange->value(); else if (propertyChange->propertyName() == QByteArrayLiteral("name")) diff --git a/src/render/materialsystem/material.cpp b/src/render/materialsystem/material.cpp index 82296c277..bb959f507 100644 --- a/src/render/materialsystem/material.cpp +++ b/src/render/materialsystem/material.cpp @@ -47,7 +47,7 @@ #include "qeffect.h" #include <Qt3DRender/private/qmaterial_p.h> -#include <Qt3DCore/qnodepropertychange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qnodeaddedpropertychange.h> #include <Qt3DCore/qnoderemovedpropertychange.h> @@ -87,7 +87,7 @@ void Material::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) switch (e->type()) { case PropertyUpdated: { - const auto change = qSharedPointerCast<QNodePropertyChange>(e); + const auto change = qSharedPointerCast<QPropertyUpdatedChange>(e); if (change->propertyName() == QByteArrayLiteral("effect")) m_effectUuid = change->value().value<QNodeId>(); break; diff --git a/src/render/materialsystem/parameter.cpp b/src/render/materialsystem/parameter.cpp index 1ac1c565b..0f0a747ce 100644 --- a/src/render/materialsystem/parameter.cpp +++ b/src/render/materialsystem/parameter.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "parameter_p.h" -#include <Qt3DCore/qnodepropertychange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/qparameter.h> #include <Qt3DRender/private/qparameter_p.h> #include <Qt3DRender/qtexture.h> @@ -73,7 +73,7 @@ void Parameter::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &ch void Parameter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { - QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e); + QPropertyUpdatedChangePtr propertyChange = qSharedPointerCast<QPropertyUpdatedChange>(e); if (e->type() == PropertyUpdated) { if (propertyChange->propertyName() == QByteArrayLiteral("name")) { diff --git a/src/render/materialsystem/qeffect.cpp b/src/render/materialsystem/qeffect.cpp index 53fe4f4e6..249889c10 100644 --- a/src/render/materialsystem/qeffect.cpp +++ b/src/render/materialsystem/qeffect.cpp @@ -42,7 +42,7 @@ #include "qtechnique.h" #include "qparameter.h" -#include <Qt3DCore/qnodepropertychange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qnodeaddedpropertychange.h> #include <Qt3DCore/qnoderemovedpropertychange.h> diff --git a/src/render/materialsystem/qfilterkey.cpp b/src/render/materialsystem/qfilterkey.cpp index 135dc9c46..5a75f9efc 100644 --- a/src/render/materialsystem/qfilterkey.cpp +++ b/src/render/materialsystem/qfilterkey.cpp @@ -40,7 +40,7 @@ #include "qfilterkey.h" #include "qfilterkey_p.h" #include <private/qnode_p.h> -#include <Qt3DCore/qnodepropertychange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/qmaterial.cpp b/src/render/materialsystem/qmaterial.cpp index cb8cd2bbe..c9fb322d3 100644 --- a/src/render/materialsystem/qmaterial.cpp +++ b/src/render/materialsystem/qmaterial.cpp @@ -43,7 +43,7 @@ #include "qeffect.h" #include <Qt3DRender/private/renderlogging_p.h> #include "qparameter.h" -#include <Qt3DCore/qnodepropertychange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qnodeaddedpropertychange.h> #include <Qt3DCore/qnoderemovedpropertychange.h> diff --git a/src/render/materialsystem/qparameter.cpp b/src/render/materialsystem/qparameter.cpp index fda8e922e..332bd98a1 100644 --- a/src/render/materialsystem/qparameter.cpp +++ b/src/render/materialsystem/qparameter.cpp @@ -40,7 +40,7 @@ #include "qparameter.h" #include "qparameter_p.h" #include <Qt3DRender/private/renderlogging_p.h> -#include <Qt3DCore/qnodepropertychange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/qtexture.h> QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/qrenderpass.cpp b/src/render/materialsystem/qrenderpass.cpp index 411e52e1b..d907fb781 100644 --- a/src/render/materialsystem/qrenderpass.cpp +++ b/src/render/materialsystem/qrenderpass.cpp @@ -43,7 +43,7 @@ #include "qparameter.h" #include "qfilterkey.h" #include "qrenderstate.h" -#include <Qt3DCore/qnodepropertychange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qnodeaddedpropertychange.h> #include <Qt3DCore/qnoderemovedpropertychange.h> #include <Qt3DCore/private/qnode_p.h> diff --git a/src/render/materialsystem/qshaderprogram.cpp b/src/render/materialsystem/qshaderprogram.cpp index 4c7d99e15..75ca03c78 100644 --- a/src/render/materialsystem/qshaderprogram.cpp +++ b/src/render/materialsystem/qshaderprogram.cpp @@ -39,7 +39,7 @@ #include "qshaderprogram.h" #include "qshaderprogram_p.h" -#include <Qt3DCore/qnodepropertychange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DRender/private/qurlhelper_p.h> #include <QDebug> #include <QFile> diff --git a/src/render/materialsystem/qtechnique.cpp b/src/render/materialsystem/qtechnique.cpp index 410807ffb..920771b7a 100644 --- a/src/render/materialsystem/qtechnique.cpp +++ b/src/render/materialsystem/qtechnique.cpp @@ -41,7 +41,7 @@ #include "qtechnique_p.h" #include "qparameter.h" #include "qgraphicsapifilter.h" -#include <Qt3DCore/qnodepropertychange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qnodeaddedpropertychange.h> #include <Qt3DCore/qnoderemovedpropertychange.h> @@ -78,7 +78,7 @@ QTechnique::QTechnique(QTechniquePrivate &dd, QNode *parent) void QTechniquePrivate::_q_graphicsApiFilterChanged() { if (m_changeArbiter != nullptr) { - QNodePropertyChangePtr change(new QNodePropertyChange(m_id)); + QPropertyUpdatedChangePtr change(new QPropertyUpdatedChange(m_id)); change->setPropertyName("graphicsApiFilterData"); change->setValue(QVariant::fromValue(QGraphicsApiFilterPrivate::get(const_cast<QGraphicsApiFilter *>(&m_graphicsApiFilter))->m_data)); notifyObservers(change); diff --git a/src/render/materialsystem/renderpass.cpp b/src/render/materialsystem/renderpass.cpp index adae7d9af..32c5f9a60 100644 --- a/src/render/materialsystem/renderpass.cpp +++ b/src/render/materialsystem/renderpass.cpp @@ -48,7 +48,7 @@ #include <Qt3DRender/private/renderstates_p.h> #include <Qt3DRender/private/renderstateset_p.h> -#include <Qt3DCore/qnodepropertychange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qnodeaddedpropertychange.h> #include <Qt3DCore/qnoderemovedpropertychange.h> diff --git a/src/render/materialsystem/shader.cpp b/src/render/materialsystem/shader.cpp index 4a59578d6..67c9a0da6 100644 --- a/src/render/materialsystem/shader.cpp +++ b/src/render/materialsystem/shader.cpp @@ -49,7 +49,7 @@ #include <Qt3DRender/private/graphicscontext_p.h> #include <Qt3DRender/private/qshaderprogram_p.h> #include <Qt3DRender/private/stringtoint_p.h> -#include <Qt3DCore/qnodepropertychange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE @@ -141,7 +141,7 @@ QVector<QByteArray> Shader::shaderCode() const void Shader::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { if (e->type() == PropertyUpdated) { - QNodePropertyChangePtr propertyChange = e.staticCast<QNodePropertyChange>(); + QPropertyUpdatedChangePtr propertyChange = e.staticCast<QPropertyUpdatedChange>(); QVariant propertyValue = propertyChange->value(); if (propertyChange->propertyName() == QByteArrayLiteral("vertexSourceCode")) { diff --git a/src/render/materialsystem/shaderdata.cpp b/src/render/materialsystem/shaderdata.cpp index cb8497db9..ee7893e7c 100644 --- a/src/render/materialsystem/shaderdata.cpp +++ b/src/render/materialsystem/shaderdata.cpp @@ -43,7 +43,7 @@ #include <QMetaProperty> #include <QMetaObject> #include <Qt3DCore/qdynamicpropertyupdatedchange.h> -#include <Qt3DCore/qnodepropertychange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> #include <private/graphicscontext_p.h> #include <private/qbackendnode_p.h> #include <private/glbuffer_p.h> @@ -319,7 +319,7 @@ void ShaderData::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) QString propertyName; QVariant propertyValue; - if (auto propertyChange = qSharedPointerDynamicCast<QNodePropertyChange>(e)) { + if (auto propertyChange = qSharedPointerDynamicCast<QPropertyUpdatedChange>(e)) { propertyName = QString::fromLatin1(propertyChange->propertyName()); propertyValue = m_propertyReader->readProperty(propertyChange->value()); } else if (auto propertyChange = qSharedPointerDynamicCast<QDynamicPropertyUpdatedChange>(e)) { diff --git a/src/render/materialsystem/technique.cpp b/src/render/materialsystem/technique.cpp index ed9523e9a..c887f11a7 100644 --- a/src/render/materialsystem/technique.cpp +++ b/src/render/materialsystem/technique.cpp @@ -48,7 +48,7 @@ #include <Qt3DRender/private/qtechnique_p.h> #include <Qt3DRender/private/shader_p.h> #include <Qt3DCore/private/qchangearbiter_p.h> -#include <Qt3DCore/qnodepropertychange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qnodeaddedpropertychange.h> #include <Qt3DCore/qnoderemovedpropertychange.h> @@ -94,7 +94,7 @@ void Technique::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { switch (e->type()) { case PropertyUpdated: { - const auto change = qSharedPointerCast<QNodePropertyChange>(e); + const auto change = qSharedPointerCast<QPropertyUpdatedChange>(e); if (change->propertyName() == QByteArrayLiteral("graphicsApiFilterData")) { GraphicsApiFilterData filterData = change->value().value<GraphicsApiFilterData>(); m_graphicsApiFilterData = filterData; |