diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2015-11-04 15:04:54 +0100 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-11-16 09:17:38 +0000 |
| commit | cb99c0358a9ec6d51a165ff4513b146f45f5fb9f (patch) | |
| tree | 26689e2c471edaa3ad323dba07af780d0a3be25e /src/render/picking/qobjectpicker.cpp | |
| parent | 6002528b4610f8223b97b3f5d34a0cb1e0e98393 (diff) | |
Remove anything related to pick attribute in QObjectPicker
Change-Id: I5a25c97841854bd231af0600ecfe08ff4c056de1
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
Diffstat (limited to 'src/render/picking/qobjectpicker.cpp')
| -rw-r--r-- | src/render/picking/qobjectpicker.cpp | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/render/picking/qobjectpicker.cpp b/src/render/picking/qobjectpicker.cpp index 7d1e4a946..da13baace 100644 --- a/src/render/picking/qobjectpicker.cpp +++ b/src/render/picking/qobjectpicker.cpp @@ -38,7 +38,6 @@ #include <Qt3DCore/qentity.h> #include <Qt3DCore/private/qcomponent_p.h> #include <Qt3DCore/qbackendscenepropertychange.h> -#include <Qt3DRender/qattribute.h> #include <Qt3DRender/qpickevent.h> QT_BEGIN_NAMESPACE @@ -89,7 +88,6 @@ class QObjectPickerPrivate : public Qt3DCore::QComponentPrivate public: QObjectPickerPrivate() : QComponentPrivate() - , m_pickAttribute(Q_NULLPTR) , m_hoverEnabled(false) , m_pressed(false) , m_containsMouse(false) @@ -99,7 +97,6 @@ public: } Q_DECLARE_PUBLIC(QObjectPicker) - Qt3DRender::QAttribute *m_pickAttribute; bool m_hoverEnabled; bool m_pressed; bool m_containsMouse; @@ -128,28 +125,6 @@ QObjectPicker::~QObjectPicker() QComponent::cleanup(); } -void QObjectPicker::setPickAttribute(QAttribute *pickAttribute) -{ - Q_D(QObjectPicker); - if (pickAttribute != d->m_pickAttribute) { - - if (pickAttribute && !pickAttribute->parent()) - pickAttribute->setParent(this); - - d->m_pickAttribute = pickAttribute; - emit pickAttributeChanged(); - } -} - -/*! - \qmlproperty Qt3D.Render.Attribute Qt3D.Render::ObjectPicker::pickAttribute -*/ -QAttribute *QObjectPicker::pickAttribute() const -{ - Q_D(const QObjectPicker); - return d->m_pickAttribute; -} - void QObjectPicker::setHoverEnabled(bool hoverEnabled) { Q_D(QObjectPicker); @@ -191,9 +166,6 @@ void QObjectPicker::copy(const QNode *ref) QComponent::copy(ref); const QObjectPicker *picker = static_cast<const QObjectPicker *>(ref); d_func()->m_hoverEnabled = picker->d_func()->m_hoverEnabled; - // Only clone the pickAttribute if we are it's parent, will be deleted by its parent otherwise - if (picker->d_func()->m_pickAttribute != Q_NULLPTR && picker->d_func()->m_pickAttribute->parent() == ref) - setPickAttribute(qobject_cast<QAttribute *>(QNode::clone(picker->d_func()->m_pickAttribute))); } void QObjectPicker::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) |