summaryrefslogtreecommitdiffstats
path: root/src/quick3d/quick3drender
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick3d/quick3drender')
-rw-r--r--src/quick3d/quick3drender/items/quick3dbuffer_p.h2
-rw-r--r--src/quick3d/quick3drender/items/quick3deffect_p.h2
-rw-r--r--src/quick3d/quick3drender/items/quick3dgeometry_p.h2
-rw-r--r--src/quick3d/quick3drender/items/quick3dlayerfilter_p.h2
-rw-r--r--src/quick3d/quick3drender/items/quick3dmaterial_p.h2
-rw-r--r--src/quick3d/quick3drender/items/quick3dmemorybarrier_p.h2
-rw-r--r--src/quick3d/quick3drender/items/quick3dparameter_p.h2
-rw-r--r--src/quick3d/quick3drender/items/quick3draycaster_p.h2
-rw-r--r--src/quick3d/quick3drender/items/quick3draycaster_p_p.h2
-rw-r--r--src/quick3d/quick3drender/items/quick3drenderpass_p.h2
-rw-r--r--src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h2
-rw-r--r--src/quick3d/quick3drender/items/quick3drendertargetoutput_p.h2
-rw-r--r--src/quick3d/quick3drender/items/quick3drendertargetselector_p.h2
-rw-r--r--src/quick3d/quick3drender/items/quick3dscene_p.h2
-rw-r--r--src/quick3d/quick3drender/items/quick3dscreenraycaster_p.h2
-rw-r--r--src/quick3d/quick3drender/items/quick3dscreenraycaster_p_p.h2
-rw-r--r--src/quick3d/quick3drender/items/quick3dshaderdata_p.h2
-rw-r--r--src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h2
-rw-r--r--src/quick3d/quick3drender/items/quick3dstateset_p.h2
-rw-r--r--src/quick3d/quick3drender/items/quick3dtechnique_p.h2
-rw-r--r--src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h2
-rw-r--r--src/quick3d/quick3drender/items/quick3dtexture_p.h2
-rw-r--r--src/quick3d/quick3drender/items/quick3dviewport_p.h2
-rw-r--r--src/quick3d/quick3drender/qt3dquickrender_global.h6
-rw-r--r--src/quick3d/quick3drender/qt3dquickrender_global_p.h6
25 files changed, 29 insertions, 29 deletions
diff --git a/src/quick3d/quick3drender/items/quick3dbuffer_p.h b/src/quick3d/quick3drender/items/quick3dbuffer_p.h
index 712e11078..233cc3faf 100644
--- a/src/quick3d/quick3drender/items/quick3dbuffer_p.h
+++ b/src/quick3d/quick3drender/items/quick3dbuffer_p.h
@@ -70,7 +70,7 @@ namespace Render {
namespace Quick {
-class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DBuffer : public Qt3DRender::QBuffer
+class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DBuffer : public Qt3DRender::QBuffer
{
Q_OBJECT
Q_PROPERTY(QVariant data READ bufferData WRITE setBufferData NOTIFY bufferDataChanged)
diff --git a/src/quick3d/quick3drender/items/quick3deffect_p.h b/src/quick3d/quick3drender/items/quick3deffect_p.h
index 3b778563d..69c5b2be6 100644
--- a/src/quick3d/quick3drender/items/quick3deffect_p.h
+++ b/src/quick3d/quick3drender/items/quick3deffect_p.h
@@ -63,7 +63,7 @@ namespace Qt3DRender {
namespace Render {
namespace Quick {
-class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DEffect : public QObject
+class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DEffect : public QObject
{
Q_OBJECT
Q_PROPERTY(QQmlListProperty<Qt3DRender::QTechnique> techniques READ techniqueList)
diff --git a/src/quick3d/quick3drender/items/quick3dgeometry_p.h b/src/quick3d/quick3drender/items/quick3dgeometry_p.h
index 6bf7faf58..19a308076 100644
--- a/src/quick3d/quick3drender/items/quick3dgeometry_p.h
+++ b/src/quick3d/quick3drender/items/quick3dgeometry_p.h
@@ -62,7 +62,7 @@ namespace Qt3DRender {
namespace Render {
namespace Quick {
-class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DGeometry : public QObject
+class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DGeometry : public QObject
{
Q_OBJECT
Q_PROPERTY(QQmlListProperty<Qt3DRender::QAttribute> attributes READ attributeList)
diff --git a/src/quick3d/quick3drender/items/quick3dlayerfilter_p.h b/src/quick3d/quick3drender/items/quick3dlayerfilter_p.h
index f59be2787..6294d2b98 100644
--- a/src/quick3d/quick3drender/items/quick3dlayerfilter_p.h
+++ b/src/quick3d/quick3drender/items/quick3dlayerfilter_p.h
@@ -63,7 +63,7 @@ namespace Qt3DRender {
namespace Render {
namespace Quick {
-class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DLayerFilter : public QObject
+class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DLayerFilter : public QObject
{
Q_OBJECT
Q_PROPERTY(QQmlListProperty<Qt3DRender::QLayer> layers READ qmlLayers)
diff --git a/src/quick3d/quick3drender/items/quick3dmaterial_p.h b/src/quick3d/quick3drender/items/quick3dmaterial_p.h
index 646e3b154..2069ba9c6 100644
--- a/src/quick3d/quick3drender/items/quick3dmaterial_p.h
+++ b/src/quick3d/quick3drender/items/quick3dmaterial_p.h
@@ -66,7 +66,7 @@ namespace Quick {
// FIXME - write a custom QML parser and stop mis-using Tag
// Tags could be replaced by Parameters directly
-class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DMaterial : public QObject
+class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DMaterial : public QObject
{
Q_OBJECT
Q_PROPERTY(QQmlListProperty<Qt3DRender::QParameter> parameters READ qmlParameters)
diff --git a/src/quick3d/quick3drender/items/quick3dmemorybarrier_p.h b/src/quick3d/quick3drender/items/quick3dmemorybarrier_p.h
index ab8f72a76..2bbe8f34e 100644
--- a/src/quick3d/quick3drender/items/quick3dmemorybarrier_p.h
+++ b/src/quick3d/quick3drender/items/quick3dmemorybarrier_p.h
@@ -62,7 +62,7 @@ namespace Quick {
// Qt6: Handle QFlags as Q_PROPERTY in QML
-class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DMemoryBarrier : public QObject
+class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DMemoryBarrier : public QObject
{
Q_OBJECT
Q_PROPERTY(int waitFor READ waitFor WRITE setWaitFor)
diff --git a/src/quick3d/quick3drender/items/quick3dparameter_p.h b/src/quick3d/quick3drender/items/quick3dparameter_p.h
index 948df22a7..939cfaab8 100644
--- a/src/quick3d/quick3drender/items/quick3dparameter_p.h
+++ b/src/quick3d/quick3drender/items/quick3dparameter_p.h
@@ -63,7 +63,7 @@ namespace Quick {
class Quick3DParameterPrivate;
-class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DParameter : public QParameter
+class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DParameter : public QParameter
{
Q_OBJECT
public:
diff --git a/src/quick3d/quick3drender/items/quick3draycaster_p.h b/src/quick3d/quick3drender/items/quick3draycaster_p.h
index 9be11f534..31778dc3b 100644
--- a/src/quick3d/quick3drender/items/quick3draycaster_p.h
+++ b/src/quick3d/quick3drender/items/quick3draycaster_p.h
@@ -66,7 +66,7 @@ namespace Quick {
class Quick3DRayCasterPrivate;
-class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRayCaster : public QRayCaster
+class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRayCaster : public QRayCaster
{
Q_OBJECT
Q_PROPERTY(QJSValue hits READ hits NOTIFY hitsChanged)
diff --git a/src/quick3d/quick3drender/items/quick3draycaster_p_p.h b/src/quick3d/quick3drender/items/quick3draycaster_p_p.h
index 0098634bc..ef875eb43 100644
--- a/src/quick3d/quick3drender/items/quick3draycaster_p_p.h
+++ b/src/quick3d/quick3drender/items/quick3draycaster_p_p.h
@@ -65,7 +65,7 @@ namespace Qt3DRender {
namespace Render {
namespace Quick {
-class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRayCasterPrivate : public QAbstractRayCasterPrivate
+class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRayCasterPrivate : public QAbstractRayCasterPrivate
{
public:
explicit Quick3DRayCasterPrivate() : QAbstractRayCasterPrivate() { }
diff --git a/src/quick3d/quick3drender/items/quick3drenderpass_p.h b/src/quick3d/quick3drender/items/quick3drenderpass_p.h
index c9d2fce59..982cab9f4 100644
--- a/src/quick3d/quick3drender/items/quick3drenderpass_p.h
+++ b/src/quick3d/quick3drender/items/quick3drenderpass_p.h
@@ -63,7 +63,7 @@ namespace Qt3DRender {
namespace Render {
namespace Quick {
-class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRenderPass : public QObject
+class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRenderPass : public QObject
{
Q_OBJECT
Q_PROPERTY(QQmlListProperty<Qt3DRender::QFilterKey> filterKeys READ filterKeyList)
diff --git a/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h b/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h
index cab75f4a6..8f81766ef 100644
--- a/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h
+++ b/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h
@@ -64,7 +64,7 @@ namespace Qt3DRender {
namespace Render {
namespace Quick {
-class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRenderPassFilter : public QObject
+class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRenderPassFilter : public QObject
{
Q_OBJECT
Q_PROPERTY(QQmlListProperty<Qt3DRender::QFilterKey> matchAny READ includeList)
diff --git a/src/quick3d/quick3drender/items/quick3drendertargetoutput_p.h b/src/quick3d/quick3drender/items/quick3drendertargetoutput_p.h
index 7626a2db7..f7b15b0cb 100644
--- a/src/quick3d/quick3drender/items/quick3drendertargetoutput_p.h
+++ b/src/quick3d/quick3drender/items/quick3drendertargetoutput_p.h
@@ -63,7 +63,7 @@ namespace Qt3DRender {
namespace Render {
namespace Quick {
-class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRenderTargetOutput : public QObject
+class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRenderTargetOutput : public QObject
{
Q_OBJECT
Q_PROPERTY(QQmlListProperty<Qt3DRender::QRenderTargetOutput> attachments READ qmlAttachments)
diff --git a/src/quick3d/quick3drender/items/quick3drendertargetselector_p.h b/src/quick3d/quick3drender/items/quick3drendertargetselector_p.h
index 610ea1a49..7f4b99749 100644
--- a/src/quick3d/quick3drender/items/quick3drendertargetselector_p.h
+++ b/src/quick3d/quick3drender/items/quick3drendertargetselector_p.h
@@ -64,7 +64,7 @@ namespace Qt3DRender {
namespace Render {
namespace Quick {
-class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRenderTargetSelector : public QObject
+class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRenderTargetSelector : public QObject
{
Q_OBJECT
Q_PROPERTY(QVariantList drawBuffers READ drawBuffers WRITE setDrawBuffers NOTIFY drawBuffersChanged)
diff --git a/src/quick3d/quick3drender/items/quick3dscene_p.h b/src/quick3d/quick3drender/items/quick3dscene_p.h
index a7173a6c7..6b7448090 100644
--- a/src/quick3d/quick3drender/items/quick3dscene_p.h
+++ b/src/quick3d/quick3drender/items/quick3dscene_p.h
@@ -62,7 +62,7 @@ namespace Qt3DRender {
namespace Render {
namespace Quick {
-class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DScene : public QObject
+class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DScene : public QObject
{
Q_OBJECT
public:
diff --git a/src/quick3d/quick3drender/items/quick3dscreenraycaster_p.h b/src/quick3d/quick3drender/items/quick3dscreenraycaster_p.h
index b337163c5..63d3f0428 100644
--- a/src/quick3d/quick3drender/items/quick3dscreenraycaster_p.h
+++ b/src/quick3d/quick3drender/items/quick3dscreenraycaster_p.h
@@ -66,7 +66,7 @@ namespace Quick {
class Quick3DScreenRayCasterPrivate;
-class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DScreenRayCaster : public QScreenRayCaster
+class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DScreenRayCaster : public QScreenRayCaster
{
Q_OBJECT
Q_PROPERTY(QJSValue hits READ hits NOTIFY hitsChanged)
diff --git a/src/quick3d/quick3drender/items/quick3dscreenraycaster_p_p.h b/src/quick3d/quick3drender/items/quick3dscreenraycaster_p_p.h
index 5c58e5087..ad5d0b941 100644
--- a/src/quick3d/quick3drender/items/quick3dscreenraycaster_p_p.h
+++ b/src/quick3d/quick3drender/items/quick3dscreenraycaster_p_p.h
@@ -66,7 +66,7 @@ namespace Quick {
class Quick3DScreenRayCaster;
-class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DScreenRayCasterPrivate : public QAbstractRayCasterPrivate
+class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DScreenRayCasterPrivate : public QAbstractRayCasterPrivate
{
public:
explicit Quick3DScreenRayCasterPrivate() : QAbstractRayCasterPrivate() { }
diff --git a/src/quick3d/quick3drender/items/quick3dshaderdata_p.h b/src/quick3d/quick3drender/items/quick3dshaderdata_p.h
index 207096149..481f44446 100644
--- a/src/quick3d/quick3drender/items/quick3dshaderdata_p.h
+++ b/src/quick3d/quick3drender/items/quick3dshaderdata_p.h
@@ -63,7 +63,7 @@ namespace Qt3DRender {
namespace Render {
namespace Quick {
-class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DShaderData : public QShaderData
+class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DShaderData : public QShaderData
{
Q_OBJECT
public:
diff --git a/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h b/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h
index 162f402aa..86d11d13c 100644
--- a/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h
+++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h
@@ -69,7 +69,7 @@ namespace Quick {
class Quick3DShaderDataArrayPrivate;
class Quick3DShaderData;
-class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DShaderDataArray : public Qt3DCore::QNode
+class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DShaderDataArray : public Qt3DCore::QNode
{
Q_OBJECT
Q_PROPERTY(QQmlListProperty<Qt3DRender::QShaderData> values READ valuesList)
diff --git a/src/quick3d/quick3drender/items/quick3dstateset_p.h b/src/quick3d/quick3drender/items/quick3dstateset_p.h
index b2e63c066..7b532ec83 100644
--- a/src/quick3d/quick3drender/items/quick3dstateset_p.h
+++ b/src/quick3d/quick3drender/items/quick3dstateset_p.h
@@ -62,7 +62,7 @@ namespace Qt3DRender {
namespace Render {
namespace Quick {
-class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DStateSet : public QObject
+class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DStateSet : public QObject
{
Q_OBJECT
Q_PROPERTY(QQmlListProperty<Qt3DRender::QRenderState> renderStates READ renderStateList CONSTANT)
diff --git a/src/quick3d/quick3drender/items/quick3dtechnique_p.h b/src/quick3d/quick3drender/items/quick3dtechnique_p.h
index 9cdfdfefe..0c02e07c3 100644
--- a/src/quick3d/quick3drender/items/quick3dtechnique_p.h
+++ b/src/quick3d/quick3drender/items/quick3dtechnique_p.h
@@ -62,7 +62,7 @@ namespace Qt3DRender {
namespace Render {
namespace Quick {
-class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DTechnique : public QObject
+class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DTechnique : public QObject
{
Q_OBJECT
Q_PROPERTY(QQmlListProperty<Qt3DRender::QFilterKey> filterKeys READ filterKeyList)
diff --git a/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h b/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h
index 2b10bc108..9cd776827 100644
--- a/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h
+++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h
@@ -64,7 +64,7 @@ namespace Qt3DRender {
namespace Render {
namespace Quick {
-class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DTechniqueFilter : public QObject
+class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DTechniqueFilter : public QObject
{
Q_OBJECT
Q_PROPERTY(QQmlListProperty<Qt3DRender::QFilterKey> matchAll READ matchList)
diff --git a/src/quick3d/quick3drender/items/quick3dtexture_p.h b/src/quick3d/quick3drender/items/quick3dtexture_p.h
index 6b0430211..54d23a16b 100644
--- a/src/quick3d/quick3drender/items/quick3dtexture_p.h
+++ b/src/quick3d/quick3drender/items/quick3dtexture_p.h
@@ -63,7 +63,7 @@ namespace Qt3DRender {
namespace Render {
namespace Quick {
-class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DTextureExtension : public QObject
+class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DTextureExtension : public QObject
{
Q_OBJECT
Q_PROPERTY(QQmlListProperty<Qt3DRender::QAbstractTextureImage> textureImages READ textureImages)
diff --git a/src/quick3d/quick3drender/items/quick3dviewport_p.h b/src/quick3d/quick3drender/items/quick3dviewport_p.h
index adf0c983f..8a61b490b 100644
--- a/src/quick3d/quick3drender/items/quick3dviewport_p.h
+++ b/src/quick3d/quick3drender/items/quick3dviewport_p.h
@@ -64,7 +64,7 @@ namespace Quick {
// TO DO : Check if this is required or if this might as well be removed
-class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DViewport : public QObject
+class Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DViewport : public QObject
{
Q_OBJECT
public:
diff --git a/src/quick3d/quick3drender/qt3dquickrender_global.h b/src/quick3d/quick3drender/qt3dquickrender_global.h
index 7c21243e3..d8900265c 100644
--- a/src/quick3d/quick3drender/qt3dquickrender_global.h
+++ b/src/quick3d/quick3drender/qt3dquickrender_global.h
@@ -46,12 +46,12 @@ QT_BEGIN_NAMESPACE
#if defined(QT_SHARED) || !defined(QT_STATIC)
# if defined(QT_BUILD_3DQUICKRENDER_LIB)
-# define QT3DQUICKRENDERSHARED_EXPORT Q_DECL_EXPORT
+# define Q_3DQUICKRENDERSHARED_EXPORT Q_DECL_EXPORT
# else
-# define QT3DQUICKRENDERSHARED_EXPORT Q_DECL_IMPORT
+# define Q_3DQUICKRENDERSHARED_EXPORT Q_DECL_IMPORT
# endif
#else
-# define QT3DQUICKRENDERSHARED_EXPORT
+# define Q_3DQUICKRENDERSHARED_EXPORT
#endif
QT_END_NAMESPACE
diff --git a/src/quick3d/quick3drender/qt3dquickrender_global_p.h b/src/quick3d/quick3drender/qt3dquickrender_global_p.h
index 77378f41b..11a4f2ff1 100644
--- a/src/quick3d/quick3drender/qt3dquickrender_global_p.h
+++ b/src/quick3d/quick3drender/qt3dquickrender_global_p.h
@@ -55,7 +55,7 @@
#include <Qt3DQuickRender/qt3dquickrender_global.h>
#include <QtQml/qqml.h>
-#define QT3DQUICKRENDERSHARED_PRIVATE_EXPORT QT3DQUICKRENDERSHARED_EXPORT
+#define Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Q_3DQUICKRENDERSHARED_EXPORT
QT_BEGIN_NAMESPACE
@@ -63,8 +63,8 @@ namespace Qt3DRender {
namespace Quick {
-QT3DQUICKRENDERSHARED_PRIVATE_EXPORT void Quick3DRender_initialize();
-QT3DQUICKRENDERSHARED_PRIVATE_EXPORT void Quick3DRender_registerType(const char *className, const char *quickName, int major, int minor);
+Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT void Quick3DRender_initialize();
+Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT void Quick3DRender_registerType(const char *className, const char *quickName, int major, int minor);
template<class T, class E> void registerExtendedType(const char *className, const char *quickName,
const char *uri, int major, int minor, const char *name)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 13:41:06 +0000