diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2015-03-11 15:19:26 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2015-04-25 08:04:58 +0000 |
commit | c1c1989a5e2ca548e6de536abf0a94114fc026fb (patch) | |
tree | e685317df61b1072422149f6be4b19e97cf06e5c /src/render/frontend | |
parent | 215311202708d8f16a1da6a00e8fa56bc3878551 (diff) |
QTechnique use private slot to send OpenGLFilter Changes
Change-Id: I070360e5b05c7e974664ea0825f3d8ef231ef006
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/frontend')
-rw-r--r-- | src/render/frontend/qtechnique.cpp | 17 | ||||
-rw-r--r-- | src/render/frontend/qtechnique.h | 4 | ||||
-rw-r--r-- | src/render/frontend/qtechnique_p.h | 3 |
3 files changed, 13 insertions, 11 deletions
diff --git a/src/render/frontend/qtechnique.cpp b/src/render/frontend/qtechnique.cpp index d6d931caa..4ce110c5e 100644 --- a/src/render/frontend/qtechnique.cpp +++ b/src/render/frontend/qtechnique.cpp @@ -62,7 +62,7 @@ QTechnique::QTechnique(QNode *parent) : QNode(*new QTechniquePrivate(this), parent) { Q_D(QTechnique); - QObject::connect(&d->m_openGLFilter, SIGNAL(openGLFilterChanged()), this, SLOT(openGLFilterChanged())); + QObject::connect(&d->m_openGLFilter, SIGNAL(openGLFilterChanged()), this, SLOT(_q_openGLFilterChanged())); } /*! \internal */ @@ -70,7 +70,7 @@ QTechnique::QTechnique(QTechniquePrivate &dd, QNode *parent) : QNode(dd, parent) { Q_D(QTechnique); - QObject::connect(&d->m_openGLFilter, SIGNAL(openGLFilterChanged()), this, SLOT(openGLFilterChanged())); + QObject::connect(&d->m_openGLFilter, SIGNAL(openGLFilterChanged()), this, SLOT(_q_openGLFilterChanged())); } void QTechnique::copy(const QNode *ref) @@ -87,16 +87,15 @@ void QTechnique::copy(const QNode *ref) addParameter(qobject_cast<QParameter *>(QNode::clone(p))); } -void QTechnique::openGLFilterChanged() +void QTechniquePrivate::_q_openGLFilterChanged() { - Q_D(QTechnique); - if (d->m_changeArbiter != Q_NULLPTR) { - QScenePropertyChangePtr change(new QScenePropertyChange(NodeUpdated, QSceneChange::Node, id())); + if (m_changeArbiter != Q_NULLPTR) { + QScenePropertyChangePtr change(new QScenePropertyChange(NodeUpdated, QSceneChange::Node, m_id)); change->setPropertyName("openGLFilter"); QOpenGLFilter *clone = new QOpenGLFilter(); - clone->copy(d->m_openGLFilter); + clone->copy(m_openGLFilter); change->setValue(QVariant::fromValue(clone)); - d->notifyObservers(change); + notifyObservers(change); } } @@ -243,3 +242,5 @@ QOpenGLFilter *QTechnique::openGLFilter() } // of namespace Qt3D QT_END_NAMESPACE + +#include "moc_qtechnique.cpp" diff --git a/src/render/frontend/qtechnique.h b/src/render/frontend/qtechnique.h index 93d1439f3..199a7d57a 100644 --- a/src/render/frontend/qtechnique.h +++ b/src/render/frontend/qtechnique.h @@ -78,12 +78,10 @@ protected: QTechnique(QTechniquePrivate &dd, QNode *parent = 0); void copy(const QNode *ref) Q_DECL_OVERRIDE; -protected Q_SLOTS: - void openGLFilterChanged(); - private: Q_DECLARE_PRIVATE(QTechnique) QT3D_CLONEABLE(QTechnique) + Q_PRIVATE_SLOT(d_func(), void _q_openGLFilterChanged()) }; } diff --git a/src/render/frontend/qtechnique_p.h b/src/render/frontend/qtechnique_p.h index 60ddc1fce..df9a4c09e 100644 --- a/src/render/frontend/qtechnique_p.h +++ b/src/render/frontend/qtechnique_p.h @@ -61,6 +61,9 @@ public: QList<QParameter *> m_parameters; QList<QRenderPass*> m_renderPasses; QOpenGLFilter m_openGLFilter; + +private: + void _q_openGLFilterChanged(); }; } // Qt3D |