QStencilTestSeparate renamed to QStencilTestArguments

Task-number: QTBUG-51423
Change-Id: I8612803b238ae6a3d9242983140745ef82babcd0
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

9 files changed, 54 insertions, 54 deletions

diff --git a/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml b/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml
index 9dc36d7ad..132451f63 100644
--- a/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml
+++ b/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml
@@ -95,11 +95,11 @@ Viewport {
                         renderStates: [
                             StencilTest {
                                 front {
-                                    stencilFunction: StencilTestSeparate.Always
+                                    stencilFunction: StencilTestArguments.Always
                                     referenceValue: 0; comparisonMask: 0
                                 }
                                 back {
-                                    stencilFunction: StencilTestSeparate.Always
+                                    stencilFunction: StencilTestArguments.Always
                                     referenceValue: 0; comparisonMask: 0
                                 }
                             },
@@ -134,11 +134,11 @@ Viewport {
                 renderStates: [
                     StencilTest {
                         front {
-                            stencilFunction: StencilTestSeparate.NotEqual
+                            stencilFunction: StencilTestArguments.NotEqual
                             referenceValue: 0; comparisonMask: ~0
                         }
                         back {
-                            stencilFunction: StencilTestSeparate.NotEqual
+                            stencilFunction: StencilTestArguments.NotEqual
                             referenceValue: 0; comparisonMask: ~0
                         }
                     }
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
index 5e4484842..ee78b0060 100644
--- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
+++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
@@ -78,7 +78,7 @@
 #include <Qt3DRender/qcullface.h>
 #include <Qt3DRender/qfrontface.h>
 #include <Qt3DRender/qstenciltest.h>
-#include <Qt3DRender/qstenciltestseparate.h>
+#include <Qt3DRender/qstenciltestarguments.h>
 #include <Qt3DRender/qscissortest.h>
 #include <Qt3DRender/qdithering.h>
 #include <Qt3DRender/qrendertargetoutput.h>
@@ -299,7 +299,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri)
     qmlRegisterType<Qt3DRender::QDepthMask>(uri, 2, 0, "DepthMask");
     qmlRegisterType<Qt3DRender::QCullFace>(uri, 2, 0, "CullFace");
     qmlRegisterType<Qt3DRender::QFrontFace>(uri, 2, 0, "FrontFace");
-    qmlRegisterUncreatableType<Qt3DRender::QStencilTestSeparate>(uri, 2, 0, "StencilTestSeparate", QStringLiteral("QStencilTestSeparate cannot be instantiated on its own"));
+    qmlRegisterUncreatableType<Qt3DRender::QStencilTestArguments>(uri, 2, 0, "StencilTestSeparate", QStringLiteral("QStencilTestArguments cannot be instantiated on its own"));
     qmlRegisterType<Qt3DRender::QStencilTest>(uri, 2, 0, "StencilTest");
     qmlRegisterType<Qt3DRender::QScissorTest>(uri, 2, 0, "ScissorTest");
     qmlRegisterType<Qt3DRender::QDithering>(uri, 2, 0, "Dithering");
diff --git a/src/render/renderstates/qstenciltest.cpp b/src/render/renderstates/qstenciltest.cpp
index 6091e97a2..52a6ef115 100644
--- a/src/render/renderstates/qstenciltest.cpp
+++ b/src/render/renderstates/qstenciltest.cpp
@@ -42,7 +42,7 @@
 #include "qrenderstate_p.h"
 #include <private/qnode_p.h>
 #include <Qt3DCore/qscenepropertychange.h>
-#include "qstenciltestseparate.h"
+#include "qstenciltestarguments.h"
 
 
 QT_BEGIN_NAMESPACE
@@ -54,14 +54,14 @@ class QStencilTestPrivate : public QRenderStatePrivate
 public:
     QStencilTestPrivate()
         : QRenderStatePrivate(QRenderState::StencilTest)
-        , m_front(new QStencilTestSeparate(QStencilTestSeparate::Front))
-        , m_back(new QStencilTestSeparate(QStencilTestSeparate::Back))
+        , m_front(new QStencilTestArguments(QStencilTestArguments::Front))
+        , m_back(new QStencilTestArguments(QStencilTestArguments::Back))
     {
     }
 
     Q_DECLARE_PUBLIC(QStencilTest)
-    QStencilTestSeparate *m_front;
-    QStencilTestSeparate *m_back;
+    QStencilTestArguments *m_front;
+    QStencilTestArguments *m_back;
 };
 
 QStencilTest::QStencilTest(QNode *parent)
@@ -74,13 +74,13 @@ QStencilTest::~QStencilTest()
     QNode::cleanup();
 }
 
-QStencilTestSeparate *QStencilTest::front() const
+QStencilTestArguments *QStencilTest::front() const
 {
     Q_D(const QStencilTest);
     return d->m_front;
 }
 
-QStencilTestSeparate *QStencilTest::back() const
+QStencilTestArguments *QStencilTest::back() const
 {
     Q_D(const QStencilTest);
     return d->m_back;
diff --git a/src/render/renderstates/qstenciltest.h b/src/render/renderstates/qstenciltest.h
index 3fda7c49e..a09d780e3 100644
--- a/src/render/renderstates/qstenciltest.h
+++ b/src/render/renderstates/qstenciltest.h
@@ -48,20 +48,20 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 
 class QStencilTestPrivate;
-class QStencilTestSeparate;
+class QStencilTestArguments;
 
 class QT3DRENDERSHARED_EXPORT QStencilTest : public QRenderState
 {
     Q_OBJECT
-    Q_PROPERTY(Qt3DRender::QStencilTestSeparate *front READ front CONSTANT)
-    Q_PROPERTY(Qt3DRender::QStencilTestSeparate *back READ back CONSTANT)
+    Q_PROPERTY(Qt3DRender::QStencilTestArguments *front READ front CONSTANT)
+    Q_PROPERTY(Qt3DRender::QStencilTestArguments *back READ back CONSTANT)
 public:
 
     explicit QStencilTest(Qt3DCore::QNode *parent = 0);
     ~QStencilTest();
 
-    QStencilTestSeparate *front() const;
-    QStencilTestSeparate *back() const;
+    QStencilTestArguments *front() const;
+    QStencilTestArguments *back() const;
 
 protected:
     void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
diff --git a/src/render/renderstates/qstenciltestseparate.cpp b/src/render/renderstates/qstenciltestarguments.cpp
index 4b314feef..3673a7840 100644
--- a/src/render/renderstates/qstenciltestseparate.cpp
+++ b/src/render/renderstates/qstenciltestarguments.cpp
@@ -37,90 +37,90 @@
 **
 ****************************************************************************/
 
-#include "qstenciltestseparate.h"
+#include "qstenciltestarguments.h"
 #include <private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QStencilTestSeparatePrivate : public QObjectPrivate
+class QStencilTestArgumentsPrivate : public QObjectPrivate
 {
 public:
-    QStencilTestSeparatePrivate(QStencilTestSeparate::StencilFaceMode face)
+    QStencilTestArgumentsPrivate(QStencilTestArguments::StencilFaceMode face)
         : QObjectPrivate()
         , m_face(face)
         , m_comparisonMask(0)
         , m_referenceValue(0)
-        , m_stencilFunction(QStencilTestSeparate::Never)
+        , m_stencilFunction(QStencilTestArguments::Never)
     {
     }
 
-    Q_DECLARE_PUBLIC(QStencilTestSeparate)
-    QStencilTestSeparate::StencilFaceMode m_face;
+    Q_DECLARE_PUBLIC(QStencilTestArguments)
+    QStencilTestArguments::StencilFaceMode m_face;
     uint m_comparisonMask;
     int m_referenceValue;
-    QStencilTestSeparate::StencilFunction m_stencilFunction;
+    QStencilTestArguments::StencilFunction m_stencilFunction;
 };
 
 
-QStencilTestSeparate::QStencilTestSeparate(QStencilTestSeparate::StencilFaceMode face, QObject *parent)
-    : QObject(*new QStencilTestSeparatePrivate(face), parent)
+QStencilTestArguments::QStencilTestArguments(QStencilTestArguments::StencilFaceMode face, QObject *parent)
+    : QObject(*new QStencilTestArgumentsPrivate(face), parent)
 {
 }
 
-QStencilTestSeparate::~QStencilTestSeparate()
+QStencilTestArguments::~QStencilTestArguments()
 {
 }
 
-uint QStencilTestSeparate::comparisonMask() const
+uint QStencilTestArguments::comparisonMask() const
 {
-    Q_D(const QStencilTestSeparate);
+    Q_D(const QStencilTestArguments);
     return d->m_comparisonMask;
 }
 
-void QStencilTestSeparate::setComparisonMask(uint comparisonMask)
+void QStencilTestArguments::setComparisonMask(uint comparisonMask)
 {
-    Q_D(QStencilTestSeparate);
+    Q_D(QStencilTestArguments);
     if (d->m_comparisonMask != comparisonMask) {
         d->m_comparisonMask = comparisonMask;
         emit comparisonMaskChanged(comparisonMask);
     }
 }
 
-int QStencilTestSeparate::referenceValue() const
+int QStencilTestArguments::referenceValue() const
 {
-    Q_D(const QStencilTestSeparate);
+    Q_D(const QStencilTestArguments);
     return d->m_referenceValue;
 }
 
-void QStencilTestSeparate::setReferenceValue(int referenceValue)
+void QStencilTestArguments::setReferenceValue(int referenceValue)
 {
-    Q_D(QStencilTestSeparate);
+    Q_D(QStencilTestArguments);
     if (d->m_referenceValue != referenceValue) {
         d->m_referenceValue = referenceValue;
         emit referenceValueChanged(referenceValue);
     }
 }
 
-QStencilTestSeparate::StencilFunction QStencilTestSeparate::stencilFunction() const
+QStencilTestArguments::StencilFunction QStencilTestArguments::stencilFunction() const
 {
-    Q_D(const QStencilTestSeparate);
+    Q_D(const QStencilTestArguments);
     return d->m_stencilFunction;
 }
 
-void QStencilTestSeparate::setStencilFunction(QStencilTestSeparate::StencilFunction stencilFunction)
+void QStencilTestArguments::setStencilFunction(QStencilTestArguments::StencilFunction stencilFunction)
 {
-    Q_D(QStencilTestSeparate);
+    Q_D(QStencilTestArguments);
     if (d->m_stencilFunction != stencilFunction) {
         d->m_stencilFunction = stencilFunction;
         emit stencilFunctionChanged(stencilFunction);
     }
 }
 
-QStencilTestSeparate::StencilFaceMode QStencilTestSeparate::faceMode() const
+QStencilTestArguments::StencilFaceMode QStencilTestArguments::faceMode() const
 {
-    Q_D(const QStencilTestSeparate);
+    Q_D(const QStencilTestArguments);
     return d->m_face;
 }
 
diff --git a/src/render/renderstates/qstenciltestseparate.h b/src/render/renderstates/qstenciltestarguments.h
index 4342ab59f..222313419 100644
--- a/src/render/renderstates/qstenciltestseparate.h
+++ b/src/render/renderstates/qstenciltestarguments.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_QSTENCILTESTSEPARATE_H
-#define QT3DRENDER_QSTENCILTESTSEPARATE_H
+#ifndef QT3DRENDER_QSTENCILTESTARGUMENTS_H
+#define QT3DRENDER_QSTENCILTESTARGUMENTS_H
 
 #include <QObject>
 #include <Qt3DRender/qt3drender_global.h>
@@ -48,9 +48,9 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 
 class QStencilTestPrivate;
-class QStencilTestSeparatePrivate;
+class QStencilTestArgumentsPrivate;
 
-class QT3DRENDERSHARED_EXPORT QStencilTestSeparate : public QObject
+class QT3DRENDERSHARED_EXPORT QStencilTestArguments : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(StencilFaceMode faceMode READ faceMode NOTIFY faceModeChanged)
@@ -80,7 +80,7 @@ public:
     };
     Q_ENUM(StencilFunction)
 
-    ~QStencilTestSeparate();
+    ~QStencilTestArguments();
 
     uint comparisonMask() const;
     int referenceValue() const;
@@ -100,15 +100,15 @@ Q_SIGNALS:
     void faceModeChanged(StencilFaceMode faceMode);
 
 private:
-    explicit QStencilTestSeparate(StencilFaceMode face, QObject *parent = 0);
+    explicit QStencilTestArguments(StencilFaceMode face, QObject *parent = 0);
 
     friend class QStencilTestPrivate;
 
-    Q_DECLARE_PRIVATE(QStencilTestSeparate)
+    Q_DECLARE_PRIVATE(QStencilTestArguments)
 };
 
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_QSTENCILTESTSEPARATE_H
+#endif // QT3DRENDER_QSTENCILTESTARGUMENTS_H
diff --git a/src/render/renderstates/renderstates.pri b/src/render/renderstates/renderstates.pri
index 880850837..643e9b823 100644
--- a/src/render/renderstates/renderstates.pri
+++ b/src/render/renderstates/renderstates.pri
@@ -20,7 +20,7 @@ HEADERS += \
     $$PWD/qstencilop.h \
     $$PWD/qstencilopseparate.h \
     $$PWD/qstenciltest.h \
-    $$PWD/qstenciltestseparate.h \
+    $$PWD/qstenciltestarguments.h \
     $$PWD/renderstates_p.h \
     $$PWD/renderstateset_p.h \
     $$PWD/qpointsize.h \
@@ -47,7 +47,7 @@ SOURCES += \
     $$PWD/qstencilop.cpp \
     $$PWD/qstencilopseparate.cpp \
     $$PWD/qstenciltest.cpp \
-    $$PWD/qstenciltestseparate.cpp \
+    $$PWD/qstenciltestarguments.cpp \
     $$PWD/renderstates.cpp \
     $$PWD/renderstateset.cpp \
     $$PWD/qpointsize.cpp \
diff --git a/src/render/renderstates/renderstateset.cpp b/src/render/renderstates/renderstateset.cpp
index cd3ec68e3..02e36b230 100644
--- a/src/render/renderstates/renderstateset.cpp
+++ b/src/render/renderstates/renderstateset.cpp
@@ -62,7 +62,7 @@
 #include <Qt3DRender/qpolygonoffset.h>
 #include <Qt3DRender/qscissortest.h>
 #include <Qt3DRender/qstenciltest.h>
-#include <Qt3DRender/qstenciltestseparate.h>
+#include <Qt3DRender/qstenciltestarguments.h>
 #include <Qt3DRender/qclipplane.h>
 #include <Qt3DRender/qseamlesscubemap.h>
 #include <Qt3DRender/qstencilop.h>
diff --git a/tests/auto/render/renderpass/tst_renderpass.cpp b/tests/auto/render/renderpass/tst_renderpass.cpp
index 00d4b8d97..6fb9c2522 100644
--- a/tests/auto/render/renderpass/tst_renderpass.cpp
+++ b/tests/auto/render/renderpass/tst_renderpass.cpp
@@ -49,7 +49,7 @@
 #include <Qt3DRender/QPolygonOffset>
 #include <Qt3DRender/QScissorTest>
 #include <Qt3DRender/QStencilTest>
-#include <Qt3DRender/QStencilTestSeparate>
+#include <Qt3DRender/QStencilTestArguments>
 #include <Qt3DRender/QStencilMask>
 #include <Qt3DRender/QStencilOp>
 #include <Qt3DRender/QStencilOpSeparate>