Class QStateSet renamed to QRenderStateSet

Task-number: QTBUG-51470
Change-Id: Ibf2de3cc0027b5851fa663c590b9b2f181c3077c
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

8 files changed, 50 insertions, 50 deletions

diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
index 1cb5dd857..832097286 100644
--- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
+++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
@@ -271,7 +271,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri)
     Qt3DRender::Quick::registerExtendedType<Qt3DRender::QRenderTargetSelector, Qt3DRender::Render::Quick::Quick3DRenderTargetSelector>("QRenderTargetSelector", "Qt3D.Render/RenderTargetSelector", uri, 2, 0, "RenderTargetSelector");
     qmlRegisterType<Qt3DRender::QClearBuffer>(uri, 2, 0, "ClearBuffer");
     qmlRegisterUncreatableType<Qt3DRender::QFrameGraphNode>(uri, 2, 0, "FrameGraphNode", QStringLiteral("FrameGraphNode is a base class"));
-    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QStateSet, Qt3DRender::Render::Quick::Quick3DStateSet>("QStateSet", "Qt3D.Render/StateSet", uri, 2, 0, "StateSet");
+    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QRenderStateSet, Qt3DRender::Render::Quick::Quick3DStateSet>("QRenderStateSet", "Qt3D.Render/RenderStateSet", uri, 2, 0, "RenderStateSet");
     qmlRegisterType<Qt3DRender::QNoDraw>(uri, 2, 0, "NoDraw");
     qmlRegisterType<Qt3DRender::QFrameGraph>(uri, 2, 0, "FrameGraph");
     qmlRegisterType<Qt3DRender::QFrustumCulling>(uri, 2, 0, "FrustumCulling");
diff --git a/src/quick3d/quick3drender/items/quick3dstateset_p.h b/src/quick3d/quick3drender/items/quick3dstateset_p.h
index 7f0f1d837..4bb9b6cec 100644
--- a/src/quick3d/quick3drender/items/quick3dstateset_p.h
+++ b/src/quick3d/quick3drender/items/quick3dstateset_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
-#include <Qt3DRender/qstateset.h>
+#include <Qt3DRender/qrenderstateset.h>
 #include <QQmlListProperty>
 
 QT_BEGIN_NAMESPACE
@@ -70,7 +70,7 @@ public:
     ~Quick3DStateSet();
 
     QQmlListProperty<QRenderState> renderStateList();
-    inline QStateSet *parentStateSet() const { return qobject_cast<QStateSet *>(parent()); }
+    inline QRenderStateSet *parentStateSet() const { return qobject_cast<QRenderStateSet *>(parent()); }
 
 private:
     static void appendRenderState(QQmlListProperty<QRenderState> *list, QRenderState *state);
diff --git a/src/render/framegraph/framegraph.pri b/src/render/framegraph/framegraph.pri
index 57d36e4f0..1dc749bee 100644
--- a/src/render/framegraph/framegraph.pri
+++ b/src/render/framegraph/framegraph.pri
@@ -29,8 +29,8 @@ HEADERS += \
     $$PWD/qsortcriterion_p.h \
     $$PWD/qsortmethod.h \
     $$PWD/qsortmethod_p.h \
-    $$PWD/qstateset.h \
-    $$PWD/qstateset_p.h \
+    $$PWD/qrenderstateset.h \
+    $$PWD/qrenderstateset_p.h \
     $$PWD/qtechniquefilter.h \
     $$PWD/qtechniquefilter_p.h \
     $$PWD/qviewport.h \
@@ -72,7 +72,7 @@ SOURCES += \
     $$PWD/qrendertargetselector.cpp \
     $$PWD/qsortcriterion.cpp \
     $$PWD/qsortmethod.cpp \
-    $$PWD/qstateset.cpp \
+    $$PWD/qrenderstateset.cpp \
     $$PWD/qtechniquefilter.cpp \
     $$PWD/qviewport.cpp \
     $$PWD/renderpassfilternode.cpp \
