From 6290ae17ecedde6c3fa11a8746e283ac617eb411 Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Wed, 17 Feb 2016 17:01:58 +0100 Subject: Remove two more duplicated enabled properties. Besides being unnecessary, these also trigger runtime warnings in QMetaObject. Change-Id: Iae9769b797e22430c36f8ae0e8401d1ff84ebccf Reviewed-by: Paul Lemire --- src/render/renderstates/qblendstate.cpp | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'src/render/renderstates/qblendstate.cpp') diff --git a/src/render/renderstates/qblendstate.cpp b/src/render/renderstates/qblendstate.cpp index fcb195fab..492c533ce 100644 --- a/src/render/renderstates/qblendstate.cpp +++ b/src/render/renderstates/qblendstate.cpp @@ -56,7 +56,6 @@ public: , m_srcAlpha(QBlendState::Zero) , m_dstRGB(QBlendState::Zero) , m_dstAlpha(QBlendState::Zero) - , m_enabled(true) , m_bufferIndex(-1) { } @@ -67,7 +66,6 @@ public: QBlendState::Blending m_srcAlpha; QBlendState::Blending m_dstRGB; QBlendState::Blending m_dstAlpha; - bool m_enabled; int m_bufferIndex; }; @@ -125,7 +123,6 @@ void QBlendState::copy(const QNode *ref) d_func()->m_srcAlpha = refState->d_func()->m_srcAlpha; d_func()->m_dstAlpha = refState->d_func()->m_dstAlpha; d_func()->m_dstRGB = refState->d_func()->m_dstRGB; - d_func()->m_enabled = refState->d_func()->m_enabled; d_func()->m_bufferIndex = refState->d_func()->m_bufferIndex; } @@ -257,21 +254,6 @@ void QBlendState::setDstAlpha(QBlendState::Blending dstAlpha) } } -bool QBlendState::enabled() const -{ - Q_D(const QBlendState); - return d->m_enabled; -} - -void QBlendState::setEnabled(bool enabled) -{ - Q_D(QBlendState); - if (d->m_enabled != enabled) { - d->m_enabled = enabled; - emit enabledChanged(enabled); - } -} - /*! \qmlproperty int Qt3D.Render::BlendState::bufferIndex -- cgit v1.2.3