diff options
Diffstat (limited to 'src/render/renderstates')
28 files changed, 70 insertions, 70 deletions
diff --git a/src/render/renderstates/qalphacoverage.h b/src/render/renderstates/qalphacoverage.h index 5ba0a5506..7e0487688 100644 --- a/src/render/renderstates/qalphacoverage.h +++ b/src/render/renderstates/qalphacoverage.h @@ -38,7 +38,7 @@ #ifndef QT3DRENDER_QALPHACOVERAGE_H #define QT3DRENDER_QALPHACOVERAGE_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QAlphaCoveragePrivate; -class QT3DRENDERERSHARED_EXPORT QAlphaCoverage : public QRenderState +class QT3DRENDERSHARED_EXPORT QAlphaCoverage : public QRenderState { Q_OBJECT public: diff --git a/src/render/renderstates/qalphatest.h b/src/render/renderstates/qalphatest.h index 44d107529..b5def41ac 100644 --- a/src/render/renderstates/qalphatest.h +++ b/src/render/renderstates/qalphatest.h @@ -38,7 +38,7 @@ #ifndef QT3DRENDER_QALPHATEST_H #define QT3DRENDER_QALPHATEST_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QAlphaTestPrivate; -class QT3DRENDERERSHARED_EXPORT QAlphaTest : public QRenderState +class QT3DRENDERSHARED_EXPORT QAlphaTest : public QRenderState { Q_OBJECT Q_PROPERTY(AlphaFunc func READ func WRITE setFunc NOTIFY funcChanged) diff --git a/src/render/renderstates/qblendequation.h b/src/render/renderstates/qblendequation.h index e6ca15fb7..a314a67b9 100644 --- a/src/render/renderstates/qblendequation.h +++ b/src/render/renderstates/qblendequation.h @@ -38,7 +38,7 @@ #ifndef QT3DRENDER_QBLENDEQUATION_H #define QT3DRENDER_QBLENDEQUATION_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QBlendEquationPrivate; -class QT3DRENDERERSHARED_EXPORT QBlendEquation : public QRenderState +class QT3DRENDERSHARED_EXPORT QBlendEquation : public QRenderState { Q_OBJECT Q_PROPERTY(BlendMode mode READ mode WRITE setMode NOTIFY modeChanged) diff --git a/src/render/renderstates/qblendstate.h b/src/render/renderstates/qblendstate.h index 2ae8b06bc..f67b30275 100644 --- a/src/render/renderstates/qblendstate.h +++ b/src/render/renderstates/qblendstate.h @@ -38,7 +38,7 @@ #ifndef QT3DRENDER_QBLENDSTATE_H #define QT3DRENDER_QBLENDSTATE_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QBlendStatePrivate; -class QT3DRENDERERSHARED_EXPORT QBlendState : public QRenderState +class QT3DRENDERSHARED_EXPORT QBlendState : public QRenderState { Q_OBJECT Q_PROPERTY(Blending srcRGB READ srcRGB WRITE setSrcRGB NOTIFY srcRGBChanged) @@ -110,7 +110,7 @@ private: QT3D_CLONEABLE(QBlendState) }; -class QT3DRENDERERSHARED_EXPORT QBlendStateSeparate : public QBlendState +class QT3DRENDERSHARED_EXPORT QBlendStateSeparate : public QBlendState { Q_OBJECT public: diff --git a/src/render/renderstates/qclipplane.cpp b/src/render/renderstates/qclipplane.cpp index eb327c0e4..9063ef9ad 100644 --- a/src/render/renderstates/qclipplane.cpp +++ b/src/render/renderstates/qclipplane.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "qclipplane.h" -#include <Qt3DRenderer/private/qrenderstate_p.h> +#include <Qt3DRender/private/qrenderstate_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/renderstates/qclipplane.h b/src/render/renderstates/qclipplane.h index 40ebfd9a5..b04661d85 100644 --- a/src/render/renderstates/qclipplane.h +++ b/src/render/renderstates/qclipplane.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QCLIPPLANE_H #define QT3DRENDER_QCLIPPLANE_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -45,7 +45,7 @@ namespace Qt3DRender { class QClipPlanePrivate; -class QT3DRENDERERSHARED_EXPORT QClipPlane : public QRenderState +class QT3DRENDERSHARED_EXPORT QClipPlane : public QRenderState { Q_OBJECT Q_PROPERTY(int plane READ plane WRITE setPlane NOTIFY planeChanged) diff --git a/src/render/renderstates/qcolormask.cpp b/src/render/renderstates/qcolormask.cpp index e52a5d067..6f4761894 100644 --- a/src/render/renderstates/qcolormask.cpp +++ b/src/render/renderstates/qcolormask.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "qcolormask.h" -#include <Qt3DRenderer/private/qrenderstate_p.h> +#include <Qt3DRender/private/qrenderstate_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/renderstates/qcolormask.h b/src/render/renderstates/qcolormask.h index fcbfac88b..2e5aefe9c 100644 --- a/src/render/renderstates/qcolormask.h +++ b/src/render/renderstates/qcolormask.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QCOLORMASK_H #define QT3DRENDER_QCOLORMASK_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -45,7 +45,7 @@ namespace Qt3DRender { class QColorMaskPrivate; -class QT3DRENDERERSHARED_EXPORT QColorMask : public QRenderState +class QT3DRENDERSHARED_EXPORT QColorMask : public QRenderState { Q_OBJECT Q_PROPERTY(bool red READ isRed WRITE setRed NOTIFY redChanged) diff --git a/src/render/renderstates/qcullface.h b/src/render/renderstates/qcullface.h index d6329d205..9cbfe53fa 100644 --- a/src/render/renderstates/qcullface.h +++ b/src/render/renderstates/qcullface.h @@ -39,7 +39,7 @@ #ifndef QT3DRENDER_QCULLFACE_H #define QT3DRENDER_QCULLFACE_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -47,7 +47,7 @@ namespace Qt3DRender { class QCullFacePrivate; -class QT3DRENDERERSHARED_EXPORT QCullFace : public QRenderState +class QT3DRENDERSHARED_EXPORT QCullFace : public QRenderState { Q_OBJECT Q_PROPERTY(CullingMode mode READ mode WRITE setMode NOTIFY modeChanged) diff --git a/src/render/renderstates/qdepthmask.h b/src/render/renderstates/qdepthmask.h index 8d0ea920a..acee32b9d 100644 --- a/src/render/renderstates/qdepthmask.h +++ b/src/render/renderstates/qdepthmask.h @@ -38,7 +38,7 @@ #ifndef QT3DRENDER_QDEPTHMASK_H #define QT3DRENDER_QDEPTHMASK_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QDepthMaskPrivate; -class QT3DRENDERERSHARED_EXPORT QDepthMask : public QRenderState +class QT3DRENDERSHARED_EXPORT QDepthMask : public QRenderState { Q_OBJECT Q_PROPERTY (bool mask READ mask WRITE setMask NOTIFY maskChanged) diff --git a/src/render/renderstates/qdepthtest.h b/src/render/renderstates/qdepthtest.h index bedec55e3..5e8da269b 100644 --- a/src/render/renderstates/qdepthtest.h +++ b/src/render/renderstates/qdepthtest.h @@ -38,7 +38,7 @@ #ifndef QT3DRENDER_QDEPTHTEST_H #define QT3DRENDER_QDEPTHTEST_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QDepthTestPrivate; -class QT3DRENDERERSHARED_EXPORT QDepthTest : public QRenderState +class QT3DRENDERSHARED_EXPORT QDepthTest : public QRenderState { Q_OBJECT Q_PROPERTY(DepthFunc func READ func WRITE setFunc NOTIFY funcChanged) diff --git a/src/render/renderstates/qdithering.h b/src/render/renderstates/qdithering.h index 6fcf83786..6026bfffb 100644 --- a/src/render/renderstates/qdithering.h +++ b/src/render/renderstates/qdithering.h @@ -38,7 +38,7 @@ #ifndef QT3DRENDER_QDITHERING_H #define QT3DRENDER_QDITHERING_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QDitheringPrivate; -class QT3DRENDERERSHARED_EXPORT QDithering : public QRenderState +class QT3DRENDERSHARED_EXPORT QDithering : public QRenderState { Q_OBJECT public: diff --git a/src/render/renderstates/qfrontface.h b/src/render/renderstates/qfrontface.h index 95fe3f0c5..fefc142b8 100644 --- a/src/render/renderstates/qfrontface.h +++ b/src/render/renderstates/qfrontface.h @@ -38,7 +38,7 @@ #ifndef QT3DRENDER_QFRONTFACE_H #define QT3DRENDER_QFRONTFACE_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QFrontFacePrivate; -class QT3DRENDERERSHARED_EXPORT QFrontFace : public QRenderState +class QT3DRENDERSHARED_EXPORT QFrontFace : public QRenderState { Q_OBJECT Q_PROPERTY(FaceDir direction READ direction WRITE setDirection NOTIFY directionChanged) diff --git a/src/render/renderstates/qpolygonoffset.h b/src/render/renderstates/qpolygonoffset.h index dde7dca43..acc93dd54 100644 --- a/src/render/renderstates/qpolygonoffset.h +++ b/src/render/renderstates/qpolygonoffset.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QPOLYGONOFFSET_H #define QT3DRENDER_QPOLYGONOFFSET_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -45,7 +45,7 @@ namespace Qt3DRender { class QPolygonOffsetPrivate; -class QT3DRENDERERSHARED_EXPORT QPolygonOffset : public QRenderState +class QT3DRENDERSHARED_EXPORT QPolygonOffset : public QRenderState { Q_OBJECT diff --git a/src/render/renderstates/qrenderstate.h b/src/render/renderstates/qrenderstate.h index 790c89e83..dfe69c021 100644 --- a/src/render/renderstates/qrenderstate.h +++ b/src/render/renderstates/qrenderstate.h @@ -39,7 +39,7 @@ #define QT3DRENDER_QRENDERSTATE_H #include <Qt3DCore/qnode.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE @@ -47,7 +47,7 @@ namespace Qt3DRender { class QRenderStatePrivate; -class QT3DRENDERERSHARED_EXPORT QRenderState : public Qt3DCore::QNode +class QT3DRENDERSHARED_EXPORT QRenderState : public Qt3DCore::QNode { Q_OBJECT diff --git a/src/render/renderstates/qrenderstate_p.h b/src/render/renderstates/qrenderstate_p.h index 3f976611c..45418bb07 100644 --- a/src/render/renderstates/qrenderstate_p.h +++ b/src/render/renderstates/qrenderstate_p.h @@ -50,14 +50,14 @@ // #include <Qt3DCore/private/qnode_p.h> -#include <Qt3DRenderer/qrenderstate.h> -#include <Qt3DRenderer/private/qt3drenderer_global_p.h> +#include <Qt3DRender/qrenderstate.h> +#include <Qt3DRender/private/qt3drender_global_p.h> QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERERSHARED_PRIVATE_EXPORT QRenderStatePrivate : public Qt3DCore::QNodePrivate +class QT3DRENDERSHARED_PRIVATE_EXPORT QRenderStatePrivate : public Qt3DCore::QNodePrivate { public: QRenderStatePrivate(QRenderState::Type type); diff --git a/src/render/renderstates/qscissortest.h b/src/render/renderstates/qscissortest.h index 2e09fff64..41e843ea3 100644 --- a/src/render/renderstates/qscissortest.h +++ b/src/render/renderstates/qscissortest.h @@ -38,7 +38,7 @@ #ifndef QT3DRENDER_QSCISSORTEST_H #define QT3DRENDER_QSCISSORTEST_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QScissorTestPrivate; -class QT3DRENDERERSHARED_EXPORT QScissorTest : public QRenderState +class QT3DRENDERSHARED_EXPORT QScissorTest : public QRenderState { Q_OBJECT Q_PROPERTY(int left READ left WRITE setLeft NOTIFY leftChanged) diff --git a/src/render/renderstates/qstencilmask.cpp b/src/render/renderstates/qstencilmask.cpp index 44098296a..32d47a54b 100644 --- a/src/render/renderstates/qstencilmask.cpp +++ b/src/render/renderstates/qstencilmask.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "qstencilmask.h" -#include <Qt3DRenderer/private/qrenderstate_p.h> +#include <Qt3DRender/private/qrenderstate_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/renderstates/qstencilmask.h b/src/render/renderstates/qstencilmask.h index b4414e148..5be51f5c1 100644 --- a/src/render/renderstates/qstencilmask.h +++ b/src/render/renderstates/qstencilmask.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QSTENCILMASK_H #define QT3DRENDER_QSTENCILMASK_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -45,7 +45,7 @@ namespace Qt3DRender { class QStencilMaskPrivate; -class QT3DRENDERERSHARED_EXPORT QStencilMask : public QRenderState +class QT3DRENDERSHARED_EXPORT QStencilMask : public QRenderState { Q_OBJECT Q_PROPERTY(uint frontMask READ frontMask WRITE setFrontMask NOTIFY frontMaskChanged) diff --git a/src/render/renderstates/qstencilop.cpp b/src/render/renderstates/qstencilop.cpp index 67a571202..7dbbdc1ea 100644 --- a/src/render/renderstates/qstencilop.cpp +++ b/src/render/renderstates/qstencilop.cpp @@ -36,7 +36,7 @@ #include "qstencilop.h" #include "qstencilopseparate.h" -#include <Qt3DRenderer/private/qrenderstate_p.h> +#include <Qt3DRender/private/qrenderstate_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/renderstates/qstencilop.h b/src/render/renderstates/qstencilop.h index 881ea1354..88ea2aac8 100644 --- a/src/render/renderstates/qstencilop.h +++ b/src/render/renderstates/qstencilop.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QSTENCILOP_H #define QT3DRENDER_QSTENCILOP_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -46,7 +46,7 @@ namespace Qt3DRender { class QStencilOpPrivate; class QStencilOpSeparate; -class QT3DRENDERERSHARED_EXPORT QStencilOp : public QRenderState +class QT3DRENDERSHARED_EXPORT QStencilOp : public QRenderState { Q_OBJECT Q_PROPERTY(Qt3DRender::QStencilOpSeparate *front READ front CONSTANT) diff --git a/src/render/renderstates/qstencilopseparate.h b/src/render/renderstates/qstencilopseparate.h index 44561131c..cc21ebaad 100644 --- a/src/render/renderstates/qstencilopseparate.h +++ b/src/render/renderstates/qstencilopseparate.h @@ -38,7 +38,7 @@ #define QT3DRENDER_QSTENCILOPSEPARATE_H #include <QObject> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE @@ -47,7 +47,7 @@ namespace Qt3DRender { class QStencilOpPrivate; class QStencilOpSeparatePrivate; -class QT3DRENDERERSHARED_EXPORT QStencilOpSeparate : public QObject +class QT3DRENDERSHARED_EXPORT QStencilOpSeparate : public QObject { Q_OBJECT Q_PROPERTY(StencilFaceMode faceMode READ faceMode NOTIFY faceModeChanged) diff --git a/src/render/renderstates/qstenciltest.h b/src/render/renderstates/qstenciltest.h index 2c538d186..c631e7fac 100644 --- a/src/render/renderstates/qstenciltest.h +++ b/src/render/renderstates/qstenciltest.h @@ -38,7 +38,7 @@ #ifndef QT3DRENDER_QSTENCILTEST_H #define QT3DRENDER_QSTENCILTEST_H -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qrenderstate.h> QT_BEGIN_NAMESPACE @@ -47,7 +47,7 @@ namespace Qt3DRender { class QStencilTestPrivate; class QStencilTestSeparate; -class QT3DRENDERERSHARED_EXPORT QStencilTest : public QRenderState +class QT3DRENDERSHARED_EXPORT QStencilTest : public QRenderState { Q_OBJECT Q_PROPERTY(Qt3DRender::QStencilTestSeparate *front READ front CONSTANT) diff --git a/src/render/renderstates/qstenciltestseparate.h b/src/render/renderstates/qstenciltestseparate.h index 5689a1cfb..79258689d 100644 --- a/src/render/renderstates/qstenciltestseparate.h +++ b/src/render/renderstates/qstenciltestseparate.h @@ -38,7 +38,7 @@ #define QT3DRENDER_QSTENCILTESTSEPARATE_H #include <QObject> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE @@ -47,7 +47,7 @@ namespace Qt3DRender { class QStencilTestPrivate; class QStencilTestSeparatePrivate; -class QT3DRENDERERSHARED_EXPORT QStencilTestSeparate : public QObject +class QT3DRENDERSHARED_EXPORT QStencilTestSeparate : public QObject { Q_OBJECT Q_PROPERTY(StencilFaceMode faceMode READ faceMode NOTIFY faceModeChanged) diff --git a/src/render/renderstates/renderstates.cpp b/src/render/renderstates/renderstates.cpp index a7e398035..ff6c24af6 100644 --- a/src/render/renderstates/renderstates.cpp +++ b/src/render/renderstates/renderstates.cpp @@ -37,7 +37,7 @@ #include "renderstates_p.h" -#include <Qt3DRenderer/private/graphicscontext_p.h> +#include <Qt3DRender/private/graphicscontext_p.h> #include <QOpenGLFunctions_3_2_Core> diff --git a/src/render/renderstates/renderstates_p.h b/src/render/renderstates/renderstates_p.h index fb32318cd..055f0cb11 100644 --- a/src/render/renderstates/renderstates_p.h +++ b/src/render/renderstates/renderstates_p.h @@ -49,7 +49,7 @@ // We mean it. // -#include <Qt3DRenderer/private/genericstate_p.h> +#include <Qt3DRender/private/genericstate_p.h> #include <QOpenGLContext> diff --git a/src/render/renderstates/renderstateset.cpp b/src/render/renderstates/renderstateset.cpp index 3da5e37ef..faf40302d 100644 --- a/src/render/renderstates/renderstateset.cpp +++ b/src/render/renderstates/renderstateset.cpp @@ -42,27 +42,27 @@ #include <QDebug> #include <QOpenGLContext> -#include <Qt3DRenderer/private/graphicscontext_p.h> -#include <Qt3DRenderer/private/renderstates_p.h> - -#include <Qt3DRenderer/qalphacoverage.h> -#include <Qt3DRenderer/qalphatest.h> -#include <Qt3DRenderer/qblendequation.h> -#include <Qt3DRenderer/qblendstate.h> -#include <Qt3DRenderer/qcolormask.h> -#include <Qt3DRenderer/qcullface.h> -#include <Qt3DRenderer/qdepthmask.h> -#include <Qt3DRenderer/qdepthtest.h> -#include <Qt3DRenderer/qdithering.h> -#include <Qt3DRenderer/qfrontface.h> -#include <Qt3DRenderer/qpolygonoffset.h> -#include <Qt3DRenderer/qscissortest.h> -#include <Qt3DRenderer/qstenciltest.h> -#include <Qt3DRenderer/qstenciltestseparate.h> -#include <Qt3DRenderer/qclipplane.h> -#include <Qt3DRenderer/qstencilop.h> -#include <Qt3DRenderer/qstencilopseparate.h> -#include <Qt3DRenderer/qstencilmask.h> +#include <Qt3DRender/private/graphicscontext_p.h> +#include <Qt3DRender/private/renderstates_p.h> + +#include <Qt3DRender/qalphacoverage.h> +#include <Qt3DRender/qalphatest.h> +#include <Qt3DRender/qblendequation.h> +#include <Qt3DRender/qblendstate.h> +#include <Qt3DRender/qcolormask.h> +#include <Qt3DRender/qcullface.h> +#include <Qt3DRender/qdepthmask.h> +#include <Qt3DRender/qdepthtest.h> +#include <Qt3DRender/qdithering.h> +#include <Qt3DRender/qfrontface.h> +#include <Qt3DRender/qpolygonoffset.h> +#include <Qt3DRender/qscissortest.h> +#include <Qt3DRender/qstenciltest.h> +#include <Qt3DRender/qstenciltestseparate.h> +#include <Qt3DRender/qclipplane.h> +#include <Qt3DRender/qstencilop.h> +#include <Qt3DRender/qstencilopseparate.h> +#include <Qt3DRender/qstencilmask.h> QT_BEGIN_NAMESPACE diff --git a/src/render/renderstates/renderstateset_p.h b/src/render/renderstates/renderstateset_p.h index 710c06ce3..33862db2b 100644 --- a/src/render/renderstates/renderstateset_p.h +++ b/src/render/renderstates/renderstateset_p.h @@ -49,7 +49,7 @@ // We mean it. // -#include <Qt3DRenderer/private/genericstate_p.h> +#include <Qt3DRender/private/genericstate_p.h> #include <QVector> QT_BEGIN_NAMESPACE |