diff --git a/src/render/framegraph/qstateset.cpp b/src/render/framegraph/qrenderstateset.cpp
index 48ca6fcd1..016f8627f 100644
--- a/src/render/framegraph/qstateset.cpp
+++ b/src/render/framegraph/qrenderstateset.cpp
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#include "qstateset.h"
-#include "qstateset_p.h"
+#include "qrenderstateset.h"
+#include "qrenderstateset_p.h"
 
 #include <Qt3DCore/qscenepropertychange.h>
 #include <Qt3DRender/qrenderstate.h>
@@ -49,22 +49,22 @@ using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
-QStateSetPrivate::QStateSetPrivate()
+QRenderStateSetPrivate::QRenderStateSetPrivate()
     : QFrameGraphNodePrivate()
 {
 }
 
 /*!
- * \class Qt3DRender::QStateSet
+ * \class Qt3DRender::QRenderStateSet
  * \inmodule Qt3DRender
  *
- * \brief The QStateSet \l {QFrameGraphNode}{FrameGraph} node offers a way of
+ * \brief The QRenderStateSet \l {QFrameGraphNode}{FrameGraph} node offers a way of
  * specifying a set of QRenderState objects to be applied during the execution
  * of a framegraph branch.
  *
- * States set on a QStateSet are set globally, contrary to the per-material
+ * States set on a QRenderStateSet are set globally, contrary to the per-material
  * states that can be set on a QRenderPass. By default, an empty
- * QStateSet will result in all render states being disabled when
+ * QRenderStateSet will result in all render states being disabled when
  * executed. Adding a QRenderState state explicitly enables that render
  * state at runtime.
  *
@@ -73,39 +73,39 @@ QStateSetPrivate::QStateSetPrivate()
  * \sa QRenderState, QRenderPass
  */
 
-QStateSet::QStateSet(QNode *parent)
-    : QFrameGraphNode(*new QStateSetPrivate, parent)
+QRenderStateSet::QRenderStateSet(QNode *parent)
+    : QFrameGraphNode(*new QRenderStateSetPrivate, parent)
 {
 }
 
-QStateSet::QStateSet(QStateSetPrivate &dd, QNode *parent)
+QRenderStateSet::QRenderStateSet(QRenderStateSetPrivate &dd, QNode *parent)
     : QFrameGraphNode(dd, parent)
 {
 }
 
-QStateSet::~QStateSet()
+QRenderStateSet::~QRenderStateSet()
 {
     QNode::cleanup();
 }
 
-void QStateSet::copy(const QNode *ref)
+void QRenderStateSet::copy(const QNode *ref)
 {
     QFrameGraphNode::copy(ref);
-    const QStateSet *other = static_cast<const QStateSet*>(ref);
+    const QRenderStateSet *other = static_cast<const QRenderStateSet*>(ref);
 
     Q_FOREACH (QRenderState *renderState, other->d_func()->m_renderStates)
         addRenderState(qobject_cast<QRenderState *>(QNode::clone(renderState)));
 }
 
 /*!
- * Adds a new QRenderState \a state to the QStateSet instance.
+ * Adds a new QRenderState \a state to the QRenderStateSet instance.
  *
- * \note Not setting any QRenderState state on a QStateSet instance
+ * \note Not setting any QRenderState state on a QRenderStateSet instance
  * implies all the render states will be disabled at render time.
  */
