diff options
author | Volker Krause <volker.krause@kdab.com> | 2016-02-17 16:22:51 +0100 |
---|---|---|
committer | Volker Krause <volker.krause@kdab.com> | 2016-02-18 07:36:35 +0000 |
commit | cfcdd103eaec7baa365cf8b6b0ca0f4e01bf0d91 (patch) | |
tree | 7bc76cd1623565ddbcac36b02326108e303a5d7a | |
parent | 6290ae17ecedde6c3fa11a8746e283ac617eb411 (diff) |
Don't duplicate the enabled property in QFrameGraphNode.
It already exists in QNode.
Change-Id: Ib41a8a69ea50f8f2f383f48a5d6a8d694ffb5dbf
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
-rw-r--r-- | src/render/framegraph/qframegraphnode.cpp | 29 | ||||
-rw-r--r-- | src/render/framegraph/qframegraphnode.h | 9 | ||||
-rw-r--r-- | src/render/framegraph/qframegraphnode_p.h | 1 |
3 files changed, 0 insertions, 39 deletions
diff --git a/src/render/framegraph/qframegraphnode.cpp b/src/render/framegraph/qframegraphnode.cpp index d78040149..410bea676 100644 --- a/src/render/framegraph/qframegraphnode.cpp +++ b/src/render/framegraph/qframegraphnode.cpp @@ -46,7 +46,6 @@ namespace Qt3DRender { QFrameGraphNodePrivate::QFrameGraphNodePrivate() : QNodePrivate() - , m_enabled(true) { } @@ -106,34 +105,6 @@ QFrameGraphNode::QFrameGraphNode(QFrameGraphNodePrivate &dd, QNode *parent) { } -/*! - \qmlproperty bool Qt3D.Render::FrameGraphNode::enabled - - Holds whether the frame graph node is enabled or disabled. -*/ - -/*! - \property Qt3DRender::QFrameGraphNode::enabled - - Holds whether the frame graph node is enabled or disabled. -*/ - -bool QFrameGraphNode::isEnabled() const -{ - Q_D(const QFrameGraphNode); - return d->m_enabled; -} - -void QFrameGraphNode::setEnabled(bool enabled) -{ - Q_D(QFrameGraphNode); - if (d->m_enabled != enabled) { - d->m_enabled = enabled; - emit enabledChanged(enabled); - } -} - - } // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/framegraph/qframegraphnode.h b/src/render/framegraph/qframegraphnode.h index 81c93f57f..b75ada52e 100644 --- a/src/render/framegraph/qframegraphnode.h +++ b/src/render/framegraph/qframegraphnode.h @@ -53,24 +53,15 @@ class QFrameGraphNodePrivate; class QT3DRENDERSHARED_EXPORT QFrameGraphNode : public Qt3DCore::QNode { Q_OBJECT - Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged) public: explicit QFrameGraphNode(Qt3DCore::QNode *parent = 0); ~QFrameGraphNode(); QFrameGraphNode *parentFrameGraphNode() const; - bool isEnabled() const; - -public Q_SLOTS: - void setEnabled(bool enabled); - protected: QFrameGraphNode(QFrameGraphNodePrivate &dd, Qt3DCore::QNode *parent = 0); -Q_SIGNALS: - void enabledChanged(bool enabled); - private: Q_DECLARE_PRIVATE(QFrameGraphNode) }; diff --git a/src/render/framegraph/qframegraphnode_p.h b/src/render/framegraph/qframegraphnode_p.h index a648bb055..00cc53626 100644 --- a/src/render/framegraph/qframegraphnode_p.h +++ b/src/render/framegraph/qframegraphnode_p.h @@ -67,7 +67,6 @@ public: QFrameGraphNodePrivate(); Q_DECLARE_PUBLIC(QFrameGraphNode) - bool m_enabled; QList<QFrameGraphNode *> m_fgChildren; }; |