summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2015-02-23 08:35:05 +0100
committerSean Harmer <sean.harmer@kdab.com>2015-02-28 16:28:43 +0000
commita563b09776cbb1151d804b07c48b3028a1807efd (patch)
tree8962fd34ca18c79396b21a7c5cb9771694dde716 /src
parent7ccaf0f9a917f49e1cde551c2a4f4dcff575406c (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')
-rw-r--r--src/core/nodes/qcomponent.cpp4
-rw-r--r--src/core/nodes/qentity.cpp4
-rw-r--r--src/core/nodes/qnode.cpp4
-rw-r--r--src/input/keyboardinput.cpp4
-rw-r--r--src/render/backend/renderscene.cpp4
-rw-r--r--src/render/frontend/framegraph-components/qrenderpassfilter.cpp4
-rw-r--r--src/render/frontend/framegraph-components/qsortmethod.cpp4
-rw-r--r--src/render/frontend/framegraph-components/qtechniquefilter.cpp4
-rw-r--r--src/render/frontend/qabstractmesh.cpp2
-rw-r--r--src/render/frontend/qabstracttextureimage.cpp2
-rw-r--r--src/render/frontend/qabstracttextureprovider.cpp10
-rw-r--r--src/render/frontend/qeffect.cpp8
-rw-r--r--src/render/frontend/qmaterial.cpp8
-rw-r--r--src/render/frontend/qparameter.cpp2
-rw-r--r--src/render/frontend/qrenderpass.cpp16
-rw-r--r--src/render/frontend/qrendertarget.cpp4
-rw-r--r--src/render/frontend/qtechnique.cpp14
17 files changed, 49 insertions, 49 deletions
diff --git a/src/core/nodes/qcomponent.cpp b/src/core/nodes/qcomponent.cpp
index e684bdb10..a05b9980b 100644
--- a/src/core/nodes/qcomponent.cpp
+++ b/src/core/nodes/qcomponent.cpp
@@ -60,7 +60,7 @@ void QComponentPrivate::addEntity(QEntity *entity)
if (m_changeArbiter != Q_NULLPTR) {
Q_Q(QComponent);
QScenePropertyChangePtr e(new QScenePropertyChange(ComponentAdded, q));
- e->setPropertyName(QByteArrayLiteral("entity"));
+ e->setPropertyName("entity");
e->setValue(QVariant::fromValue(entity->id()));
notifyObservers(e);
}
@@ -72,7 +72,7 @@ void QComponentPrivate::removeEntity(QEntity *entity)
if (m_changeArbiter != Q_NULLPTR) {
Q_Q(QComponent);
QScenePropertyChangePtr e(new QScenePropertyChange(ComponentRemoved, q));
- e->setPropertyName(QByteArrayLiteral("entity"));
+ e->setPropertyName("entity");
e->setValue(QVariant::fromValue(entity->id()));
notifyObservers(e);
}
diff --git a/src/core/nodes/qentity.cpp b/src/core/nodes/qentity.cpp
index e679cbdd8..a0f980b5a 100644
--- a/src/core/nodes/qentity.cpp
+++ b/src/core/nodes/qentity.cpp
@@ -118,7 +118,7 @@ void QEntity::addComponent(QComponent *comp)
// to know which type of component it was and its properties to create
// the backend object
QScenePropertyChangePtr propertyChange(new QScenePropertyChange(ComponentAdded, this));
- propertyChange->setPropertyName(QByteArrayLiteral("component"));
+ propertyChange->setPropertyName("component");
propertyChange->setValue(QVariant::fromValue(QNodePtr(QNode::clone(comp), &QNodePrivate::nodePtrDeleter)));
d->notifyObservers(propertyChange);
}
@@ -139,7 +139,7 @@ void QEntity::removeComponent(QComponent *comp)
// fail in the case of large scenes.
QScenePropertyChangePtr propertyChange(new QScenePropertyChange(ComponentRemoved, this));
propertyChange->setValue(QVariant::fromValue(comp->id()));
- propertyChange->setPropertyName(QByteArrayLiteral("componentId"));
+ propertyChange->setPropertyName("componentId");
d->notifyObservers(propertyChange);
}
diff --git a/src/core/nodes/qnode.cpp b/src/core/nodes/qnode.cpp
index 1ac3655bc..c4b6088e6 100644
--- a/src/core/nodes/qnode.cpp
+++ b/src/core/nodes/qnode.cpp
@@ -84,7 +84,7 @@ void QNodePrivate::addChild(QNode *childNode)
if (m_changeArbiter != Q_NULLPTR) {
Q_Q(QNode);
QScenePropertyChangePtr e(new QScenePropertyChange(NodeCreated, q));
- e->setPropertyName(QByteArrayLiteral("node"));
+ e->setPropertyName("node");
// We need to clone the parent of the childNode we send
QNode *parentClone = QNode::clone(q_func());
QNode *childClone = Q_NULLPTR;
@@ -111,7 +111,7 @@ void QNodePrivate::removeChild(QNode *childNode)
if (m_changeArbiter != Q_NULLPTR) {
Q_Q(QNode);
QScenePropertyChangePtr e(new QScenePropertyChange(NodeAboutToBeDeleted, q));
- e->setPropertyName(QByteArrayLiteral("node"));
+ e->setPropertyName("node");
// We need to clone the parent of the childNode we send
// QNode *parentClone = QNode::clone(childNode->parentNode());
// QNode *childClone = Q_NULLPTR;
diff --git a/src/input/keyboardinput.cpp b/src/input/keyboardinput.cpp
index ef82edf90..23edf1a89 100644
--- a/src/input/keyboardinput.cpp
+++ b/src/input/keyboardinput.cpp
@@ -85,7 +85,7 @@ void KeyboardInput::setFocus(bool focus)
m_focus = focus;
QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(NodeUpdated, this));
e->setTargetNode(peerUuid());
- e->setPropertyName(QByteArrayLiteral("focus"));
+ e->setPropertyName("focus");
e->setValue(m_focus);
notifyObservers(e);
}
@@ -95,7 +95,7 @@ void KeyboardInput::keyEvent(const Q3DKeyEventPtr &event)
{
QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(NodeUpdated, this));
e->setTargetNode(peerUuid());
- e->setPropertyName(QByteArrayLiteral("event"));
+ e->setPropertyName("event");
e->setValue(QVariant::fromValue(event));
notifyObservers(e);
}
diff --git a/src/render/backend/renderscene.cpp b/src/render/backend/renderscene.cpp
index b9769f32b..cf2ebb718 100644
--- a/src/render/backend/renderscene.cpp
+++ b/src/render/backend/renderscene.cpp
@@ -79,14 +79,14 @@ QUrl RenderScene::source() const
void RenderScene::setSceneSubtree(QEntity *subTree)
{
QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(NodeUpdated, this));
- e->setPropertyName(QByteArrayLiteral("scene"));
+ e->setPropertyName("scene");
// The Frontend element has to perform the clone
// So that the objects are created in the main thread
e->setValue(QVariant::fromValue(subTree));
e->setTargetNode(peerUuid());
notifyObservers(e);
QBackendScenePropertyChangePtr e2(new QBackendScenePropertyChange(NodeUpdated, this));
- e2->setPropertyName(QByteArrayLiteral("status"));
+ e2->setPropertyName("status");
e2->setValue(subTree != Q_NULLPTR ? QAbstractSceneLoader::Loaded : QAbstractSceneLoader::Error);
e2->setTargetNode(peerUuid());
notifyObservers(e2);
diff --git a/src/render/frontend/framegraph-components/qrenderpassfilter.cpp b/src/render/frontend/framegraph-components/qrenderpassfilter.cpp
index 3b9e7a507..5e50706d2 100644
--- a/src/render/frontend/framegraph-components/qrenderpassfilter.cpp
+++ b/src/render/frontend/framegraph-components/qrenderpassfilter.cpp
@@ -74,7 +74,7 @@ void QRenderPassFilter::addInclude(QAnnotation *annotation)
if (d->m_changeArbiter != Q_NULLPTR) {
QScenePropertyChangePtr propertyChange(new QScenePropertyChange(NodeAdded, this));
- propertyChange->setPropertyName(QByteArrayLiteral("include"));
+ propertyChange->setPropertyName("include");
propertyChange->setValue(QVariant::fromValue(annotation));
d->notifyObservers(propertyChange);
}
@@ -86,7 +86,7 @@ void QRenderPassFilter::removeInclude(QAnnotation *annotation)
Q_D(QRenderPassFilter);
if (d->m_changeArbiter != Q_NULLPTR) {
QScenePropertyChangePtr propertyChange(new QScenePropertyChange(NodeRemoved, this));
- propertyChange->setPropertyName(QByteArrayLiteral("include"));
+ propertyChange->setPropertyName("include");
propertyChange->setValue(QVariant::fromValue(annotation));
d->notifyObservers(propertyChange);
}
diff --git a/src/render/frontend/framegraph-components/qsortmethod.cpp b/src/render/frontend/framegraph-components/qsortmethod.cpp
index a553e9ef0..04eb3b3ce 100644
--- a/src/render/frontend/framegraph-components/qsortmethod.cpp
+++ b/src/render/frontend/framegraph-components/qsortmethod.cpp
@@ -78,7 +78,7 @@ void QSortMethod::addCriterion(QSortCriterion *criterion)
if (d->m_changeArbiter != Q_NULLPTR) {
QScenePropertyChangePtr propertyChange(new QScenePropertyChange(NodeAdded, this));
- propertyChange->setPropertyName(QByteArrayLiteral("sortCriterion"));
+ propertyChange->setPropertyName("sortCriterion");
propertyChange->setValue(QVariant::fromValue(criterion));
d->notifyObservers(propertyChange);
}
@@ -90,7 +90,7 @@ void QSortMethod::removeCriterion(QSortCriterion *criterion)
Q_D(QSortMethod);
if (d->m_changeArbiter != Q_NULLPTR) {
QScenePropertyChangePtr propertyChange(new QScenePropertyChange(NodeRemoved, this));
- propertyChange->setPropertyName(QByteArrayLiteral("sortCriterion"));
+ propertyChange->setPropertyName("sortCriterion");
propertyChange->setValue(QVariant::fromValue(criterion));
d->notifyObservers(propertyChange);
}
diff --git a/src/render/frontend/framegraph-components/qtechniquefilter.cpp b/src/render/frontend/framegraph-components/qtechniquefilter.cpp
index f11e75085..ee7507810 100644
--- a/src/render/frontend/framegraph-components/qtechniquefilter.cpp
+++ b/src/render/frontend/framegraph-components/qtechniquefilter.cpp
@@ -89,7 +89,7 @@ void QTechniqueFilter::addRequirement(QAnnotation *criterion)
if (d->m_changeArbiter != Q_NULLPTR) {
QScenePropertyChangePtr propertyChange(new QScenePropertyChange(NodeAdded, this));
- propertyChange->setPropertyName(QByteArrayLiteral("require"));
+ propertyChange->setPropertyName("require");
propertyChange->setValue(QVariant::fromValue(criterion));
d->notifyObservers(propertyChange);
}
@@ -100,7 +100,7 @@ void QTechniqueFilter::removeRequirement(QAnnotation *criterion)
Q_D(QTechniqueFilter);
if (d->m_changeArbiter != Q_NULLPTR) {
QScenePropertyChangePtr propertyChange(new QScenePropertyChange(NodeRemoved, this));
- propertyChange->setPropertyName(QByteArrayLiteral("require"));
+ propertyChange->setPropertyName("require");
propertyChange->setValue(QVariant::fromValue(criterion->id()));
d->notifyObservers(propertyChange);
}
diff --git a/src/render/frontend/qabstractmesh.cpp b/src/render/frontend/qabstractmesh.cpp
index 649d29a11..f88e6c42b 100644
--- a/src/render/frontend/qabstractmesh.cpp
+++ b/src/render/frontend/qabstractmesh.cpp
@@ -83,7 +83,7 @@ void QAbstractMesh::update()
Q_D(QAbstractMesh);
if (d->m_changeArbiter != Q_NULLPTR) {
QScenePropertyChangePtr change(new QScenePropertyChange(NodeUpdated, this));
- change->setPropertyName(QByteArrayLiteral("meshFunctor"));
+ change->setPropertyName("meshFunctor");
change->setValue(QVariant::fromValue(meshFunctor()));
d->notifyObservers(change);
// TO DO see if we can clear the d->m_dirty on request.
diff --git a/src/render/frontend/qabstracttextureimage.cpp b/src/render/frontend/qabstracttextureimage.cpp
index 548c19fa0..229e324d0 100644
--- a/src/render/frontend/qabstracttextureimage.cpp
+++ b/src/render/frontend/qabstracttextureimage.cpp
@@ -147,7 +147,7 @@ void QAbstractTextureImage::update()
Q_D(QAbstractTextureImage);
if (d->m_changeArbiter != Q_NULLPTR) {
QScenePropertyChangePtr change(new QScenePropertyChange(NodeUpdated, this));
- change->setPropertyName(QByteArrayLiteral("dataFunctor"));
+ change->setPropertyName("dataFunctor");
change->setValue(QVariant::fromValue(dataFunctor()));
d->notifyObservers(change);
}
diff --git a/src/render/frontend/qabstracttextureprovider.cpp b/src/render/frontend/qabstracttextureprovider.cpp
index c5fa78f8f..087c5ed61 100644
--- a/src/render/frontend/qabstracttextureprovider.cpp
+++ b/src/render/frontend/qabstracttextureprovider.cpp
@@ -289,7 +289,7 @@ void QAbstractTextureProvider::addTextureImage(QAbstractTextureImage *textureIma
if (d->m_changeArbiter != Q_NULLPTR) {
QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, this));
- change->setPropertyName(QByteArrayLiteral("textureImage"));
+ change->setPropertyName("textureImage");
change->setValue(QVariant::fromValue(textureImage->id()));
d->notifyObservers(change);
}
@@ -304,7 +304,7 @@ void QAbstractTextureProvider::removeTextureImage(QAbstractTextureImage *texture
Q_D(QAbstractTextureProvider);
if (d->m_changeArbiter != Q_NULLPTR) {
QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, this));
- change->setPropertyName(QByteArrayLiteral("textureImage"));
+ change->setPropertyName("textureImage");
change->setValue(QVariant::fromValue(textureImage->id()));
d->notifyObservers(change);
}
@@ -392,21 +392,21 @@ void QAbstractTextureProvider::setWrapMode(const QTextureWrapMode &wrapMode)
if (d->m_wrapMode.x() != wrapMode.x()) {
d->m_wrapMode.setX(wrapMode.x());
QScenePropertyChangePtr e(new QScenePropertyChange(NodeUpdated, this));
- e->setPropertyName(QByteArrayLiteral("wrapModeX"));
+ e->setPropertyName("wrapModeX");
e->setValue(static_cast<int>(d->m_wrapMode.x()));
d->notifyObservers(e);
}
if (d->m_wrapMode.y() != wrapMode.y()) {
d->m_wrapMode.setY(wrapMode.y());
QScenePropertyChangePtr e(new QScenePropertyChange(NodeUpdated, this));
- e->setPropertyName(QByteArrayLiteral("wrapModeY"));
+ e->setPropertyName("wrapModeY");
e->setValue(static_cast<int>(d->m_wrapMode.y()));
d->notifyObservers(e);
}
if (d->m_wrapMode.z() != wrapMode.z()) {
d->m_wrapMode.setZ(wrapMode.z());
QScenePropertyChangePtr e(new QScenePropertyChange(NodeUpdated, this));
- e->setPropertyName(QByteArrayLiteral("wrapModeZ"));
+ e->setPropertyName("wrapModeZ");
e->setValue(static_cast<int>(d->m_wrapMode.z()));
d->notifyObservers(e);
}
diff --git a/src/render/frontend/qeffect.cpp b/src/render/frontend/qeffect.cpp
index 8438f1c3a..781173c73 100644
--- a/src/render/frontend/qeffect.cpp
+++ b/src/render/frontend/qeffect.cpp
@@ -85,7 +85,7 @@ void QEffect::addParameter(QParameter *parameter)
if (d->m_changeArbiter != Q_NULLPTR) {
QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, this));
- change->setPropertyName(QByteArrayLiteral("parameter"));
+ change->setPropertyName("parameter");
change->setValue(QVariant::fromValue(parameter->id()));
d->notifyObservers(change);
}
@@ -98,7 +98,7 @@ void QEffect::removeParameter(QParameter *parameter)
if (d->m_changeArbiter != Q_NULLPTR) {
QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, this));
- change->setPropertyName(QByteArrayLiteral("parameter"));
+ change->setPropertyName("parameter");
change->setValue(QVariant::fromValue(parameter->id()));
d->notifyObservers(change);
}
@@ -132,7 +132,7 @@ void QEffect::addTechnique(QTechnique *t)
if (d->m_changeArbiter != Q_NULLPTR) {
QScenePropertyChangePtr e(new QScenePropertyChange(NodeAdded, this));
- e->setPropertyName(QByteArrayLiteral("technique"));
+ e->setPropertyName("technique");
e->setValue(QVariant::fromValue(t->id()));
d->notifyObservers(e);
}
@@ -149,7 +149,7 @@ void QEffect::removeTechnique(QTechnique *t)
Q_D(QEffect);
if (d->m_changeArbiter != Q_NULLPTR) {
QScenePropertyChangePtr e(new QScenePropertyChange(NodeRemoved, this));
- e->setPropertyName(QByteArrayLiteral("technique"));
+ e->setPropertyName("technique");
e->setValue(QVariant::fromValue(t->id()));
d->notifyObservers(e);
}
diff --git a/src/render/frontend/qmaterial.cpp b/src/render/frontend/qmaterial.cpp
index 033dd1325..79652d032 100644
--- a/src/render/frontend/qmaterial.cpp
+++ b/src/render/frontend/qmaterial.cpp
@@ -100,7 +100,7 @@ void QMaterial::setEffect(QEffect *effect)
if (d->m_effect && d->m_changeArbiter) {
QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, this));
- change->setPropertyName(QByteArrayLiteral("effect"));
+ change->setPropertyName("effect");
change->setValue(QVariant::fromValue(d->m_effect->id()));
d->notifyObservers(change);
}
@@ -117,7 +117,7 @@ void QMaterial::setEffect(QEffect *effect)
if (d->m_effect && d->m_changeArbiter) {
QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, this));
- change->setPropertyName(QByteArrayLiteral("effect"));
+ change->setPropertyName("effect");
change->setValue(QVariant::fromValue(effect->id()));
d->notifyObservers(change);
}
@@ -148,7 +148,7 @@ void QMaterial::addParameter(QParameter *parameter)
if (d->m_changeArbiter != Q_NULLPTR) {
QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, this));
- change->setPropertyName(QByteArrayLiteral("parameter"));
+ change->setPropertyName("parameter");
change->setValue(QVariant::fromValue(parameter->id()));
d->notifyObservers(change);
}
@@ -160,7 +160,7 @@ void QMaterial::removeParameter(QParameter *parameter)
Q_D(QMaterial);
if (d->m_changeArbiter != Q_NULLPTR) {
QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, this));
- change->setPropertyName(QByteArrayLiteral("parameter"));
+ change->setPropertyName("parameter");
change->setValue(QVariant::fromValue(parameter->id()));
d->notifyObservers(change);
}
diff --git a/src/render/frontend/qparameter.cpp b/src/render/frontend/qparameter.cpp
index daec92c8a..5ecf24092 100644
--- a/src/render/frontend/qparameter.cpp
+++ b/src/render/frontend/qparameter.cpp
@@ -118,7 +118,7 @@ void QParameter::setValue(const QVariant &dv)
txt->setParent(this);
QScenePropertyChangePtr change(new QScenePropertyChange(NodeUpdated, this));
- change->setPropertyName(d->m_name.toUtf8());
+ change->setPropertyName(d->m_name.toUtf8().data());
if (txt != Q_NULLPTR)
change->setValue(QVariant::fromValue(QNode::clone(txt)));
else
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);
}
diff --git a/src/render/frontend/qrendertarget.cpp b/src/render/frontend/qrendertarget.cpp
index 0c011fd62..0f6174e40 100644
--- a/src/render/frontend/qrendertarget.cpp
+++ b/src/render/frontend/qrendertarget.cpp
@@ -77,7 +77,7 @@ void QRenderTarget::addAttachment(QRenderAttachment *attachment)
if (d->m_changeArbiter != Q_NULLPTR) {
QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, this));
- change->setPropertyName(QByteArrayLiteral("attachment"));
+ change->setPropertyName("attachment");
change->setValue(QVariant::fromValue(attachment->id()));
d->notifyObservers(change);
}
@@ -90,7 +90,7 @@ void QRenderTarget::removeAttachment(QRenderAttachment *attachment)
if (d->m_changeArbiter != Q_NULLPTR) {
QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, this));
- change->setPropertyName(QByteArrayLiteral("attachment"));
+ change->setPropertyName("attachment");
change->setValue(QVariant::fromValue(attachment->id()));
d->notifyObservers(change);
}
diff --git a/src/render/frontend/qtechnique.cpp b/src/render/frontend/qtechnique.cpp
index 728fd6c05..74f85cda5 100644
--- a/src/render/frontend/qtechnique.cpp
+++ b/src/render/frontend/qtechnique.cpp
@@ -87,7 +87,7 @@ void QTechnique::openGLFilterChanged()
Q_D(QTechnique);
if (d->m_changeArbiter != Q_NULLPTR) {
QScenePropertyChangePtr change(new QScenePropertyChange(NodeUpdated, this));
- change->setPropertyName(QByteArrayLiteral("openGLFilter"));
+ change->setPropertyName("openGLFilter");
QOpenGLFilter *clone = new QOpenGLFilter();
clone->copy(d->m_openGLFilter);
change->setValue(QVariant::fromValue(clone));
@@ -110,7 +110,7 @@ void QTechnique::addAnnotation(QAnnotation *criterion)
if (d->m_changeArbiter != Q_NULLPTR) {
QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, this));
- change->setPropertyName(QByteArrayLiteral("annotation"));
+ change->setPropertyName("annotation");
change->setValue(QVariant::fromValue(criterion->id()));
d->notifyObservers(change);
}
@@ -122,7 +122,7 @@ void QTechnique::removeAnnotation(QAnnotation *criterion)
Q_D(QTechnique);
if (d->m_changeArbiter != Q_NULLPTR) {
QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, this));
- change->setPropertyName(QByteArrayLiteral("annotation"));
+ change->setPropertyName("annotation");
change->setValue(QVariant::fromValue(criterion->id()));
d->notifyObservers(change);
}
@@ -150,7 +150,7 @@ void QTechnique::addParameter(QParameter *parameter)
if (d->m_changeArbiter != Q_NULLPTR) {
QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, this));
- change->setPropertyName(QByteArrayLiteral("parameter"));
+ change->setPropertyName("parameter");
change->setValue(QVariant::fromValue(parameter->id()));
d->notifyObservers(change);
}
@@ -163,7 +163,7 @@ void QTechnique::removeParameter(QParameter *parameter)
if (d->m_changeArbiter != Q_NULLPTR) {
QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, this));
- change->setPropertyName(QByteArrayLiteral("parameter"));
+ change->setPropertyName("parameter");
change->setValue(QVariant::fromValue(parameter->id()));
d->notifyObservers(change);
}
@@ -190,7 +190,7 @@ void QTechnique::addPass(QRenderPass *pass)
if (d->m_changeArbiter != Q_NULLPTR) {
QScenePropertyChangePtr e(new QScenePropertyChange(NodeAdded, this));
- e->setPropertyName(QByteArrayLiteral("pass"));
+ e->setPropertyName("pass");
e->setValue(QVariant::fromValue(pass->id()));
d->notifyObservers(e);
}
@@ -207,7 +207,7 @@ void QTechnique::removePass(QRenderPass *pass)
Q_D(QTechnique);
if (d->m_changeArbiter) {
QScenePropertyChangePtr e(new QScenePropertyChange(NodeRemoved, this));
- e->setPropertyName(QByteArrayLiteral("pass"));
+ e->setPropertyName("pass");
e->setValue(QVariant::fromValue(pass->id()));
d->notifyObservers(e);
}