-void QStateSet::addRenderState(QRenderState *state)
+void QRenderStateSet::addRenderState(QRenderState *state)
 {
-    Q_D(QStateSet);
+    Q_D(QRenderStateSet);
 
     if (!d->m_renderStates.contains(state)) {
         d->m_renderStates.append(state);
@@ -124,11 +124,11 @@ void QStateSet::addRenderState(QRenderState *state)
 }
 
 /*!
- * Removes the QRenderState \a state from the QStateSet instance.
+ * Removes the QRenderState \a state from the QRenderStateSet instance.
  */
-void QStateSet::removeRenderState(QRenderState *state)
+void QRenderStateSet::removeRenderState(QRenderState *state)
 {
-    Q_D(QStateSet);
+    Q_D(QRenderStateSet);
     if (d->m_changeArbiter != Q_NULLPTR) {
         QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id()));
         change->setPropertyName("renderState");
@@ -139,11 +139,11 @@ void QStateSet::removeRenderState(QRenderState *state)
 }
 
 /*!
- * Returns the list of QRenderState objects that compose the QStateSet instance.
+ * Returns the list of QRenderState objects that compose the QRenderStateSet instance.
  */
-QList<QRenderState *> QStateSet::renderStates() const
+QList<QRenderState *> QRenderStateSet::renderStates() const
 {
-    Q_D(const QStateSet);
+    Q_D(const QRenderStateSet);
     return d->m_renderStates;
 }
 
diff --git a/src/render/framegraph/qstateset.h b/src/render/framegraph/qrenderstateset.h
index 499e3f1ba..321d06f3c 100644
--- a/src/render/framegraph/qstateset.h
+++ b/src/render/framegraph/qrenderstateset.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_QSTATESET_H
-#define QT3DRENDER_QSTATESET_H
+#ifndef QT3DRENDER_QRENDERSTATESET_H
+#define QT3DRENDER_QRENDERSTATESET_H
 
 #include <Qt3DRender/qframegraphnode.h>
 
@@ -46,32 +46,32 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QStateSetPrivate;
+class QRenderStateSetPrivate;
 class QRenderState;
 
-class QT3DRENDERSHARED_EXPORT QStateSet : public QFrameGraphNode
+class QT3DRENDERSHARED_EXPORT QRenderStateSet : public QFrameGraphNode
 {
     Q_OBJECT
 
 public:
-    explicit QStateSet(Qt3DCore::QNode *parent = 0);
-    ~QStateSet();
+    explicit QRenderStateSet(Qt3DCore::QNode *parent = 0);
+    ~QRenderStateSet();
 
     void addRenderState(QRenderState *state);
     void removeRenderState(QRenderState *state);
     QList<QRenderState *> renderStates() const;
 
 protected:
-    QStateSet(QStateSetPrivate &dd, Qt3DCore::QNode *parent = 0);
+    QRenderStateSet(QRenderStateSetPrivate &dd, Qt3DCore::QNode *parent = 0);
     void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
-    Q_DECLARE_PRIVATE(QStateSet)
-    QT3D_CLONEABLE(QStateSet)
+    Q_DECLARE_PRIVATE(QRenderStateSet)
+    QT3D_CLONEABLE(QRenderStateSet)
 };
 
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_QSTATESET_H
+#endif // QT3DRENDER_QRENDERSTATESET_H
diff --git a/src/render/framegraph/qstateset_p.h b/src/render/framegraph/qrenderstateset_p.h
index 8baa64b0a..b251ad267 100644
--- a/src/render/framegraph/qstateset_p.h
+++ b/src/render/framegraph/qrenderstateset_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_QSTATESET_P_H
-#define QT3DRENDER_QSTATESET_P_H
+#ifndef QT3DRENDER_QRENDERSTATESET_P_H
+#define QT3DRENDER_QRENDERSTATESET_P_H
 
 //
 //  W A R N I N G
@@ -57,15 +57,15 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QStateSet;
+class QRenderStateSet;
 class QRenderState;
 
-class QStateSetPrivate : public QFrameGraphNodePrivate
+class QRenderStateSetPrivate : public QFrameGraphNodePrivate
 {
 public:
-    QStateSetPrivate();
+    QRenderStateSetPrivate();
 
-    Q_DECLARE_PUBLIC(QStateSet)
+    Q_DECLARE_PUBLIC(QRenderStateSet)
     QList<QRenderState *> m_renderStates;
 };
 
