Remove two more duplicated enabled properties.

Besides being unnecessary, these also trigger runtime warnings in
QMetaObject.

Change-Id: Iae9769b797e22430c36f8ae0e8401d1ff84ebccf
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

5 files changed, 3 insertions, 52 deletions

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
 
diff --git a/src/render/renderstates/qblendstate.h b/src/render/renderstates/qblendstate.h
index 255d4afc8..f57bd6ddb 100644
--- a/src/render/renderstates/qblendstate.h
+++ b/src/render/renderstates/qblendstate.h
@@ -56,7 +56,6 @@ class QT3DRENDERSHARED_EXPORT QBlendState : public QRenderState
     Q_PROPERTY(Blending srcAlpha READ srcAlpha WRITE setSrcAlpha NOTIFY srcAlphaChanged)
     Q_PROPERTY(Blending dstRGB READ dstRGB WRITE setDstRGB NOTIFY dstRGBChanged)
     Q_PROPERTY(Blending dstAlpha READ dstAlpha WRITE setDstAlpha NOTIFY dstAlphaChanged)
-    Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
     Q_PROPERTY(bool specifiesAllDrawBuffers READ specifiesAllDrawBuffers NOTIFY specifiesAllDrawBuffersChanged)
     Q_PROPERTY(int bufferIndex READ bufferIndex WRITE setBufferIndex NOTIFY bufferIndexChanged)
 
@@ -93,7 +92,6 @@ public:
     Blending dstRGB() const;
     Blending srcAlpha() const;
     Blending dstAlpha() const;
-    bool enabled() const;
     int bufferIndex() const;
     bool specifiesAllDrawBuffers() const;
 
@@ -102,7 +100,6 @@ public Q_SLOTS:
     void setDstRGB(Blending dstRGB);
     void setSrcAlpha(Blending srcAlpha);
     void setDstAlpha(Blending dstAlpha);
-    void setEnabled(bool isEnabled);
     void setBufferIndex(int index);
 
 Q_SIGNALS:
@@ -110,7 +107,6 @@ Q_SIGNALS:
     void srcAlphaChanged(Blending srcAlpha);
     void dstRGBChanged(Blending dstRGB);
     void dstAlphaChanged(Blending dstAlpha);
-    void enabledChanged(bool enabled);
     void bufferIndexChanged(int index);
     void specifiesAllDrawBuffersChanged(bool specifyAll);
 
diff --git a/src/render/renderstates/qseamlesscubemap.cpp b/src/render/renderstates/qseamlesscubemap.cpp
index a0226ed5e..8274611bd 100644
--- a/src/render/renderstates/qseamlesscubemap.cpp
+++ b/src/render/renderstates/qseamlesscubemap.cpp
@@ -51,12 +51,10 @@ class QSeamlessCubemapPrivate : public QRenderStatePrivate
 public:
     QSeamlessCubemapPrivate()
         : QRenderStatePrivate(QRenderState::SeamlessCubemap)
-        , m_enabled(false)
     {
     }
 
     Q_DECLARE_PUBLIC(QSeamlessCubemap)
-    bool m_enabled;
 };
 
 QSeamlessCubemap::QSeamlessCubemap(QNode *parent)
@@ -73,22 +71,6 @@ void QSeamlessCubemap::copy(const QNode *ref)
 {
     QRenderState::copy(ref);
     const QSeamlessCubemap *refState = static_cast<const QSeamlessCubemap*>(ref);
-    d_func()->m_enabled = refState->d_func()->m_enabled;
-}
-
-bool QSeamlessCubemap::enabled() const
-{
-    Q_D(const QSeamlessCubemap);
-    return d->m_enabled;
-}
-
-void QSeamlessCubemap::setEnabled(bool enabled)
-{
-    Q_D(QSeamlessCubemap);
-    if (d->m_enabled != enabled) {
-        d->m_enabled = enabled;
-        emit enabledChanged(enabled);
-    }
 }
 
 } // namespace Qt3DRender
diff --git a/src/render/renderstates/qseamlesscubemap.h b/src/render/renderstates/qseamlesscubemap.h
index 24fc4be63..7ba762dde 100644
--- a/src/render/renderstates/qseamlesscubemap.h
+++ b/src/render/renderstates/qseamlesscubemap.h
@@ -51,20 +51,11 @@ class QSeamlessCubemapPrivate;
 class QT3DRENDERSHARED_EXPORT QSeamlessCubemap : public QRenderState
 {
     Q_OBJECT
-    Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
 
 public:
     explicit QSeamlessCubemap(Qt3DCore::QNode *parent = 0);
     ~QSeamlessCubemap();
 
-    bool enabled() const;
-
-public Q_SLOTS:
-    void setEnabled(bool isEnabled);
-
-Q_SIGNALS:
-    void enabledChanged(bool isEnabled);
-
 protected:
     void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
diff --git a/src/render/renderstates/renderstateset.cpp b/src/render/renderstates/renderstateset.cpp
index 3c0660f14..62ba98c7e 100644
--- a/src/render/renderstates/renderstateset.cpp
+++ b/src/render/renderstates/renderstateset.cpp
@@ -273,14 +273,14 @@ RenderStateImpl* RenderStateImpl::getOrCreateState(QRenderState *renderState)
         // just use the same values for RGB and Alpha
         return getOrCreateRenderStateImpl<BlendState>(blendState->srcRGB(), blendState->dstRGB(),
                                        blendState->srcRGB(), blendState->dstRGB(),
-                                       blendState->enabled(),
+                                       blendState->isEnabled(),
                                        blendState->bufferIndex());
     }
     case QRenderState::BlendStateSeparate: {
         QBlendState *blendState = static_cast<QBlendState *>(renderState);
         return getOrCreateRenderStateImpl<BlendState>(blendState->srcRGB(), blendState->dstRGB(),
                                        blendState->srcAlpha(), blendState->dstAlpha(),
-                                       blendState->enabled(),
+                                       blendState->isEnabled(),
                                        blendState->bufferIndex());
     }
     case QRenderState::CullFace: {
@@ -339,7 +339,7 @@ RenderStateImpl* RenderStateImpl::getOrCreateState(QRenderState *renderState)
     }
     case QRenderState::SeamlessCubemap: {
         QSeamlessCubemap *seamlessCubemap = static_cast<QSeamlessCubemap *>(renderState);
-        return getOrCreateRenderStateImpl<SeamlessCubemap>(seamlessCubemap->enabled());
+        return getOrCreateRenderStateImpl<SeamlessCubemap>(seamlessCubemap->isEnabled());
     }
     case QRenderState::StencilOp: {
         QStencilOp *stencilOp = static_cast<QStencilOp *>(renderState);