@@ -73,5 +73,5 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_QSTATESET_P_H
+#endif // QT3DRENDER_QRENDERSTATESET_P_H
 
diff --git a/src/render/framegraph/statesetnode.cpp b/src/render/framegraph/statesetnode.cpp
index 90baf5773..42541660f 100644
--- a/src/render/framegraph/statesetnode.cpp
+++ b/src/render/framegraph/statesetnode.cpp
@@ -40,7 +40,7 @@
 #include "statesetnode_p.h"
 
 #include <Qt3DCore/qscenepropertychange.h>
-#include <Qt3DRender/qstateset.h>
+#include <Qt3DRender/qrenderstateset.h>
 #include <Qt3DRender/private/genericstate_p.h>
 #include <Qt3DRender/private/renderstateset_p.h>
 
@@ -62,7 +62,7 @@ StateSetNode::~StateSetNode()
 
 void StateSetNode::updateFromPeer(Qt3DCore::QNode *peer)
 {
-    QStateSet *stateSet = static_cast<QStateSet*>(peer);
+    QRenderStateSet *stateSet = static_cast<QRenderStateSet*>(peer);
 
     setEnabled(stateSet->isEnabled());
     Q_FOREACH (QRenderState *renderState, stateSet->renderStates())
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp
index 9679dd785..3b24b8701 100644
--- a/src/render/frontend/qrenderaspect.cpp
+++ b/src/render/frontend/qrenderaspect.cpp
@@ -63,7 +63,7 @@
 #include <Qt3DRender/qtexture.h>
 #include <Qt3DRender/qeffect.h>
 #include <Qt3DRender/qshaderdata.h>
-#include <Qt3DRender/qstateset.h>
+#include <Qt3DRender/qrenderstateset.h>
 #include <Qt3DRender/qnodraw.h>
 #include <Qt3DRender/qcameralens.h>
 #include <Qt3DRender/qattribute.h>
@@ -276,7 +276,7 @@ void QRenderAspect::registerBackendTypes()
     registerBackendType<QParameter>(QBackendNodeMapperPtr(new Render::NodeFunctor<Render::Parameter, Render::ParameterManager>(d->m_renderer, d->m_nodeManagers->parameterManager())));
     registerBackendType<QShaderData>(QBackendNodeMapperPtr(new Render::RenderShaderDataFunctor(d->m_renderer, d->m_nodeManagers)));
     registerBackendType<QAbstractTextureImage>(QBackendNodeMapperPtr(new Render::TextureImageFunctor(d->m_renderer, d->m_nodeManagers->textureManager(), d->m_nodeManagers->textureImageManager(), d->m_nodeManagers->textureDataManager())));
-    registerBackendType<QStateSet>(QBackendNodeMapperPtr(new Render::FrameGraphNodeFunctor<Render::StateSetNode, QStateSet>(d->m_renderer, d->m_nodeManagers->frameGraphManager())));
+    registerBackendType<QRenderStateSet>(QBackendNodeMapperPtr(new Render::FrameGraphNodeFunctor<Render::StateSetNode, QRenderStateSet>(d->m_renderer, d->m_nodeManagers->frameGraphManager())));
     registerBackendType<QNoDraw>(QBackendNodeMapperPtr(new Render::FrameGraphNodeFunctor<Render::NoDraw, QNoDraw>(d->m_renderer, d->m_nodeManagers->frameGraphManager())));
     registerBackendType<QBuffer>(QBackendNodeMapperPtr(new Render::BufferFunctor(d->m_renderer, d->m_nodeManagers->bufferManager())));
     registerBackendType<QAttribute>(QBackendNodeMapperPtr(new Render::NodeFunctor<Render::Attribute, Render::AttributeManager>(d->m_renderer, d->m_nodeManagers->attributeManager())));