diff options
author | Kai Koehne <kai.koehne@qt.io> | 2019-04-01 09:35:50 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@qt.io> | 2019-04-02 14:00:58 +0000 |
commit | 7b096b1de9691ddef8445102cc9f71b90aa31cee (patch) | |
tree | 654d36883afaca4d610b3c9a4e8990a7e4e41721 /src/render | |
parent | f3259300bde381b10cb737735fe19b039c969782 (diff) |
Switch export macros to standard form
Qt expects the export macros to have Q_ prefixes, otherwise the symbol
versioning script won't find them and mark them.
Also remove non-exising QT3DLOGIC_PRIVATE_EXPORT macro from
src/doc/qt3d.qdocconf
Task-number: QTBUG-74752
Change-Id: I71b9e85ff09c002fb283824aa51a5a8f50e937f4
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render')
204 files changed, 266 insertions, 266 deletions
diff --git a/src/render/backend/abstractrenderer_p.h b/src/render/backend/abstractrenderer_p.h index f19db066c..ed6a06754 100644 --- a/src/render/backend/abstractrenderer_p.h +++ b/src/render/backend/abstractrenderer_p.h @@ -87,7 +87,7 @@ class BackendNode; class OffscreenSurfaceHelper; class Shader; -class QT3DRENDERSHARED_PRIVATE_EXPORT AbstractRenderer +class Q_3DRENDERSHARED_PRIVATE_EXPORT AbstractRenderer { public: virtual ~AbstractRenderer() {} diff --git a/src/render/backend/backendnode_p.h b/src/render/backend/backendnode_p.h index 8db68b11d..f94033c1a 100644 --- a/src/render/backend/backendnode_p.h +++ b/src/render/backend/backendnode_p.h @@ -64,7 +64,7 @@ namespace Render { class RenderBackendResourceAccessor; -class QT3DRENDERSHARED_PRIVATE_EXPORT BackendNode : public Qt3DCore::QBackendNode +class Q_3DRENDERSHARED_PRIVATE_EXPORT BackendNode : public Qt3DCore::QBackendNode { public: BackendNode(Qt3DCore::QBackendNode::Mode mode = ReadOnly); diff --git a/src/render/backend/cameralens_p.h b/src/render/backend/cameralens_p.h index d00358fb8..80a1715cf 100644 --- a/src/render/backend/cameralens_p.h +++ b/src/render/backend/cameralens_p.h @@ -80,7 +80,7 @@ private: QRenderAspect *m_renderAspect; }; -class QT3DRENDERSHARED_PRIVATE_EXPORT CameraLens : public BackendNode +class Q_3DRENDERSHARED_PRIVATE_EXPORT CameraLens : public BackendNode { public: CameraLens(); diff --git a/src/render/backend/entity_p.h b/src/render/backend/entity_p.h index 075871d85..149ac1143 100644 --- a/src/render/backend/entity_p.h +++ b/src/render/backend/entity_p.h @@ -214,25 +214,25 @@ private: #define ENTITY_COMPONENT_TEMPLATE_SPECIALIZATION(Type, Handle) \ /* Handle */ \ template<> \ - QT3DRENDERSHARED_PRIVATE_EXPORT Handle Entity::componentHandle<Type>() const; \ + Q_3DRENDERSHARED_PRIVATE_EXPORT Handle Entity::componentHandle<Type>() const; \ /* Component */ \ template<> \ - QT3DRENDERSHARED_PRIVATE_EXPORT Type *Entity::renderComponent<Type>() const; \ + Q_3DRENDERSHARED_PRIVATE_EXPORT Type *Entity::renderComponent<Type>() const; \ /* Uuid */ \ template<> \ - QT3DRENDERSHARED_PRIVATE_EXPORT Qt3DCore::QNodeId Entity::componentUuid<Type>() const; + Q_3DRENDERSHARED_PRIVATE_EXPORT Qt3DCore::QNodeId Entity::componentUuid<Type>() const; #define ENTITY_COMPONENT_LIST_TEMPLATE_SPECIALIZATION(Type, Handle) \ /* Handle */ \ template<> \ - QT3DRENDERSHARED_PRIVATE_EXPORT QVector<Handle> Entity::componentsHandle<Type>() const; \ + Q_3DRENDERSHARED_PRIVATE_EXPORT QVector<Handle> Entity::componentsHandle<Type>() const; \ /* Component */ \ template<> \ - QT3DRENDERSHARED_PRIVATE_EXPORT QVector<Type *> Entity::renderComponents<Type>() const; \ + Q_3DRENDERSHARED_PRIVATE_EXPORT QVector<Type *> Entity::renderComponents<Type>() const; \ /* Uuid */ \ template<> \ - QT3DRENDERSHARED_PRIVATE_EXPORT Qt3DCore::QNodeIdVector Entity::componentsUuid<Type>() const; + Q_3DRENDERSHARED_PRIVATE_EXPORT Qt3DCore::QNodeIdVector Entity::componentsUuid<Type>() const; #define ENTITY_COMPONENT_TEMPLATE_IMPL(Type, Handle, Manager, variable) \ /* Handle */ \ diff --git a/src/render/backend/nodemanagers_p.h b/src/render/backend/nodemanagers_p.h index 2c4926894..4ef1f4927 100644 --- a/src/render/backend/nodemanagers_p.h +++ b/src/render/backend/nodemanagers_p.h @@ -146,7 +146,7 @@ class OpenGLVertexArrayObject; class ResourceAccessor; -class QT3DRENDERSHARED_PRIVATE_EXPORT NodeManagers +class Q_3DRENDERSHARED_PRIVATE_EXPORT NodeManagers { public: NodeManagers(); @@ -279,97 +279,97 @@ private: // Specializations template<> -QT3DRENDERSHARED_PRIVATE_EXPORT CameraManager *NodeManagers::manager<CameraLens>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT CameraManager *NodeManagers::manager<CameraLens>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT EntityManager *NodeManagers::manager<Entity>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT EntityManager *NodeManagers::manager<Entity>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT MaterialManager *NodeManagers::manager<Material>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT MaterialManager *NodeManagers::manager<Material>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT MatrixManager *NodeManagers::manager<QMatrix4x4*>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT MatrixManager *NodeManagers::manager<QMatrix4x4*>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT VAOManager *NodeManagers::manager<OpenGLVertexArrayObject>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT VAOManager *NodeManagers::manager<OpenGLVertexArrayObject>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT ShaderManager *NodeManagers::manager<Shader>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT ShaderManager *NodeManagers::manager<Shader>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT ShaderBuilderManager *NodeManagers::manager<ShaderBuilder>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT ShaderBuilderManager *NodeManagers::manager<ShaderBuilder>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT TechniqueManager *NodeManagers::manager<Technique>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT TechniqueManager *NodeManagers::manager<Technique>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT EffectManager *NodeManagers::manager<Effect>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT EffectManager *NodeManagers::manager<Effect>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT RenderPassManager *NodeManagers::manager<RenderPass>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT RenderPassManager *NodeManagers::manager<RenderPass>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT TextureManager *NodeManagers::manager<Texture>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT TextureManager *NodeManagers::manager<Texture>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT TextureDataManager *NodeManagers::manager<QTextureImageData>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT TextureDataManager *NodeManagers::manager<QTextureImageData>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT LayerManager *NodeManagers::manager<Layer>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT LayerManager *NodeManagers::manager<Layer>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT LevelOfDetailManager *NodeManagers::manager<LevelOfDetail>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT LevelOfDetailManager *NodeManagers::manager<LevelOfDetail>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT FilterKeyManager *NodeManagers::manager<FilterKey>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT FilterKeyManager *NodeManagers::manager<FilterKey>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT FrameGraphManager *NodeManagers::manager<FrameGraphNode*>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT FrameGraphManager *NodeManagers::manager<FrameGraphNode*>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT TransformManager *NodeManagers::manager<Transform>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT TransformManager *NodeManagers::manager<Transform>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT RenderTargetManager *NodeManagers::manager<RenderTarget>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT RenderTargetManager *NodeManagers::manager<RenderTarget>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT SceneManager *NodeManagers::manager<Scene>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT SceneManager *NodeManagers::manager<Scene>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT AttachmentManager *NodeManagers::manager<RenderTargetOutput>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT AttachmentManager *NodeManagers::manager<RenderTargetOutput>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT ParameterManager *NodeManagers::manager<Parameter>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT ParameterManager *NodeManagers::manager<Parameter>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT ShaderDataManager *NodeManagers::manager<ShaderData>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT ShaderDataManager *NodeManagers::manager<ShaderData>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT GLBufferManager *NodeManagers::manager<GLBuffer>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT GLBufferManager *NodeManagers::manager<GLBuffer>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT TextureImageManager *NodeManagers::manager<TextureImage>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT TextureImageManager *NodeManagers::manager<TextureImage>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT BufferManager *NodeManagers::manager<Buffer>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT BufferManager *NodeManagers::manager<Buffer>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT AttributeManager *NodeManagers::manager<Attribute>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT AttributeManager *NodeManagers::manager<Attribute>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT GeometryManager *NodeManagers::manager<Geometry>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT GeometryManager *NodeManagers::manager<Geometry>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT GeometryRendererManager *NodeManagers::manager<GeometryRenderer>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT GeometryRendererManager *NodeManagers::manager<GeometryRenderer>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT ObjectPickerManager *NodeManagers::manager<ObjectPicker>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT ObjectPickerManager *NodeManagers::manager<ObjectPicker>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT RayCasterManager *NodeManagers::manager<RayCaster>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT RayCasterManager *NodeManagers::manager<RayCaster>() const Q_DECL_NOEXCEPT; //template<> -//QT3DRENDERSHARED_PRIVATE_EXPORT BoundingVolumeDebugManager *NodeManagers::manager<BoundingVolumeDebug>() const Q_DECL_NOEXCEPT; +//Q_3DRENDERSHARED_PRIVATE_EXPORT BoundingVolumeDebugManager *NodeManagers::manager<BoundingVolumeDebug>() const Q_DECL_NOEXCEPT; template<> LightManager *NodeManagers::manager<Light>() const Q_DECL_NOEXCEPT; @@ -378,19 +378,19 @@ template<> EnvironmentLightManager *NodeManagers::manager<EnvironmentLight>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT ComputeCommandManager *NodeManagers::manager<ComputeCommand>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT ComputeCommandManager *NodeManagers::manager<ComputeCommand>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT RenderStateManager *NodeManagers::manager<RenderStateNode>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT RenderStateManager *NodeManagers::manager<RenderStateNode>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT ArmatureManager *NodeManagers::manager<Armature>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT ArmatureManager *NodeManagers::manager<Armature>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT SkeletonManager *NodeManagers::manager<Skeleton>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT SkeletonManager *NodeManagers::manager<Skeleton>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT JointManager *NodeManagers::manager<Joint>() const Q_DECL_NOEXCEPT; +Q_3DRENDERSHARED_PRIVATE_EXPORT JointManager *NodeManagers::manager<Joint>() const Q_DECL_NOEXCEPT; } // Render diff --git a/src/render/backend/platformsurfacefilter_p.h b/src/render/backend/platformsurfacefilter_p.h index 425ef303e..4fb43bae1 100644 --- a/src/render/backend/platformsurfacefilter_p.h +++ b/src/render/backend/platformsurfacefilter_p.h @@ -108,7 +108,7 @@ private: void markSurfaceAsValid(); }; -class QT3DRENDERSHARED_PRIVATE_EXPORT SurfaceLocker +class Q_3DRENDERSHARED_PRIVATE_EXPORT SurfaceLocker { public: explicit SurfaceLocker(QSurface *surface); diff --git a/src/render/backend/resourceaccessor_p.h b/src/render/backend/resourceaccessor_p.h index 627efcb0d..ec53a04a2 100644 --- a/src/render/backend/resourceaccessor_p.h +++ b/src/render/backend/resourceaccessor_p.h @@ -83,7 +83,7 @@ public: virtual bool accessResource(ResourceType type, Qt3DCore::QNodeId nodeId, void **handle, QMutex **lock) = 0; }; -class QT3DRENDERSHARED_PRIVATE_EXPORT ResourceAccessor : public RenderBackendResourceAccessor +class Q_3DRENDERSHARED_PRIVATE_EXPORT ResourceAccessor : public RenderBackendResourceAccessor { public: ResourceAccessor(NodeManagers *mgr); diff --git a/src/render/backend/trianglesvisitor_p.h b/src/render/backend/trianglesvisitor_p.h index ee206f1c9..d05eaef09 100644 --- a/src/render/backend/trianglesvisitor_p.h +++ b/src/render/backend/trianglesvisitor_p.h @@ -92,7 +92,7 @@ protected: Qt3DCore::QNodeId m_nodeId; }; -class QT3DRENDERSHARED_PRIVATE_EXPORT CoordinateReader +class Q_3DRENDERSHARED_PRIVATE_EXPORT CoordinateReader { public: explicit CoordinateReader(NodeManagers *manager) diff --git a/src/render/framegraph/qblitframebuffer.h b/src/render/framegraph/qblitframebuffer.h index 77b74ab53..79c216d24 100644 --- a/src/render/framegraph/qblitframebuffer.h +++ b/src/render/framegraph/qblitframebuffer.h @@ -51,7 +51,7 @@ namespace Qt3DRender { class QBlitFramebufferPrivate; class QRenderTarget; -class QT3DRENDERSHARED_EXPORT QBlitFramebuffer : public QFrameGraphNode +class Q_3DRENDERSHARED_EXPORT QBlitFramebuffer : public QFrameGraphNode { Q_OBJECT Q_PROPERTY(Qt3DRender::QRenderTarget *source READ source WRITE setSource NOTIFY sourceChanged) diff --git a/src/render/framegraph/qbuffercapture.h b/src/render/framegraph/qbuffercapture.h index ab8c7d2c2..e5073a308 100644 --- a/src/render/framegraph/qbuffercapture.h +++ b/src/render/framegraph/qbuffercapture.h @@ -51,7 +51,7 @@ namespace Qt3DRender class QBufferCapturePrivate; -class QT3DRENDERSHARED_EXPORT QBufferCapture : public QFrameGraphNode +class Q_3DRENDERSHARED_EXPORT QBufferCapture : public QFrameGraphNode { Q_OBJECT public: diff --git a/src/render/framegraph/qcameraselector.h b/src/render/framegraph/qcameraselector.h index 9aff269ca..861948d94 100644 --- a/src/render/framegraph/qcameraselector.h +++ b/src/render/framegraph/qcameraselector.h @@ -49,7 +49,7 @@ namespace Qt3DRender { class QCameraSelectorPrivate; -class QT3DRENDERSHARED_EXPORT QCameraSelector : public QFrameGraphNode +class Q_3DRENDERSHARED_EXPORT QCameraSelector : public QFrameGraphNode { Q_OBJECT Q_PROPERTY(Qt3DCore::QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged) diff --git a/src/render/framegraph/qclearbuffers.h b/src/render/framegraph/qclearbuffers.h index 7077b3f24..441a83e78 100644 --- a/src/render/framegraph/qclearbuffers.h +++ b/src/render/framegraph/qclearbuffers.h @@ -51,7 +51,7 @@ namespace Qt3DRender { class QClearBuffersPrivate; -class QT3DRENDERSHARED_EXPORT QClearBuffers : public QFrameGraphNode +class Q_3DRENDERSHARED_EXPORT QClearBuffers : public QFrameGraphNode { Q_OBJECT Q_PROPERTY(BufferType buffers READ buffers WRITE setBuffers NOTIFY buffersChanged) diff --git a/src/render/framegraph/qdispatchcompute.h b/src/render/framegraph/qdispatchcompute.h index 417796b61..dd6efb3ec 100644 --- a/src/render/framegraph/qdispatchcompute.h +++ b/src/render/framegraph/qdispatchcompute.h @@ -49,7 +49,7 @@ namespace Qt3DRender { class QDispatchComputePrivate; -class QT3DRENDERSHARED_EXPORT QDispatchCompute : public QFrameGraphNode +class Q_3DRENDERSHARED_EXPORT QDispatchCompute : public QFrameGraphNode { Q_OBJECT Q_PROPERTY(int workGroupX READ workGroupX WRITE setWorkGroupX NOTIFY workGroupXChanged) diff --git a/src/render/framegraph/qframegraphnode.h b/src/render/framegraph/qframegraphnode.h index 1a15c4df6..9b08c98d3 100644 --- a/src/render/framegraph/qframegraphnode.h +++ b/src/render/framegraph/qframegraphnode.h @@ -50,7 +50,7 @@ namespace Qt3DRender { class QFrameGraphNodePrivate; -class QT3DRENDERSHARED_EXPORT QFrameGraphNode : public Qt3DCore::QNode +class Q_3DRENDERSHARED_EXPORT QFrameGraphNode : public Qt3DCore::QNode { Q_OBJECT public: diff --git a/src/render/framegraph/qframegraphnodecreatedchange.h b/src/render/framegraph/qframegraphnodecreatedchange.h index f255ff406..96ca0fb38 100644 --- a/src/render/framegraph/qframegraphnodecreatedchange.h +++ b/src/render/framegraph/qframegraphnodecreatedchange.h @@ -47,7 +47,7 @@ namespace Qt3DRender { class QFrameGraphNode; class QFrameGraphNodeCreatedChangeBasePrivate; -class QT3DRENDERSHARED_EXPORT QFrameGraphNodeCreatedChangeBase : public Qt3DCore::QNodeCreatedChangeBase +class Q_3DRENDERSHARED_EXPORT QFrameGraphNodeCreatedChangeBase : public Qt3DCore::QNodeCreatedChangeBase { public: explicit QFrameGraphNodeCreatedChangeBase(const QFrameGraphNode *node); diff --git a/src/render/framegraph/qfrustumculling.h b/src/render/framegraph/qfrustumculling.h index f0ed6d032..b715a9a6f 100644 --- a/src/render/framegraph/qfrustumculling.h +++ b/src/render/framegraph/qfrustumculling.h @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_EXPORT QFrustumCulling : public QFrameGraphNode +class Q_3DRENDERSHARED_EXPORT QFrustumCulling : public QFrameGraphNode { Q_OBJECT public: diff --git a/src/render/framegraph/qlayerfilter.h b/src/render/framegraph/qlayerfilter.h index 3ccbdac54..dd628e74e 100644 --- a/src/render/framegraph/qlayerfilter.h +++ b/src/render/framegraph/qlayerfilter.h @@ -50,7 +50,7 @@ namespace Qt3DRender { class QLayer; class QLayerFilterPrivate; -class QT3DRENDERSHARED_EXPORT QLayerFilter : public QFrameGraphNode +class Q_3DRENDERSHARED_EXPORT QLayerFilter : public QFrameGraphNode { Q_OBJECT Q_PROPERTY(FilterMode filterMode READ filterMode WRITE setFilterMode NOTIFY filterModeChanged) diff --git a/src/render/framegraph/qmemorybarrier.h b/src/render/framegraph/qmemorybarrier.h index 244b7ef53..29b439700 100644 --- a/src/render/framegraph/qmemorybarrier.h +++ b/src/render/framegraph/qmemorybarrier.h @@ -48,7 +48,7 @@ namespace Qt3DRender { class QMemoryBarrierPrivate; -class QT3DRENDERSHARED_EXPORT QMemoryBarrier : public QFrameGraphNode +class Q_3DRENDERSHARED_EXPORT QMemoryBarrier : public QFrameGraphNode { Q_OBJECT public: diff --git a/src/render/framegraph/qnodraw.h b/src/render/framegraph/qnodraw.h index 4547aeeda..3782a88fc 100644 --- a/src/render/framegraph/qnodraw.h +++ b/src/render/framegraph/qnodraw.h @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_EXPORT QNoDraw : public QFrameGraphNode +class Q_3DRENDERSHARED_EXPORT QNoDraw : public QFrameGraphNode { Q_OBJECT public: diff --git a/src/render/framegraph/qproximityfilter.h b/src/render/framegraph/qproximityfilter.h index b101f6c09..56bcd6eaf 100644 --- a/src/render/framegraph/qproximityfilter.h +++ b/src/render/framegraph/qproximityfilter.h @@ -48,7 +48,7 @@ namespace Qt3DRender { class QProximityFilterPrivate; -class QT3DRENDERSHARED_EXPORT QProximityFilter : public QFrameGraphNode +class Q_3DRENDERSHARED_EXPORT QProximityFilter : public QFrameGraphNode { Q_OBJECT Q_PROPERTY(Qt3DCore::QEntity *entity READ entity WRITE setEntity NOTIFY entityChanged) diff --git a/src/render/framegraph/qrendercapture.h b/src/render/framegraph/qrendercapture.h index 119d6a6f3..8fa5d0455 100644 --- a/src/render/framegraph/qrendercapture.h +++ b/src/render/framegraph/qrendercapture.h @@ -47,7 +47,7 @@ namespace Qt3DRender { class QRenderCapturePrivate; class QRenderCaptureReplyPrivate; -class QT3DRENDERSHARED_EXPORT QRenderCaptureReply : public QObject +class Q_3DRENDERSHARED_EXPORT QRenderCaptureReply : public QObject { Q_OBJECT Q_PROPERTY(QImage image READ image CONSTANT) @@ -78,7 +78,7 @@ private: friend class QRenderCapturePrivate; }; -class QT3DRENDERSHARED_EXPORT QRenderCapture : public QFrameGraphNode +class Q_3DRENDERSHARED_EXPORT QRenderCapture : public QFrameGraphNode { Q_OBJECT public: diff --git a/src/render/framegraph/qrenderpassfilter.h b/src/render/framegraph/qrenderpassfilter.h index ffb305e14..9fb11757f 100644 --- a/src/render/framegraph/qrenderpassfilter.h +++ b/src/render/framegraph/qrenderpassfilter.h @@ -53,7 +53,7 @@ class QRenderPassFilterPrivate; class QFilterKey; class QParameter; -class QT3DRENDERSHARED_EXPORT QRenderPassFilter : public QFrameGraphNode +class Q_3DRENDERSHARED_EXPORT QRenderPassFilter : public QFrameGraphNode { Q_OBJECT diff --git a/src/render/framegraph/qrenderstateset.h b/src/render/framegraph/qrenderstateset.h index 3df86940b..b08da1ff5 100644 --- a/src/render/framegraph/qrenderstateset.h +++ b/src/render/framegraph/qrenderstateset.h @@ -49,7 +49,7 @@ namespace Qt3DRender { class QRenderStateSetPrivate; class QRenderState; -class QT3DRENDERSHARED_EXPORT QRenderStateSet : public QFrameGraphNode +class Q_3DRENDERSHARED_EXPORT QRenderStateSet : public QFrameGraphNode { Q_OBJECT diff --git a/src/render/framegraph/qrendersurfaceselector.h b/src/render/framegraph/qrendersurfaceselector.h index 5d0273187..73d513311 100644 --- a/src/render/framegraph/qrendersurfaceselector.h +++ b/src/render/framegraph/qrendersurfaceselector.h @@ -53,7 +53,7 @@ namespace Qt3DRender { class QRenderSurfaceSelectorPrivate; -class QT3DRENDERSHARED_EXPORT QRenderSurfaceSelector : public Qt3DRender::QFrameGraphNode +class Q_3DRENDERSHARED_EXPORT QRenderSurfaceSelector : public Qt3DRender::QFrameGraphNode { Q_OBJECT Q_PROPERTY(QObject *surface READ surface WRITE setSurface NOTIFY surfaceChanged) diff --git a/src/render/framegraph/qrendersurfaceselector_p.h b/src/render/framegraph/qrendersurfaceselector_p.h index 899387b98..70fdc5881 100644 --- a/src/render/framegraph/qrendersurfaceselector_p.h +++ b/src/render/framegraph/qrendersurfaceselector_p.h @@ -64,7 +64,7 @@ namespace Qt3DRender { class QRenderSurfaceSelector; -class QT3DRENDERSHARED_PRIVATE_EXPORT QRenderSurfaceSelectorPrivate : public Qt3DRender::QFrameGraphNodePrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QRenderSurfaceSelectorPrivate : public Qt3DRender::QFrameGraphNodePrivate { public: QRenderSurfaceSelectorPrivate(); diff --git a/src/render/framegraph/qrendertargetselector.h b/src/render/framegraph/qrendertargetselector.h index 5e8cd0761..c6b7b641d 100644 --- a/src/render/framegraph/qrendertargetselector.h +++ b/src/render/framegraph/qrendertargetselector.h @@ -52,7 +52,7 @@ namespace Qt3DRender { class QRenderTargetSelectorPrivate; class QRenderTarget; -class QT3DRENDERSHARED_EXPORT QRenderTargetSelector : public QFrameGraphNode +class Q_3DRENDERSHARED_EXPORT QRenderTargetSelector : public QFrameGraphNode { Q_OBJECT Q_PROPERTY(Qt3DRender::QRenderTarget *target READ target WRITE setTarget NOTIFY targetChanged) diff --git a/src/render/framegraph/qsetfence.h b/src/render/framegraph/qsetfence.h index 4834601ea..4ad92ae52 100644 --- a/src/render/framegraph/qsetfence.h +++ b/src/render/framegraph/qsetfence.h @@ -48,7 +48,7 @@ namespace Qt3DRender { class QSetFencePrivate; -class QT3DRENDERSHARED_EXPORT QSetFence : public QFrameGraphNode +class Q_3DRENDERSHARED_EXPORT QSetFence : public QFrameGraphNode { Q_OBJECT Q_PROPERTY(HandleType handleType READ handleType NOTIFY handleTypeChanged) diff --git a/src/render/framegraph/qsortpolicy.h b/src/render/framegraph/qsortpolicy.h index d94ee3d69..67dfe6ac2 100644 --- a/src/render/framegraph/qsortpolicy.h +++ b/src/render/framegraph/qsortpolicy.h @@ -48,7 +48,7 @@ namespace Qt3DRender { class QSortPolicyPrivate; -class QT3DRENDERSHARED_EXPORT QSortPolicy : public QFrameGraphNode +class Q_3DRENDERSHARED_EXPORT QSortPolicy : public QFrameGraphNode { Q_OBJECT Q_PROPERTY(QVector<int> sortTypes READ sortTypesInt WRITE setSortTypes NOTIFY sortTypesChanged) diff --git a/src/render/framegraph/qtechniquefilter.h b/src/render/framegraph/qtechniquefilter.h index 243b2d6ec..9fe872915 100644 --- a/src/render/framegraph/qtechniquefilter.h +++ b/src/render/framegraph/qtechniquefilter.h @@ -51,7 +51,7 @@ class QTechniqueFilterPrivate; class QFilterKey; class QParameter; -class QT3DRENDERSHARED_EXPORT QTechniqueFilter : public QFrameGraphNode +class Q_3DRENDERSHARED_EXPORT QTechniqueFilter : public QFrameGraphNode { Q_OBJECT public: diff --git a/src/render/framegraph/qtechniquefilter_p.h b/src/render/framegraph/qtechniquefilter_p.h index d25f10a79..10df8f5bf 100644 --- a/src/render/framegraph/qtechniquefilter_p.h +++ b/src/render/framegraph/qtechniquefilter_p.h @@ -60,7 +60,7 @@ namespace Qt3DRender { class QTechniqueFilter; -class QT3DRENDERSHARED_PRIVATE_EXPORT QTechniqueFilterPrivate : public QFrameGraphNodePrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QTechniqueFilterPrivate : public QFrameGraphNodePrivate { public : QTechniqueFilterPrivate(); diff --git a/src/render/framegraph/qviewport.h b/src/render/framegraph/qviewport.h index 1f6ac8310..01830be6a 100644 --- a/src/render/framegraph/qviewport.h +++ b/src/render/framegraph/qviewport.h @@ -50,7 +50,7 @@ namespace Qt3DRender { class QViewportPrivate; -class QT3DRENDERSHARED_EXPORT QViewport : public QFrameGraphNode +class Q_3DRENDERSHARED_EXPORT QViewport : public QFrameGraphNode { Q_OBJECT Q_PROPERTY(QRectF normalizedRect READ normalizedRect WRITE setNormalizedRect NOTIFY normalizedRectChanged) diff --git a/src/render/framegraph/qwaitfence.h b/src/render/framegraph/qwaitfence.h index 4f3e7ae8b..8148fde7d 100644 --- a/src/render/framegraph/qwaitfence.h +++ b/src/render/framegraph/qwaitfence.h @@ -48,7 +48,7 @@ namespace Qt3DRender { class QWaitFencePrivate; -class QT3DRENDERSHARED_EXPORT QWaitFence : public QFrameGraphNode +class Q_3DRENDERSHARED_EXPORT QWaitFence : public QFrameGraphNode { Q_OBJECT Q_PROPERTY(HandleType handleType READ handleType WRITE setHandleType NOTIFY handleTypeChanged) diff --git a/src/render/frontend/qabstractfunctor.h b/src/render/frontend/qabstractfunctor.h index e28535041..45492e141 100644 --- a/src/render/frontend/qabstractfunctor.h +++ b/src/render/frontend/qabstractfunctor.h @@ -73,7 +73,7 @@ qintptr functorTypeId() } -class QT3DRENDERSHARED_EXPORT QAbstractFunctor +class Q_3DRENDERSHARED_EXPORT QAbstractFunctor { public: QAbstractFunctor() = default; diff --git a/src/render/frontend/qcamera.h b/src/render/frontend/qcamera.h index e31615741..7d717972e 100644 --- a/src/render/frontend/qcamera.h +++ b/src/render/frontend/qcamera.h @@ -58,7 +58,7 @@ namespace Qt3DRender { class QCameraPrivate; -class QT3DRENDERSHARED_EXPORT QCamera : public Qt3DCore::QEntity +class Q_3DRENDERSHARED_EXPORT QCamera : public Qt3DCore::QEntity { Q_OBJECT // CameraLens diff --git a/src/render/frontend/qcamera_p.h b/src/render/frontend/qcamera_p.h index 1e8464d05..00d0bfd80 100644 --- a/src/render/frontend/qcamera_p.h +++ b/src/render/frontend/qcamera_p.h @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_PRIVATE_EXPORT QCameraPrivate : public Qt3DCore::QEntityPrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QCameraPrivate : public Qt3DCore::QEntityPrivate { public: QCameraPrivate(); diff --git a/src/render/frontend/qcameralens.h b/src/render/frontend/qcameralens.h index d478561ee..da7b426e1 100644 --- a/src/render/frontend/qcameralens.h +++ b/src/render/frontend/qcameralens.h @@ -53,7 +53,7 @@ namespace Qt3DRender { class QCameraLensPrivate; -class QT3DRENDERSHARED_EXPORT QCameraLens : public Qt3DCore::QComponent +class Q_3DRENDERSHARED_EXPORT QCameraLens : public Qt3DCore::QComponent { Q_OBJECT Q_PROPERTY(ProjectionType projectionType READ projectionType WRITE setProjectionType NOTIFY projectionTypeChanged) diff --git a/src/render/frontend/qcameralens_p.h b/src/render/frontend/qcameralens_p.h index 0ec197945..111ab6522 100644 --- a/src/render/frontend/qcameralens_p.h +++ b/src/render/frontend/qcameralens_p.h @@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_PRIVATE_EXPORT QCameraLensPrivate : public Qt3DCore::QComponentPrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QCameraLensPrivate : public Qt3DCore::QComponentPrivate { public: QCameraLensPrivate(); diff --git a/src/render/frontend/qcomputecommand.h b/src/render/frontend/qcomputecommand.h index f0c251a9b..b71007ba0 100644 --- a/src/render/frontend/qcomputecommand.h +++ b/src/render/frontend/qcomputecommand.h @@ -49,7 +49,7 @@ namespace Qt3DRender { class QComputeCommandPrivate; -class QT3DRENDERSHARED_EXPORT QComputeCommand : public Qt3DCore::QComponent +class Q_3DRENDERSHARED_EXPORT QComputeCommand : public Qt3DCore::QComponent { Q_OBJECT Q_PROPERTY(int workGroupX READ workGroupX WRITE setWorkGroupX NOTIFY workGroupXChanged) diff --git a/src/render/frontend/qcomputecommand_p.h b/src/render/frontend/qcomputecommand_p.h index fc3376d5b..0a614325b 100644 --- a/src/render/frontend/qcomputecommand_p.h +++ b/src/render/frontend/qcomputecommand_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_PRIVATE_EXPORT QComputeCommandPrivate : public Qt3DCore::QComponentPrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QComputeCommandPrivate : public Qt3DCore::QComponentPrivate { public: QComputeCommandPrivate(); diff --git a/src/render/frontend/qlayer.h b/src/render/frontend/qlayer.h index 27910f190..4900f30e0 100644 --- a/src/render/frontend/qlayer.h +++ b/src/render/frontend/qlayer.h @@ -50,7 +50,7 @@ namespace Qt3DRender { class QLayerPrivate; -class QT3DRENDERSHARED_EXPORT QLayer : public Qt3DCore::QComponent +class Q_3DRENDERSHARED_EXPORT QLayer : public Qt3DCore::QComponent { Q_OBJECT Q_PROPERTY(bool recursive READ recursive WRITE setRecursive NOTIFY recursiveChanged) diff --git a/src/render/frontend/qlayer_p.h b/src/render/frontend/qlayer_p.h index 1c01955f7..3a1fd7f61 100644 --- a/src/render/frontend/qlayer_p.h +++ b/src/render/frontend/qlayer_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_PRIVATE_EXPORT QLayerPrivate : public Qt3DCore::QComponentPrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QLayerPrivate : public Qt3DCore::QComponentPrivate { public: QLayerPrivate(); diff --git a/src/render/frontend/qlevelofdetail.h b/src/render/frontend/qlevelofdetail.h index fb74659dd..308a4d3c0 100644 --- a/src/render/frontend/qlevelofdetail.h +++ b/src/render/frontend/qlevelofdetail.h @@ -53,7 +53,7 @@ namespace Qt3DRender { class QCamera; class QLevelOfDetailPrivate; -class QT3DRENDERSHARED_EXPORT QLevelOfDetail : public Qt3DCore::QComponent +class Q_3DRENDERSHARED_EXPORT QLevelOfDetail : public Qt3DCore::QComponent { Q_OBJECT Q_PROPERTY(Qt3DRender::QCamera *camera READ camera WRITE setCamera NOTIFY cameraChanged) diff --git a/src/render/frontend/qlevelofdetail_p.h b/src/render/frontend/qlevelofdetail_p.h index 136d2ffa3..7b409e4ca 100644 --- a/src/render/frontend/qlevelofdetail_p.h +++ b/src/render/frontend/qlevelofdetail_p.h @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_PRIVATE_EXPORT QLevelOfDetailPrivate : public Qt3DCore::QComponentPrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QLevelOfDetailPrivate : public Qt3DCore::QComponentPrivate { public: QLevelOfDetailPrivate(); diff --git a/src/render/frontend/qlevelofdetailboundingsphere.h b/src/render/frontend/qlevelofdetailboundingsphere.h index 43ba422a8..81d49d04e 100644 --- a/src/render/frontend/qlevelofdetailboundingsphere.h +++ b/src/render/frontend/qlevelofdetailboundingsphere.h @@ -51,7 +51,7 @@ namespace Qt3DRender { class QLevelOfDetailBoundingSpherePrivate; -class QT3DRENDERSHARED_EXPORT QLevelOfDetailBoundingSphere +class Q_3DRENDERSHARED_EXPORT QLevelOfDetailBoundingSphere { Q_GADGET Q_PROPERTY(QVector3D center READ center CONSTANT) diff --git a/src/render/frontend/qlevelofdetailswitch.h b/src/render/frontend/qlevelofdetailswitch.h index 55c7d24c1..1615d16e6 100644 --- a/src/render/frontend/qlevelofdetailswitch.h +++ b/src/render/frontend/qlevelofdetailswitch.h @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_EXPORT QLevelOfDetailSwitch : public QLevelOfDetail +class Q_3DRENDERSHARED_EXPORT QLevelOfDetailSwitch : public QLevelOfDetail { Q_OBJECT diff --git a/src/render/frontend/qpickingsettings.h b/src/render/frontend/qpickingsettings.h index 741f918b0..11384414b 100644 --- a/src/render/frontend/qpickingsettings.h +++ b/src/render/frontend/qpickingsettings.h @@ -51,7 +51,7 @@ class QPickingSettingsPrivate; // TO DO: Qt 6 -> Make this a QObject -class QT3DRENDERSHARED_EXPORT QPickingSettings : public Qt3DCore::QNode +class Q_3DRENDERSHARED_EXPORT QPickingSettings : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(PickMethod pickMethod READ pickMethod WRITE setPickMethod NOTIFY pickMethodChanged) diff --git a/src/render/frontend/qpickingsettings_p.h b/src/render/frontend/qpickingsettings_p.h index 780a8b677..73f48c06e 100644 --- a/src/render/frontend/qpickingsettings_p.h +++ b/src/render/frontend/qpickingsettings_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_PRIVATE_EXPORT QPickingSettingsPrivate : public Qt3DCore::QNodePrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QPickingSettingsPrivate : public Qt3DCore::QNodePrivate { public: QPickingSettingsPrivate(); diff --git a/src/render/frontend/qrenderaspect.h b/src/render/frontend/qrenderaspect.h index bde60c9e2..5571988a7 100644 --- a/src/render/frontend/qrenderaspect.h +++ b/src/render/frontend/qrenderaspect.h @@ -65,7 +65,7 @@ class QRenderAspectPrivate; class QRenderAspectTester; #endif -class QT3DRENDERSHARED_EXPORT QRenderAspect : public Qt3DCore::QAbstractAspect +class Q_3DRENDERSHARED_EXPORT QRenderAspect : public Qt3DCore::QAbstractAspect { Q_OBJECT public: diff --git a/src/render/frontend/qrenderaspect_p.h b/src/render/frontend/qrenderaspect_p.h index 26ca091f6..4a091e164 100644 --- a/src/render/frontend/qrenderaspect_p.h +++ b/src/render/frontend/qrenderaspect_p.h @@ -75,7 +75,7 @@ namespace Render { class OffscreenSurfaceHelper; } -class QT3DRENDERSHARED_PRIVATE_EXPORT QRenderAspectPrivate : public Qt3DCore::QAbstractAspectPrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QRenderAspectPrivate : public Qt3DCore::QAbstractAspectPrivate { public: QRenderAspectPrivate(QRenderAspect::RenderType type); diff --git a/src/render/frontend/qrenderplugin_p.h b/src/render/frontend/qrenderplugin_p.h index 5144448c1..c34dabefc 100644 --- a/src/render/frontend/qrenderplugin_p.h +++ b/src/render/frontend/qrenderplugin_p.h @@ -64,7 +64,7 @@ namespace Render { class AbstractRenderer; -class QT3DRENDERSHARED_PRIVATE_EXPORT QRenderPlugin +class Q_3DRENDERSHARED_PRIVATE_EXPORT QRenderPlugin { public: virtual bool registerBackendTypes(QRenderAspect *aspect, AbstractRenderer *renderer) = 0; diff --git a/src/render/frontend/qrenderpluginfactory_p.h b/src/render/frontend/qrenderpluginfactory_p.h index 9cffd500a..26e856613 100644 --- a/src/render/frontend/qrenderpluginfactory_p.h +++ b/src/render/frontend/qrenderpluginfactory_p.h @@ -59,7 +59,7 @@ namespace Render { class QRenderPlugin; -class QT3DRENDERSHARED_PRIVATE_EXPORT QRenderPluginFactory +class Q_3DRENDERSHARED_PRIVATE_EXPORT QRenderPluginFactory { public: static QStringList keys(const QString &pluginPath = QString()); diff --git a/src/render/frontend/qrenderpluginfactoryif_p.h b/src/render/frontend/qrenderpluginfactoryif_p.h index d5f0008d2..249552b32 100644 --- a/src/render/frontend/qrenderpluginfactoryif_p.h +++ b/src/render/frontend/qrenderpluginfactoryif_p.h @@ -64,7 +64,7 @@ namespace Render { class QRenderPlugin; -class QT3DRENDERSHARED_PRIVATE_EXPORT QRenderPluginFactoryIf : public QObject +class Q_3DRENDERSHARED_PRIVATE_EXPORT QRenderPluginFactoryIf : public QObject { Q_OBJECT public: diff --git a/src/render/frontend/qrendersettings.h b/src/render/frontend/qrendersettings.h index b759ebd88..9d2baa58b 100644 --- a/src/render/frontend/qrendersettings.h +++ b/src/render/frontend/qrendersettings.h @@ -51,7 +51,7 @@ namespace Qt3DRender { class QFrameGraphNode; class QRenderSettingsPrivate; -class QT3DRENDERSHARED_EXPORT QRenderSettings : public Qt3DCore::QComponent +class Q_3DRENDERSHARED_EXPORT QRenderSettings : public Qt3DCore::QComponent { Q_OBJECT diff --git a/src/render/frontend/qrendersettings_p.h b/src/render/frontend/qrendersettings_p.h index 60ebd0f0d..f91397bd2 100644 --- a/src/render/frontend/qrendersettings_p.h +++ b/src/render/frontend/qrendersettings_p.h @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_PRIVATE_EXPORT QRenderSettingsPrivate : public Qt3DCore::QComponentPrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QRenderSettingsPrivate : public Qt3DCore::QComponentPrivate { public: QRenderSettingsPrivate(); diff --git a/src/render/frontend/qrendertarget.h b/src/render/frontend/qrendertarget.h index 69bed5aa5..9faf113da 100644 --- a/src/render/frontend/qrendertarget.h +++ b/src/render/frontend/qrendertarget.h @@ -50,7 +50,7 @@ namespace Qt3DRender { class QRenderTargetPrivate; class QRenderTargetOutput; -class QT3DRENDERSHARED_EXPORT QRenderTarget : public Qt3DCore::QComponent +class Q_3DRENDERSHARED_EXPORT QRenderTarget : public Qt3DCore::QComponent { Q_OBJECT public: diff --git a/src/render/frontend/qrendertarget_p.h b/src/render/frontend/qrendertarget_p.h index f1035e846..b08477478 100644 --- a/src/render/frontend/qrendertarget_p.h +++ b/src/render/frontend/qrendertarget_p.h @@ -61,7 +61,7 @@ namespace Qt3DRender { class QRenderTargetOutput; class QRenderTarget; -class QT3DRENDERSHARED_PRIVATE_EXPORT QRenderTargetPrivate : public Qt3DCore::QComponentPrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QRenderTargetPrivate : public Qt3DCore::QComponentPrivate { public: QRenderTargetPrivate(); diff --git a/src/render/frontend/qrendertargetoutput.h b/src/render/frontend/qrendertargetoutput.h index 2eb99df3c..a582c26f0 100644 --- a/src/render/frontend/qrendertargetoutput.h +++ b/src/render/frontend/qrendertargetoutput.h @@ -51,7 +51,7 @@ namespace Qt3DRender { class QAbstractTexture; class QRenderTargetOutputPrivate; -class QT3DRENDERSHARED_EXPORT QRenderTargetOutput : public Qt3DCore::QNode +class Q_3DRENDERSHARED_EXPORT QRenderTargetOutput : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(AttachmentPoint attachmentPoint READ attachmentPoint WRITE setAttachmentPoint NOTIFY attachmentPointChanged) diff --git a/src/render/frontend/qrendertargetoutput_p.h b/src/render/frontend/qrendertargetoutput_p.h index df855f184..e16a5eeb0 100644 --- a/src/render/frontend/qrendertargetoutput_p.h +++ b/src/render/frontend/qrendertargetoutput_p.h @@ -61,7 +61,7 @@ namespace Qt3DRender { class QAbstractTexture; -class QT3DRENDERSHARED_PRIVATE_EXPORT QRenderTargetOutputPrivate : public Qt3DCore::QNodePrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QRenderTargetOutputPrivate : public Qt3DCore::QNodePrivate { public: QRenderTargetOutputPrivate(); diff --git a/src/render/frontend/sphere_p.h b/src/render/frontend/sphere_p.h index 14b6f1414..10cf92091 100644 --- a/src/render/frontend/sphere_p.h +++ b/src/render/frontend/sphere_p.h @@ -64,7 +64,7 @@ namespace Qt3DRender { namespace Render { -class QT3DRENDERSHARED_PRIVATE_EXPORT Sphere : public RayCasting::BoundingSphere +class Q_3DRENDERSHARED_PRIVATE_EXPORT Sphere : public RayCasting::BoundingSphere { public: inline Sphere(Qt3DCore::QNodeId i = Qt3DCore::QNodeId()) @@ -158,7 +158,7 @@ inline bool intersects(const Sphere &a, const Sphere &b) } #ifndef QT_NO_DEBUG_STREAM -QT3DRENDERSHARED_EXPORT QDebug operator<<(QDebug dbg, const Sphere &sphere); +Q_3DRENDERSHARED_EXPORT QDebug operator<<(QDebug dbg, const Sphere &sphere); #endif } // Render diff --git a/src/render/geometry/qattribute.h b/src/render/geometry/qattribute.h index 13a0319b5..526a77a59 100644 --- a/src/render/geometry/qattribute.h +++ b/src/render/geometry/qattribute.h @@ -53,7 +53,7 @@ class QAttributePrivate; typedef QSharedPointer<QBuffer> QBufferPtr; -class QT3DRENDERSHARED_EXPORT QAttribute : public Qt3DCore::QNode +class Q_3DRENDERSHARED_EXPORT QAttribute : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(Qt3DRender::QBuffer *buffer READ buffer WRITE setBuffer NOTIFY bufferChanged) diff --git a/src/render/geometry/qattribute_p.h b/src/render/geometry/qattribute_p.h index d3385345a..8355a042b 100644 --- a/src/render/geometry/qattribute_p.h +++ b/src/render/geometry/qattribute_p.h @@ -62,7 +62,7 @@ namespace Qt3DRender { class QAttribute; -class QT3DRENDERSHARED_PRIVATE_EXPORT QAttributePrivate : public Qt3DCore::QNodePrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QAttributePrivate : public Qt3DCore::QNodePrivate { public: Q_DECLARE_PUBLIC(QAttribute) diff --git a/src/render/geometry/qbuffer.h b/src/render/geometry/qbuffer.h index f04c98a11..1bd1aa8fd 100644 --- a/src/render/geometry/qbuffer.h +++ b/src/render/geometry/qbuffer.h @@ -53,7 +53,7 @@ class QBufferPrivate; class QBufferDataGenerator; typedef QSharedPointer<QBufferDataGenerator> QBufferDataGeneratorPtr; -class QT3DRENDERSHARED_EXPORT QBuffer : public Qt3DCore::QNode +class Q_3DRENDERSHARED_EXPORT QBuffer : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(BufferType type READ type WRITE setType NOTIFY typeChanged) diff --git a/src/render/geometry/qbuffer_p.h b/src/render/geometry/qbuffer_p.h index a342518e0..7a0ffdfb9 100644 --- a/src/render/geometry/qbuffer_p.h +++ b/src/render/geometry/qbuffer_p.h @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_EXPORT QBufferPrivate : public Qt3DCore::QNodePrivate +class Q_3DRENDERSHARED_EXPORT QBufferPrivate : public Qt3DCore::QNodePrivate { public: Q_DECLARE_PUBLIC(QBuffer) diff --git a/src/render/geometry/qbufferdatagenerator.h b/src/render/geometry/qbufferdatagenerator.h index 004eb26eb..aea6eaef5 100644 --- a/src/render/geometry/qbufferdatagenerator.h +++ b/src/render/geometry/qbufferdatagenerator.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_EXPORT QBufferDataGenerator : public QAbstractFunctor +class Q_3DRENDERSHARED_EXPORT QBufferDataGenerator : public QAbstractFunctor { public: virtual ~QBufferDataGenerator() {} diff --git a/src/render/geometry/qgeometry.h b/src/render/geometry/qgeometry.h index 6f9f5511f..cae637f1f 100644 --- a/src/render/geometry/qgeometry.h +++ b/src/render/geometry/qgeometry.h @@ -50,7 +50,7 @@ namespace Qt3DRender { class QAttribute; class QGeometryPrivate; -class QT3DRENDERSHARED_EXPORT QGeometry : public Qt3DCore::QNode +class Q_3DRENDERSHARED_EXPORT QGeometry : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(Qt3DRender::QAttribute *boundingVolumePositionAttribute READ boundingVolumePositionAttribute WRITE setBoundingVolumePositionAttribute NOTIFY boundingVolumePositionAttributeChanged) diff --git a/src/render/geometry/qgeometry_p.h b/src/render/geometry/qgeometry_p.h index f53548e43..94f71d780 100644 --- a/src/render/geometry/qgeometry_p.h +++ b/src/render/geometry/qgeometry_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_PRIVATE_EXPORT QGeometryPrivate : public Qt3DCore::QNodePrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QGeometryPrivate : public Qt3DCore::QNodePrivate { public: Q_DECLARE_PUBLIC(QGeometry) diff --git a/src/render/geometry/qgeometryfactory.h b/src/render/geometry/qgeometryfactory.h index 2e4d5c821..92acbc67d 100644 --- a/src/render/geometry/qgeometryfactory.h +++ b/src/render/geometry/qgeometryfactory.h @@ -50,7 +50,7 @@ namespace Qt3DRender { class QGeometry; -class QT3DRENDERSHARED_EXPORT QGeometryFactory : public QAbstractFunctor +class Q_3DRENDERSHARED_EXPORT QGeometryFactory : public QAbstractFunctor { public: virtual ~QGeometryFactory(); diff --git a/src/render/geometry/qgeometryrenderer.h b/src/render/geometry/qgeometryrenderer.h index 85bab9fc6..81bd1ff67 100644 --- a/src/render/geometry/qgeometryrenderer.h +++ b/src/render/geometry/qgeometryrenderer.h @@ -53,7 +53,7 @@ class QGeometryFactory; typedef QSharedPointer<QGeometryFactory> QGeometryFactoryPtr; -class QT3DRENDERSHARED_EXPORT QGeometryRenderer : public Qt3DCore::QComponent +class Q_3DRENDERSHARED_EXPORT QGeometryRenderer : public Qt3DCore::QComponent { Q_OBJECT Q_PROPERTY(int instanceCount READ instanceCount WRITE setInstanceCount NOTIFY instanceCountChanged) diff --git a/src/render/geometry/qgeometryrenderer_p.h b/src/render/geometry/qgeometryrenderer_p.h index 8096b4a6b..32ca334e3 100644 --- a/src/render/geometry/qgeometryrenderer_p.h +++ b/src/render/geometry/qgeometryrenderer_p.h @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_PRIVATE_EXPORT QGeometryRendererPrivate : public Qt3DCore::QComponentPrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QGeometryRendererPrivate : public Qt3DCore::QComponentPrivate { public: QGeometryRendererPrivate(); diff --git a/src/render/geometry/qmesh.h b/src/render/geometry/qmesh.h index a7b2747f7..458a21fa4 100644 --- a/src/render/geometry/qmesh.h +++ b/src/render/geometry/qmesh.h @@ -54,7 +54,7 @@ class QMeshPrivate; * @brief Simple static mesh * */ -class QT3DRENDERSHARED_EXPORT QMesh : public QGeometryRenderer +class Q_3DRENDERSHARED_EXPORT QMesh : public QGeometryRenderer { Q_OBJECT Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) diff --git a/src/render/geometry/qmesh_p.h b/src/render/geometry/qmesh_p.h index 2d03e7862..4a4ff4979 100644 --- a/src/render/geometry/qmesh_p.h +++ b/src/render/geometry/qmesh_p.h @@ -69,7 +69,7 @@ namespace Render { class NodeManagers; } -class QT3DRENDERSHARED_PRIVATE_EXPORT QMeshPrivate : public QGeometryRendererPrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QMeshPrivate : public QGeometryRendererPrivate { public: QMeshPrivate(); diff --git a/src/render/io/qaxisalignedboundingbox_p.h b/src/render/io/qaxisalignedboundingbox_p.h index 7a88190b7..c77fa1147 100644 --- a/src/render/io/qaxisalignedboundingbox_p.h +++ b/src/render/io/qaxisalignedboundingbox_p.h @@ -86,7 +86,7 @@ public: bool isNull() const { return m_center.isNull() && m_radii.isNull(); } - void QT3DRENDERSHARED_PRIVATE_EXPORT update(const QVector<QVector3D> &points); + void Q_3DRENDERSHARED_PRIVATE_EXPORT update(const QVector<QVector3D> &points); inline QVector3D center() const { return m_center; } inline QVector3D radii() const { return m_radii; } diff --git a/src/render/io/qgeometryloaderfactory_p.h b/src/render/io/qgeometryloaderfactory_p.h index 6e0044c4a..b4f2be2b5 100644 --- a/src/render/io/qgeometryloaderfactory_p.h +++ b/src/render/io/qgeometryloaderfactory_p.h @@ -65,7 +65,7 @@ namespace Qt3DRender { class QGeometryLoaderInterface; -class QT3DRENDERSHARED_PRIVATE_EXPORT QGeometryLoaderFactory : public QObject, public QFactoryInterface +class Q_3DRENDERSHARED_PRIVATE_EXPORT QGeometryLoaderFactory : public QObject, public QFactoryInterface { Q_OBJECT Q_INTERFACES(QFactoryInterface) diff --git a/src/render/io/qgeometryloaderinterface_p.h b/src/render/io/qgeometryloaderinterface_p.h index 22d4f8bea..36928445f 100644 --- a/src/render/io/qgeometryloaderinterface_p.h +++ b/src/render/io/qgeometryloaderinterface_p.h @@ -63,7 +63,7 @@ namespace Qt3DRender { class QGeometry; -class QT3DRENDERSHARED_PRIVATE_EXPORT QGeometryLoaderInterface : public QObject +class Q_3DRENDERSHARED_PRIVATE_EXPORT QGeometryLoaderInterface : public QObject { public: virtual QGeometry *geometry() const = 0; diff --git a/src/render/io/qsceneexporter_p.h b/src/render/io/qsceneexporter_p.h index 3c8b92c77..7b92a0ff3 100644 --- a/src/render/io/qsceneexporter_p.h +++ b/src/render/io/qsceneexporter_p.h @@ -67,7 +67,7 @@ namespace Qt3DRender { Q_DECLARE_LOGGING_CATEGORY(SceneParsers) -class QT3DRENDERSHARED_PRIVATE_EXPORT QSceneExporter : public QObject +class Q_3DRENDERSHARED_PRIVATE_EXPORT QSceneExporter : public QObject { Q_OBJECT Q_PROPERTY(QStringList errors READ errors NOTIFY errorsChanged) diff --git a/src/render/io/qsceneexportfactory_p.h b/src/render/io/qsceneexportfactory_p.h index 5ff6149f4..fbb278ebe 100644 --- a/src/render/io/qsceneexportfactory_p.h +++ b/src/render/io/qsceneexportfactory_p.h @@ -61,7 +61,7 @@ namespace Qt3DRender { class QSceneExporter; -class QT3DRENDERSHARED_PRIVATE_EXPORT QSceneExportFactory +class Q_3DRENDERSHARED_PRIVATE_EXPORT QSceneExportFactory { public: static QStringList keys(const QString &pluginPath = QString()); diff --git a/src/render/io/qsceneexportplugin_p.h b/src/render/io/qsceneexportplugin_p.h index 3515cd425..dcc1c7769 100644 --- a/src/render/io/qsceneexportplugin_p.h +++ b/src/render/io/qsceneexportplugin_p.h @@ -65,7 +65,7 @@ namespace Qt3DRender { class QSceneExporter; -class QT3DRENDERSHARED_PRIVATE_EXPORT QSceneExportPlugin : public QObject +class Q_3DRENDERSHARED_PRIVATE_EXPORT QSceneExportPlugin : public QObject { Q_OBJECT public: diff --git a/src/render/io/qsceneimporter_p.h b/src/render/io/qsceneimporter_p.h index 8f83231c3..910a7fc66 100644 --- a/src/render/io/qsceneimporter_p.h +++ b/src/render/io/qsceneimporter_p.h @@ -67,7 +67,7 @@ namespace Qt3DRender { Q_DECLARE_LOGGING_CATEGORY(SceneParsers) -class QT3DRENDERSHARED_PRIVATE_EXPORT QSceneImporter : public QObject +class Q_3DRENDERSHARED_PRIVATE_EXPORT QSceneImporter : public QObject { Q_OBJECT Q_PROPERTY(ParserStatus status READ status NOTIFY statusChanged) diff --git a/src/render/io/qsceneimportfactory_p.h b/src/render/io/qsceneimportfactory_p.h index c66937fa1..8409ea96d 100644 --- a/src/render/io/qsceneimportfactory_p.h +++ b/src/render/io/qsceneimportfactory_p.h @@ -60,7 +60,7 @@ namespace Qt3DRender { class QSceneImporter; -class QT3DRENDERSHARED_PRIVATE_EXPORT QSceneImportFactory +class Q_3DRENDERSHARED_PRIVATE_EXPORT QSceneImportFactory { public: static QStringList keys(const QString &pluginPath = QString()); diff --git a/src/render/io/qsceneimportplugin_p.h b/src/render/io/qsceneimportplugin_p.h index 01ab84060..a24d1fa3e 100644 --- a/src/render/io/qsceneimportplugin_p.h +++ b/src/render/io/qsceneimportplugin_p.h @@ -65,7 +65,7 @@ namespace Qt3DRender { class QSceneImporter; -class QT3DRENDERSHARED_PRIVATE_EXPORT QSceneImportPlugin : public QObject +class Q_3DRENDERSHARED_PRIVATE_EXPORT QSceneImportPlugin : public QObject { Q_OBJECT public: diff --git a/src/render/io/qsceneloader.h b/src/render/io/qsceneloader.h index c69a4ad98..4cb743333 100644 --- a/src/render/io/qsceneloader.h +++ b/src/render/io/qsceneloader.h @@ -51,7 +51,7 @@ namespace Qt3DRender { class QSceneLoaderPrivate; -class QT3DRENDERSHARED_EXPORT QSceneLoader : public Qt3DCore::QComponent +class Q_3DRENDERSHARED_EXPORT QSceneLoader : public Qt3DCore::QComponent { Q_OBJECT Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) diff --git a/src/render/io/qsceneloader_p.h b/src/render/io/qsceneloader_p.h index 45a6a1a4e..50745c66f 100644 --- a/src/render/io/qsceneloader_p.h +++ b/src/render/io/qsceneloader_p.h @@ -61,7 +61,7 @@ namespace Qt3DRender { class QSceneImporter; -class QT3DRENDERSHARED_PRIVATE_EXPORT QSceneLoaderPrivate : public Qt3DCore::QComponentPrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QSceneLoaderPrivate : public Qt3DCore::QComponentPrivate { public: QSceneLoaderPrivate(); diff --git a/src/render/io/qurlhelper_p.h b/src/render/io/qurlhelper_p.h index c9c4cfd9b..d816d5d31 100644 --- a/src/render/io/qurlhelper_p.h +++ b/src/render/io/qurlhelper_p.h @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_EXPORT QUrlHelper +class Q_3DRENDERSHARED_EXPORT QUrlHelper { public: static QString urlToLocalFileOrQrc(const QUrl &url); diff --git a/src/render/jobs/calcboundingvolumejob_p.h b/src/render/jobs/calcboundingvolumejob_p.h index 41a8bd6c1..3b62c83cd 100644 --- a/src/render/jobs/calcboundingvolumejob_p.h +++ b/src/render/jobs/calcboundingvolumejob_p.h @@ -65,7 +65,7 @@ namespace Render { class NodeManagers; class Entity; -class QT3DRENDERSHARED_PRIVATE_EXPORT CalculateBoundingVolumeJob : public Qt3DCore::QAspectJob +class Q_3DRENDERSHARED_PRIVATE_EXPORT CalculateBoundingVolumeJob : public Qt3DCore::QAspectJob { public: explicit CalculateBoundingVolumeJob(); diff --git a/src/render/jobs/computefilteredboundingvolumejob_p.h b/src/render/jobs/computefilteredboundingvolumejob_p.h index ed336fe08..797a685ee 100644 --- a/src/render/jobs/computefilteredboundingvolumejob_p.h +++ b/src/render/jobs/computefilteredboundingvolumejob_p.h @@ -64,7 +64,7 @@ namespace Render { class Entity; class Sphere; -class QT3DRENDERSHARED_PRIVATE_EXPORT ComputeFilteredBoundingVolumeJob : public Qt3DCore::QAspectJob +class Q_3DRENDERSHARED_PRIVATE_EXPORT ComputeFilteredBoundingVolumeJob : public Qt3DCore::QAspectJob { public: ComputeFilteredBoundingVolumeJob(); diff --git a/src/render/jobs/expandboundingvolumejob_p.h b/src/render/jobs/expandboundingvolumejob_p.h index f468cf816..c577c90e2 100644 --- a/src/render/jobs/expandboundingvolumejob_p.h +++ b/src/render/jobs/expandboundingvolumejob_p.h @@ -63,7 +63,7 @@ namespace Render { class Entity; -class QT3DRENDERSHARED_PRIVATE_EXPORT ExpandBoundingVolumeJob : public Qt3DCore::QAspectJob +class Q_3DRENDERSHARED_PRIVATE_EXPORT ExpandBoundingVolumeJob : public Qt3DCore::QAspectJob { public: ExpandBoundingVolumeJob(); diff --git a/src/render/jobs/filterlayerentityjob_p.h b/src/render/jobs/filterlayerentityjob_p.h index 418f3ff3a..33023775f 100644 --- a/src/render/jobs/filterlayerentityjob_p.h +++ b/src/render/jobs/filterlayerentityjob_p.h @@ -65,7 +65,7 @@ namespace Render { class Entity; class NodeManagers; -class QT3DRENDERSHARED_PRIVATE_EXPORT FilterLayerEntityJob : public Qt3DCore::QAspectJob +class Q_3DRENDERSHARED_PRIVATE_EXPORT FilterLayerEntityJob : public Qt3DCore::QAspectJob { public: FilterLayerEntityJob(); diff --git a/src/render/jobs/framecleanupjob_p.h b/src/render/jobs/framecleanupjob_p.h index e3700fedc..78938a8cf 100644 --- a/src/render/jobs/framecleanupjob_p.h +++ b/src/render/jobs/framecleanupjob_p.h @@ -64,7 +64,7 @@ namespace Render { class NodeManagers; class Entity; -class QT3DRENDERSHARED_PRIVATE_EXPORT FrameCleanupJob : public Qt3DCore::QAspectJob +class Q_3DRENDERSHARED_PRIVATE_EXPORT FrameCleanupJob : public Qt3DCore::QAspectJob { public: explicit FrameCleanupJob(); diff --git a/src/render/jobs/sendbuffercapturejob_p.h b/src/render/jobs/sendbuffercapturejob_p.h index 854414ec6..f47c556df 100644 --- a/src/render/jobs/sendbuffercapturejob_p.h +++ b/src/render/jobs/sendbuffercapturejob_p.h @@ -68,7 +68,7 @@ class Entity; class Renderer; class Buffer; -class QT3DRENDERSHARED_PRIVATE_EXPORT SendBufferCaptureJob : public Qt3DCore::QAspectJob +class Q_3DRENDERSHARED_PRIVATE_EXPORT SendBufferCaptureJob : public Qt3DCore::QAspectJob { public: explicit SendBufferCaptureJob(); diff --git a/src/render/jobs/sendrendercapturejob_p.h b/src/render/jobs/sendrendercapturejob_p.h index 53b111ba6..8bc1e2fb0 100644 --- a/src/render/jobs/sendrendercapturejob_p.h +++ b/src/render/jobs/sendrendercapturejob_p.h @@ -63,7 +63,7 @@ namespace Render { class NodeManagers; class Entity; -class QT3DRENDERSHARED_PRIVATE_EXPORT SendRenderCaptureJob : public Qt3DCore::QAspectJob +class Q_3DRENDERSHARED_PRIVATE_EXPORT SendRenderCaptureJob : public Qt3DCore::QAspectJob { public: SendRenderCaptureJob(); diff --git a/src/render/jobs/updateentitylayersjob_p.h b/src/render/jobs/updateentitylayersjob_p.h index 8c73899d9..13cc2fc4c 100644 --- a/src/render/jobs/updateentitylayersjob_p.h +++ b/src/render/jobs/updateentitylayersjob_p.h @@ -65,7 +65,7 @@ class Entity; class NodeManagers; -class QT3DRENDERSHARED_PRIVATE_EXPORT UpdateEntityLayersJob: public Qt3DCore::QAspectJob +class Q_3DRENDERSHARED_PRIVATE_EXPORT UpdateEntityLayersJob: public Qt3DCore::QAspectJob { public: UpdateEntityLayersJob(); diff --git a/src/render/jobs/updatelevelofdetailjob_p.h b/src/render/jobs/updatelevelofdetailjob_p.h index 4c80a3205..c7045ee7f 100644 --- a/src/render/jobs/updatelevelofdetailjob_p.h +++ b/src/render/jobs/updatelevelofdetailjob_p.h @@ -66,7 +66,7 @@ class NodeManagers; class LevelOfDetail; class FrameGraphNode; -class QT3DRENDERSHARED_PRIVATE_EXPORT UpdateLevelOfDetailJob : public Qt3DCore::QAspectJob +class Q_3DRENDERSHARED_PRIVATE_EXPORT UpdateLevelOfDetailJob : public Qt3DCore::QAspectJob { public: UpdateLevelOfDetailJob(); diff --git a/src/render/jobs/updatemeshtrianglelistjob_p.h b/src/render/jobs/updatemeshtrianglelistjob_p.h index 9b67b9f49..048f8f01a 100644 --- a/src/render/jobs/updatemeshtrianglelistjob_p.h +++ b/src/render/jobs/updatemeshtrianglelistjob_p.h @@ -62,7 +62,7 @@ namespace Render { class NodeManagers; -class QT3DRENDERSHARED_PRIVATE_EXPORT UpdateMeshTriangleListJob : public Qt3DCore::QAspectJob +class Q_3DRENDERSHARED_PRIVATE_EXPORT UpdateMeshTriangleListJob : public Qt3DCore::QAspectJob { public: UpdateMeshTriangleListJob(); diff --git a/src/render/jobs/updateshaderdatatransformjob_p.h b/src/render/jobs/updateshaderdatatransformjob_p.h index 2fc06b8f7..bcf4eb6af 100644 --- a/src/render/jobs/updateshaderdatatransformjob_p.h +++ b/src/render/jobs/updateshaderdatatransformjob_p.h @@ -62,7 +62,7 @@ namespace Render { class NodeManagers; -class QT3DRENDERSHARED_PRIVATE_EXPORT UpdateShaderDataTransformJob : public Qt3DCore::QAspectJob +class Q_3DRENDERSHARED_PRIVATE_EXPORT UpdateShaderDataTransformJob : public Qt3DCore::QAspectJob { public: UpdateShaderDataTransformJob(); diff --git a/src/render/jobs/updatetreeenabledjob_p.h b/src/render/jobs/updatetreeenabledjob_p.h index 132271eaa..6eac75ea6 100644 --- a/src/render/jobs/updatetreeenabledjob_p.h +++ b/src/render/jobs/updatetreeenabledjob_p.h @@ -63,7 +63,7 @@ namespace Render { class Entity; -class QT3DRENDERSHARED_PRIVATE_EXPORT UpdateTreeEnabledJob : public Qt3DCore::QAspectJob +class Q_3DRENDERSHARED_PRIVATE_EXPORT UpdateTreeEnabledJob : public Qt3DCore::QAspectJob { public: UpdateTreeEnabledJob(); diff --git a/src/render/jobs/updateworldboundingvolumejob_p.h b/src/render/jobs/updateworldboundingvolumejob_p.h index affe78045..afb8cc6e1 100644 --- a/src/render/jobs/updateworldboundingvolumejob_p.h +++ b/src/render/jobs/updateworldboundingvolumejob_p.h @@ -62,7 +62,7 @@ namespace Render { class EntityManager; -class QT3DRENDERSHARED_PRIVATE_EXPORT UpdateWorldBoundingVolumeJob : public Qt3DCore::QAspectJob +class Q_3DRENDERSHARED_PRIVATE_EXPORT UpdateWorldBoundingVolumeJob : public Qt3DCore::QAspectJob { public: UpdateWorldBoundingVolumeJob(); diff --git a/src/render/jobs/updateworldtransformjob_p.h b/src/render/jobs/updateworldtransformjob_p.h index a85310e5c..a0ef25679 100644 --- a/src/render/jobs/updateworldtransformjob_p.h +++ b/src/render/jobs/updateworldtransformjob_p.h @@ -63,7 +63,7 @@ namespace Render { class Entity; -class QT3DRENDERSHARED_PRIVATE_EXPORT UpdateWorldTransformJob : public Qt3DCore::QAspectJob +class Q_3DRENDERSHARED_PRIVATE_EXPORT UpdateWorldTransformJob : public Qt3DCore::QAspectJob { public: UpdateWorldTransformJob(); diff --git a/src/render/lights/qabstractlight.h b/src/render/lights/qabstractlight.h index b5dd89222..e92a5ee1d 100644 --- a/src/render/lights/qabstractlight.h +++ b/src/render/lights/qabstractlight.h @@ -52,7 +52,7 @@ namespace Qt3DRender { class QAbstractLightPrivate; -class QT3DRENDERSHARED_EXPORT QAbstractLight : public Qt3DCore::QComponent +class Q_3DRENDERSHARED_EXPORT QAbstractLight : public Qt3DCore::QComponent { Q_OBJECT Q_PROPERTY(Type type READ type) diff --git a/src/render/lights/qabstractlight_p.h b/src/render/lights/qabstractlight_p.h index f7831dce2..ebb8092b4 100644 --- a/src/render/lights/qabstractlight_p.h +++ b/src/render/lights/qabstractlight_p.h @@ -61,7 +61,7 @@ namespace Qt3DRender { class QAbstractLight; -class QT3DRENDERSHARED_PRIVATE_EXPORT QAbstractLightPrivate : public Qt3DCore::QComponentPrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QAbstractLightPrivate : public Qt3DCore::QComponentPrivate { public: explicit QAbstractLightPrivate(QAbstractLight::Type type); diff --git a/src/render/lights/qdirectionallight.h b/src/render/lights/qdirectionallight.h index 6be1585db..5d572b9ea 100644 --- a/src/render/lights/qdirectionallight.h +++ b/src/render/lights/qdirectionallight.h @@ -48,7 +48,7 @@ namespace Qt3DRender { class QDirectionalLightPrivate; -class QT3DRENDERSHARED_EXPORT QDirectionalLight : public QAbstractLight +class Q_3DRENDERSHARED_EXPORT QDirectionalLight : public QAbstractLight { Q_OBJECT Q_PROPERTY(QVector3D worldDirection READ worldDirection WRITE setWorldDirection NOTIFY worldDirectionChanged) diff --git a/src/render/lights/qdirectionallight_p.h b/src/render/lights/qdirectionallight_p.h index ea80913eb..d57a95604 100644 --- a/src/render/lights/qdirectionallight_p.h +++ b/src/render/lights/qdirectionallight_p.h @@ -60,7 +60,7 @@ namespace Qt3DRender { class QDirectionalLight; -class QT3DRENDERSHARED_PRIVATE_EXPORT QDirectionalLightPrivate : QAbstractLightPrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QDirectionalLightPrivate : QAbstractLightPrivate { public: QDirectionalLightPrivate(); diff --git a/src/render/lights/qenvironmentlight.h b/src/render/lights/qenvironmentlight.h index 995768d3c..3afc44f28 100644 --- a/src/render/lights/qenvironmentlight.h +++ b/src/render/lights/qenvironmentlight.h @@ -50,7 +50,7 @@ namespace Qt3DRender { class QAbstractTexture; class QEnvironmentLightPrivate; -class QT3DRENDERSHARED_EXPORT QEnvironmentLight : public Qt3DCore::QComponent +class Q_3DRENDERSHARED_EXPORT QEnvironmentLight : public Qt3DCore::QComponent { Q_OBJECT Q_PROPERTY(Qt3DRender::QAbstractTexture *irradiance READ irradiance WRITE setIrradiance NOTIFY irradianceChanged) diff --git a/src/render/lights/qenvironmentlight_p.h b/src/render/lights/qenvironmentlight_p.h index f4fa97b5a..a512f8f5b 100644 --- a/src/render/lights/qenvironmentlight_p.h +++ b/src/render/lights/qenvironmentlight_p.h @@ -62,7 +62,7 @@ namespace Qt3DRender { class QAbstractTexture; class QEnvironmentLight; -class QT3DRENDERSHARED_PRIVATE_EXPORT QEnvironmentLightPrivate : public Qt3DCore::QComponentPrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QEnvironmentLightPrivate : public Qt3DCore::QComponentPrivate { public: explicit QEnvironmentLightPrivate(); diff --git a/src/render/lights/qpointlight.h b/src/render/lights/qpointlight.h index 16e048560..1efe1679a 100644 --- a/src/render/lights/qpointlight.h +++ b/src/render/lights/qpointlight.h @@ -48,7 +48,7 @@ namespace Qt3DRender { class QPointLightPrivate; -class QT3DRENDERSHARED_EXPORT QPointLight : public QAbstractLight +class Q_3DRENDERSHARED_EXPORT QPointLight : public QAbstractLight { Q_OBJECT Q_PROPERTY(float constantAttenuation READ constantAttenuation WRITE setConstantAttenuation NOTIFY constantAttenuationChanged) diff --git a/src/render/lights/qpointlight_p.h b/src/render/lights/qpointlight_p.h index 147867667..64c971291 100644 --- a/src/render/lights/qpointlight_p.h +++ b/src/render/lights/qpointlight_p.h @@ -60,7 +60,7 @@ namespace Qt3DRender { class QPointLight; -class QT3DRENDERSHARED_PRIVATE_EXPORT QPointLightPrivate : public QAbstractLightPrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QPointLightPrivate : public QAbstractLightPrivate { public: QPointLightPrivate(); diff --git a/src/render/lights/qspotlight.h b/src/render/lights/qspotlight.h index 8902708a3..760508b79 100644 --- a/src/render/lights/qspotlight.h +++ b/src/render/lights/qspotlight.h @@ -48,7 +48,7 @@ namespace Qt3DRender { class QSpotLightPrivate; -class QT3DRENDERSHARED_EXPORT QSpotLight : public QAbstractLight +class Q_3DRENDERSHARED_EXPORT QSpotLight : public QAbstractLight { Q_OBJECT Q_PROPERTY(float constantAttenuation READ constantAttenuation WRITE setConstantAttenuation NOTIFY constantAttenuationChanged) diff --git a/src/render/lights/qspotlight_p.h b/src/render/lights/qspotlight_p.h index eabc00353..2646a72cd 100644 --- a/src/render/lights/qspotlight_p.h +++ b/src/render/lights/qspotlight_p.h @@ -60,7 +60,7 @@ namespace Qt3DRender { class QSpotLight; -class QT3DRENDERSHARED_PRIVATE_EXPORT QSpotLightPrivate : public QAbstractLightPrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QSpotLightPrivate : public QAbstractLightPrivate { public: QSpotLightPrivate(); diff --git a/src/render/materialsystem/qeffect.h b/src/render/materialsystem/qeffect.h index 0a65311ba..decae6f39 100644 --- a/src/render/materialsystem/qeffect.h +++ b/src/render/materialsystem/qeffect.h @@ -51,7 +51,7 @@ class QParameter; class QTechnique; class QEffectPrivate; -class QT3DRENDERSHARED_EXPORT QEffect : public Qt3DCore::QNode +class Q_3DRENDERSHARED_EXPORT QEffect : public Qt3DCore::QNode { Q_OBJECT public: diff --git a/src/render/materialsystem/qeffect_p.h b/src/render/materialsystem/qeffect_p.h index 39c7d1ecc..c1fe22ec0 100644 --- a/src/render/materialsystem/qeffect_p.h +++ b/src/render/materialsystem/qeffect_p.h @@ -63,7 +63,7 @@ class QEffect; class QParameter; class QTechnique; -class QT3DRENDERSHARED_PRIVATE_EXPORT QEffectPrivate : public Qt3DCore::QNodePrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QEffectPrivate : public Qt3DCore::QNodePrivate { public : QEffectPrivate(); diff --git a/src/render/materialsystem/qfilterkey.h b/src/render/materialsystem/qfilterkey.h index 23c2dd342..d7dd470db 100644 --- a/src/render/materialsystem/qfilterkey.h +++ b/src/render/materialsystem/qfilterkey.h @@ -50,7 +50,7 @@ namespace Qt3DRender { class QFilterKeyPrivate; -class QT3DRENDERSHARED_EXPORT QFilterKey : public Qt3DCore::QNode +class Q_3DRENDERSHARED_EXPORT QFilterKey : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged) diff --git a/src/render/materialsystem/qfilterkey_p.h b/src/render/materialsystem/qfilterkey_p.h index 4050bc295..2174841a3 100644 --- a/src/render/materialsystem/qfilterkey_p.h +++ b/src/render/materialsystem/qfilterkey_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_PRIVATE_EXPORT QFilterKeyPrivate : public Qt3DCore::QNodePrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QFilterKeyPrivate : public Qt3DCore::QNodePrivate { public: QFilterKeyPrivate(); diff --git a/src/render/materialsystem/qgraphicsapifilter.h b/src/render/materialsystem/qgraphicsapifilter.h index 08b30b1f7..337193673 100644 --- a/src/render/materialsystem/qgraphicsapifilter.h +++ b/src/render/materialsystem/qgraphicsapifilter.h @@ -51,7 +51,7 @@ namespace Qt3DRender { class QGraphicsApiFilterPrivate; -class QT3DRENDERSHARED_EXPORT QGraphicsApiFilter : public QObject +class Q_3DRENDERSHARED_EXPORT QGraphicsApiFilter : public QObject { Q_OBJECT Q_PROPERTY(Qt3DRender::QGraphicsApiFilter::Api api READ api WRITE setApi NOTIFY apiChanged) diff --git a/src/render/materialsystem/qgraphicsapifilter_p.h b/src/render/materialsystem/qgraphicsapifilter_p.h index f4581ac05..3961d4f93 100644 --- a/src/render/materialsystem/qgraphicsapifilter_p.h +++ b/src/render/materialsystem/qgraphicsapifilter_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -struct QT3DRENDERSHARED_PRIVATE_EXPORT GraphicsApiFilterData +struct Q_3DRENDERSHARED_PRIVATE_EXPORT GraphicsApiFilterData { GraphicsApiFilterData(); @@ -75,7 +75,7 @@ struct QT3DRENDERSHARED_PRIVATE_EXPORT GraphicsApiFilterData bool operator <(const GraphicsApiFilterData &other) const; }; -class QT3DRENDERSHARED_PRIVATE_EXPORT QGraphicsApiFilterPrivate : public QObjectPrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QGraphicsApiFilterPrivate : public QObjectPrivate { public: QGraphicsApiFilterPrivate() diff --git a/src/render/materialsystem/qmaterial.h b/src/render/materialsystem/qmaterial.h index 9d1895294..d7d40f138 100644 --- a/src/render/materialsystem/qmaterial.h +++ b/src/render/materialsystem/qmaterial.h @@ -54,7 +54,7 @@ class QParameter; class QMaterialPrivate; class QEffect; -class QT3DRENDERSHARED_EXPORT QMaterial : public Qt3DCore::QComponent +class Q_3DRENDERSHARED_EXPORT QMaterial : public Qt3DCore::QComponent { Q_OBJECT Q_PROPERTY(Qt3DRender::QEffect *effect READ effect WRITE setEffect NOTIFY effectChanged) diff --git a/src/render/materialsystem/qmaterial_p.h b/src/render/materialsystem/qmaterial_p.h index 9fb8d5de9..273e044e2 100644 --- a/src/render/materialsystem/qmaterial_p.h +++ b/src/render/materialsystem/qmaterial_p.h @@ -61,7 +61,7 @@ namespace Qt3DRender { class QParameter; class QEffect; -class QT3DRENDERSHARED_PRIVATE_EXPORT QMaterialPrivate : public Qt3DCore::QComponentPrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QMaterialPrivate : public Qt3DCore::QComponentPrivate { public: QMaterialPrivate(); diff --git a/src/render/materialsystem/qparameter.h b/src/render/materialsystem/qparameter.h index 169543e24..8d56bcbe7 100644 --- a/src/render/materialsystem/qparameter.h +++ b/src/render/materialsystem/qparameter.h @@ -51,7 +51,7 @@ namespace Qt3DRender { class QParameterPrivate; class QAbstractTexture; -class QT3DRENDERSHARED_EXPORT QParameter : public Qt3DCore::QNode +class Q_3DRENDERSHARED_EXPORT QParameter : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) diff --git a/src/render/materialsystem/qparameter_p.h b/src/render/materialsystem/qparameter_p.h index a56a63af4..e8d74ac91 100644 --- a/src/render/materialsystem/qparameter_p.h +++ b/src/render/materialsystem/qparameter_p.h @@ -60,7 +60,7 @@ namespace Qt3DRender { class QParameter; -class QT3DRENDERSHARED_PRIVATE_EXPORT QParameterPrivate : public Qt3DCore::QNodePrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QParameterPrivate : public Qt3DCore::QNodePrivate { public: QParameterPrivate(); diff --git a/src/render/materialsystem/qrenderpass.h b/src/render/materialsystem/qrenderpass.h index 14bd34b37..b82a0d973 100644 --- a/src/render/materialsystem/qrenderpass.h +++ b/src/render/materialsystem/qrenderpass.h @@ -59,7 +59,7 @@ typedef QVector<QParameter*> ParameterList; class QRenderPassPrivate; -class QT3DRENDERSHARED_EXPORT QRenderPass : public Qt3DCore::QNode +class Q_3DRENDERSHARED_EXPORT QRenderPass : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(Qt3DRender::QShaderProgram *shaderProgram READ shaderProgram WRITE setShaderProgram NOTIFY shaderProgramChanged) diff --git a/src/render/materialsystem/qshaderdata.h b/src/render/materialsystem/qshaderdata.h index 5e57d11a4..eda009c6a 100644 --- a/src/render/materialsystem/qshaderdata.h +++ b/src/render/materialsystem/qshaderdata.h @@ -50,7 +50,7 @@ namespace Qt3DRender { class QShaderDataPrivate; -class QT3DRENDERSHARED_EXPORT PropertyReaderInterface +class Q_3DRENDERSHARED_EXPORT PropertyReaderInterface { public: virtual ~PropertyReaderInterface(); @@ -59,7 +59,7 @@ public: typedef QSharedPointer<PropertyReaderInterface> PropertyReaderInterfacePtr; -class QT3DRENDERSHARED_EXPORT QShaderData : public Qt3DCore::QComponent +class Q_3DRENDERSHARED_EXPORT QShaderData : public Qt3DCore::QComponent { Q_OBJECT public: diff --git a/src/render/materialsystem/qshaderdata_p.h b/src/render/materialsystem/qshaderdata_p.h index 258c962ee..18890aec9 100644 --- a/src/render/materialsystem/qshaderdata_p.h +++ b/src/render/materialsystem/qshaderdata_p.h @@ -86,7 +86,7 @@ class QShaderDataPropertyReader: public PropertyReaderInterface } }; -class QT3DRENDERSHARED_PRIVATE_EXPORT QShaderDataPrivate : public Qt3DCore::QComponentPrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QShaderDataPrivate : public Qt3DCore::QComponentPrivate { public: QShaderDataPrivate(); diff --git a/src/render/materialsystem/qshaderprogram.h b/src/render/materialsystem/qshaderprogram.h index efcfa792e..49c1076e5 100644 --- a/src/render/materialsystem/qshaderprogram.h +++ b/src/render/materialsystem/qshaderprogram.h @@ -49,7 +49,7 @@ namespace Qt3DRender { class QShaderProgramPrivate; -class QT3DRENDERSHARED_EXPORT QShaderProgram : public Qt3DCore::QNode +class Q_3DRENDERSHARED_EXPORT QShaderProgram : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(QByteArray vertexShaderCode READ vertexShaderCode WRITE setVertexShaderCode NOTIFY vertexShaderCodeChanged) diff --git a/src/render/materialsystem/qshaderprogrambuilder.h b/src/render/materialsystem/qshaderprogrambuilder.h index 33966b708..184093730 100644 --- a/src/render/materialsystem/qshaderprogrambuilder.h +++ b/src/render/materialsystem/qshaderprogrambuilder.h @@ -52,7 +52,7 @@ namespace Qt3DRender { class QShaderProgram; class QShaderProgramBuilderPrivate; -class QT3DRENDERSHARED_EXPORT QShaderProgramBuilder : public Qt3DCore::QNode +class Q_3DRENDERSHARED_EXPORT QShaderProgramBuilder : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(Qt3DRender::QShaderProgram* shaderProgram READ shaderProgram WRITE setShaderProgram NOTIFY shaderProgramChanged) diff --git a/src/render/materialsystem/qtechnique.h b/src/render/materialsystem/qtechnique.h index c0c0d0ade..7711cd67f 100644 --- a/src/render/materialsystem/qtechnique.h +++ b/src/render/materialsystem/qtechnique.h @@ -55,7 +55,7 @@ class QParameter; class QTechniquePrivate; class QGraphicsApiFilter; -class QT3DRENDERSHARED_EXPORT QTechnique : public Qt3DCore::QNode +class Q_3DRENDERSHARED_EXPORT QTechnique : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(Qt3DRender::QGraphicsApiFilter *graphicsApiFilter READ graphicsApiFilter CONSTANT) diff --git a/src/render/materialsystem/shaderbuilder_p.h b/src/render/materialsystem/shaderbuilder_p.h index e9378e3c5..00c4e1c28 100644 --- a/src/render/materialsystem/shaderbuilder_p.h +++ b/src/render/materialsystem/shaderbuilder_p.h @@ -61,7 +61,7 @@ namespace Qt3DRender { namespace Render { -class QT3DRENDERSHARED_PRIVATE_EXPORT ShaderBuilder : public BackendNode +class Q_3DRENDERSHARED_PRIVATE_EXPORT ShaderBuilder : public BackendNode { public: enum ShaderType { diff --git a/src/render/materialsystem/shadercache_p.h b/src/render/materialsystem/shadercache_p.h index bda629ee5..40b88b53e 100644 --- a/src/render/materialsystem/shadercache_p.h +++ b/src/render/materialsystem/shadercache_p.h @@ -66,7 +66,7 @@ namespace Render { class tst_ShaderCache; #endif -class QT3DRENDERSHARED_PRIVATE_EXPORT ShaderCache +class Q_3DRENDERSHARED_PRIVATE_EXPORT ShaderCache { public: ~ShaderCache(); diff --git a/src/render/materialsystem/technique_p.h b/src/render/materialsystem/technique_p.h index 0ca9d3ae9..d885c1b87 100644 --- a/src/render/materialsystem/technique_p.h +++ b/src/render/materialsystem/technique_p.h @@ -73,7 +73,7 @@ namespace Render { class TechniqueManager; -class QT3DRENDERSHARED_PRIVATE_EXPORT Technique : public BackendNode +class Q_3DRENDERSHARED_PRIVATE_EXPORT Technique : public BackendNode { public: Technique(); diff --git a/src/render/picking/qabstractraycaster.h b/src/render/picking/qabstractraycaster.h index c706a7bd2..592511786 100644 --- a/src/render/picking/qabstractraycaster.h +++ b/src/render/picking/qabstractraycaster.h @@ -53,7 +53,7 @@ namespace Qt3DRender { class QAbstractRayCasterPrivate; class QLayer; -class QT3DRENDERSHARED_EXPORT QAbstractRayCaster : public Qt3DCore::QComponent +class Q_3DRENDERSHARED_EXPORT QAbstractRayCaster : public Qt3DCore::QComponent { Q_OBJECT Q_PROPERTY(RunMode runMode READ runMode WRITE setRunMode NOTIFY runModeChanged) diff --git a/src/render/picking/qabstractraycaster_p.h b/src/render/picking/qabstractraycaster_p.h index 2c4006e70..2dcddbd6a 100644 --- a/src/render/picking/qabstractraycaster_p.h +++ b/src/render/picking/qabstractraycaster_p.h @@ -64,7 +64,7 @@ class QLayer; /*! \internal */ -class QT3DRENDERSHARED_PRIVATE_EXPORT QAbstractRayCasterPrivate : public Qt3DCore::QComponentPrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QAbstractRayCasterPrivate : public Qt3DCore::QComponentPrivate { public: QAbstractRayCasterPrivate(); diff --git a/src/render/picking/qobjectpicker.h b/src/render/picking/qobjectpicker.h index 616f23873..8866c99a9 100644 --- a/src/render/picking/qobjectpicker.h +++ b/src/render/picking/qobjectpicker.h @@ -51,7 +51,7 @@ class QAttribute; class QObjectPickerPrivate; class QPickEvent; -class QT3DRENDERSHARED_EXPORT QObjectPicker : public Qt3DCore::QComponent +class Q_3DRENDERSHARED_EXPORT QObjectPicker : public Qt3DCore::QComponent { Q_OBJECT Q_PROPERTY(bool hoverEnabled READ isHoverEnabled WRITE setHoverEnabled NOTIFY hoverEnabledChanged) diff --git a/src/render/picking/qobjectpicker_p.h b/src/render/picking/qobjectpicker_p.h index 384062bef..b95183ab5 100644 --- a/src/render/picking/qobjectpicker_p.h +++ b/src/render/picking/qobjectpicker_p.h @@ -59,7 +59,7 @@ namespace Qt3DRender { /*! \internal */ -class QT3DRENDERSHARED_PRIVATE_EXPORT QObjectPickerPrivate : public Qt3DCore::QComponentPrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QObjectPickerPrivate : public Qt3DCore::QComponentPrivate { public: QObjectPickerPrivate() diff --git a/src/render/picking/qpickevent.h b/src/render/picking/qpickevent.h index 7d854043e..5b354efb7 100644 --- a/src/render/picking/qpickevent.h +++ b/src/render/picking/qpickevent.h @@ -54,7 +54,7 @@ class QPickEventPrivate; class QPickEvent; typedef QSharedPointer<QPickEvent> QPickEventPtr; -class QT3DRENDERSHARED_EXPORT QPickEvent : public QObject +class Q_3DRENDERSHARED_EXPORT QPickEvent : public QObject { Q_OBJECT Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted NOTIFY acceptedChanged) diff --git a/src/render/picking/qpickevent_p.h b/src/render/picking/qpickevent_p.h index ced36c9bb..e27ee51e2 100644 --- a/src/render/picking/qpickevent_p.h +++ b/src/render/picking/qpickevent_p.h @@ -60,7 +60,7 @@ namespace Qt3DRender { class QPickEvent; -class QT3DRENDERSHARED_PRIVATE_EXPORT QPickEventPrivate : public QObjectPrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QPickEventPrivate : public QObjectPrivate { public: QPickEventPrivate() diff --git a/src/render/picking/qpicklineevent.h b/src/render/picking/qpicklineevent.h index 09697ad22..5941d38d4 100644 --- a/src/render/picking/qpicklineevent.h +++ b/src/render/picking/qpicklineevent.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { class QPickLineEventPrivate; -class QT3DRENDERSHARED_EXPORT QPickLineEvent : public QPickEvent +class Q_3DRENDERSHARED_EXPORT QPickLineEvent : public QPickEvent { Q_OBJECT Q_PROPERTY(uint edgeIndex READ edgeIndex CONSTANT) diff --git a/src/render/picking/qpickpointevent.h b/src/render/picking/qpickpointevent.h index f298f64b9..78ab23d9e 100644 --- a/src/render/picking/qpickpointevent.h +++ b/src/render/picking/qpickpointevent.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { class QPickPointEventPrivate; -class QT3DRENDERSHARED_EXPORT QPickPointEvent : public QPickEvent +class Q_3DRENDERSHARED_EXPORT QPickPointEvent : public QPickEvent { Q_OBJECT Q_PROPERTY(uint pointIndex READ pointIndex CONSTANT) diff --git a/src/render/picking/qpicktriangleevent.h b/src/render/picking/qpicktriangleevent.h index f116af288..48a1da762 100644 --- a/src/render/picking/qpicktriangleevent.h +++ b/src/render/picking/qpicktriangleevent.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { class QPickTriangleEventPrivate; -class QT3DRENDERSHARED_EXPORT QPickTriangleEvent : public QPickEvent +class Q_3DRENDERSHARED_EXPORT QPickTriangleEvent : public QPickEvent { Q_OBJECT Q_PROPERTY(uint triangleIndex READ triangleIndex CONSTANT) diff --git a/src/render/picking/qraycaster.h b/src/render/picking/qraycaster.h index 088c46607..b565c2c25 100644 --- a/src/render/picking/qraycaster.h +++ b/src/render/picking/qraycaster.h @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_EXPORT QRayCaster : public QAbstractRayCaster +class Q_3DRENDERSHARED_EXPORT QRayCaster : public QAbstractRayCaster { Q_OBJECT Q_PROPERTY(QVector3D origin READ origin WRITE setOrigin NOTIFY originChanged) diff --git a/src/render/picking/qraycasterhit.h b/src/render/picking/qraycasterhit.h index 4764994df..9f62889fd 100644 --- a/src/render/picking/qraycasterhit.h +++ b/src/render/picking/qraycasterhit.h @@ -53,7 +53,7 @@ namespace Qt3DRender { class QRayCasterHitData; class QAbstractRayCasterPrivate; -class QT3DRENDERSHARED_EXPORT QRayCasterHit +class Q_3DRENDERSHARED_EXPORT QRayCasterHit { Q_GADGET public: diff --git a/src/render/picking/qscreenraycaster.h b/src/render/picking/qscreenraycaster.h index 09ad94374..216ed47f5 100644 --- a/src/render/picking/qscreenraycaster.h +++ b/src/render/picking/qscreenraycaster.h @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_EXPORT QScreenRayCaster : public QAbstractRayCaster +class Q_3DRENDERSHARED_EXPORT QScreenRayCaster : public QAbstractRayCaster { Q_OBJECT diff --git a/src/render/qt3drender_global.h b/src/render/qt3drender_global.h index 68e1cb639..0bd34ac8b 100644 --- a/src/render/qt3drender_global.h +++ b/src/render/qt3drender_global.h @@ -46,12 +46,12 @@ QT_BEGIN_NAMESPACE #if defined(QT_SHARED) || !defined(QT_STATIC) # if defined(QT_BUILD_3DRENDER_LIB) -# define QT3DRENDERSHARED_EXPORT Q_DECL_EXPORT +# define Q_3DRENDERSHARED_EXPORT Q_DECL_EXPORT # else -# define QT3DRENDERSHARED_EXPORT Q_DECL_IMPORT +# define Q_3DRENDERSHARED_EXPORT Q_DECL_IMPORT # endif #else -# define QT3DRENDERSHARED_EXPORT +# define Q_3DRENDERSHARED_EXPORT #endif QT_END_NAMESPACE diff --git a/src/render/qt3drender_global_p.h b/src/render/qt3drender_global_p.h index bdc35fd86..5caa8d895 100644 --- a/src/render/qt3drender_global_p.h +++ b/src/render/qt3drender_global_p.h @@ -54,6 +54,6 @@ #include "qt3drender_global.h" #include <Qt3DRender/private/qt3drender-config_p.h> -#define QT3DRENDERSHARED_PRIVATE_EXPORT QT3DRENDERSHARED_EXPORT +#define Q_3DRENDERSHARED_PRIVATE_EXPORT Q_3DRENDERSHARED_EXPORT #endif // QT3DRENDER_GLOBAL_P_H diff --git a/src/render/raycasting/boundingsphere_p.h b/src/render/raycasting/boundingsphere_p.h index bcffbaa19..fb76a8496 100644 --- a/src/render/raycasting/boundingsphere_p.h +++ b/src/render/raycasting/boundingsphere_p.h @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { namespace RayCasting { -class QT3DRENDERSHARED_EXPORT BoundingSphere : public QBoundingVolume +class Q_3DRENDERSHARED_EXPORT BoundingSphere : public QBoundingVolume { public: BoundingSphere(); diff --git a/src/render/raycasting/qabstractcollisionqueryservice_p.h b/src/render/raycasting/qabstractcollisionqueryservice_p.h index fa35792d0..40137d239 100644 --- a/src/render/raycasting/qabstractcollisionqueryservice_p.h +++ b/src/render/raycasting/qabstractcollisionqueryservice_p.h @@ -77,7 +77,7 @@ public: {} }; -class QT3DRENDERSHARED_EXPORT QAbstractCollisionQueryService : public Qt3DCore::QAbstractServiceProvider +class Q_3DRENDERSHARED_EXPORT QAbstractCollisionQueryService : public Qt3DCore::QAbstractServiceProvider { Q_OBJECT public: diff --git a/src/render/raycasting/qboundingvolume_p.h b/src/render/raycasting/qboundingvolume_p.h index b63463f23..796085b25 100644 --- a/src/render/raycasting/qboundingvolume_p.h +++ b/src/render/raycasting/qboundingvolume_p.h @@ -61,7 +61,7 @@ namespace RayCasting { class QRay3D; -class QT3DRENDERSHARED_EXPORT QBoundingVolume +class Q_3DRENDERSHARED_EXPORT QBoundingVolume { public: QBoundingVolume(); diff --git a/src/render/raycasting/qboundingvolumeprovider_p.h b/src/render/raycasting/qboundingvolumeprovider_p.h index ae9fd65e3..42b95dd30 100644 --- a/src/render/raycasting/qboundingvolumeprovider_p.h +++ b/src/render/raycasting/qboundingvolumeprovider_p.h @@ -60,7 +60,7 @@ namespace RayCasting { class QBoundingVolume; -class QT3DRENDERSHARED_EXPORT QBoundingVolumeProvider +class Q_3DRENDERSHARED_EXPORT QBoundingVolumeProvider { public: virtual ~QBoundingVolumeProvider(); diff --git a/src/render/raycasting/qcollisionqueryresult_p.h b/src/render/raycasting/qcollisionqueryresult_p.h index 24371d30e..67f6a34d0 100644 --- a/src/render/raycasting/qcollisionqueryresult_p.h +++ b/src/render/raycasting/qcollisionqueryresult_p.h @@ -65,7 +65,7 @@ namespace RayCasting { typedef int QQueryHandle; class QCollisionQueryResultPrivate; -class QT3DRENDERSHARED_EXPORT QCollisionQueryResult +class Q_3DRENDERSHARED_EXPORT QCollisionQueryResult { public: struct Hit { diff --git a/src/render/raycasting/qray3d_p.h b/src/render/raycasting/qray3d_p.h index 8b7852cc3..7d1ac874e 100644 --- a/src/render/raycasting/qray3d_p.h +++ b/src/render/raycasting/qray3d_p.h @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { namespace RayCasting { -class QT3DRENDERSHARED_EXPORT QRay3D +class Q_3DRENDERSHARED_EXPORT QRay3D { public: QRay3D(); @@ -104,12 +104,12 @@ QT3D_DECLARE_TYPEINFO_2(Qt3DRender, RayCasting, QRay3D, Q_MOVABLE_TYPE) #ifndef QT_NO_DEBUG_STREAM -QT3DRENDERSHARED_EXPORT QDebug operator<<(QDebug dbg, const QRay3D &ray); +Q_3DRENDERSHARED_EXPORT QDebug operator<<(QDebug dbg, const QRay3D &ray); #endif #ifndef QT_NO_DATASTREAM -QT3DRENDERSHARED_EXPORT QDataStream &operator<<(QDataStream &stream, const QRay3D &ray); -QT3DRENDERSHARED_EXPORT QDataStream &operator>>(QDataStream &stream, QRay3D &ray); +Q_3DRENDERSHARED_EXPORT QDataStream &operator<<(QDataStream &stream, const QRay3D &ray); +Q_3DRENDERSHARED_EXPORT QDataStream &operator>>(QDataStream &stream, QRay3D &ray); #endif } // namespace RayCasting diff --git a/src/render/raycasting/qraycastingservice_p.h b/src/render/raycasting/qraycastingservice_p.h index b77c8af9f..792ba2626 100644 --- a/src/render/raycasting/qraycastingservice_p.h +++ b/src/render/raycasting/qraycastingservice_p.h @@ -69,7 +69,7 @@ class QRayCastingServicePrivate; typedef QFuture<QCollisionQueryResult> FutureQueryResult; -class QT3DRENDERSHARED_EXPORT QRayCastingService : public QAbstractCollisionQueryService +class Q_3DRENDERSHARED_EXPORT QRayCastingService : public QAbstractCollisionQueryService { public: QRayCastingService(); diff --git a/src/render/renderers/opengl/jobs/filtercompatibletechniquejob_p.h b/src/render/renderers/opengl/jobs/filtercompatibletechniquejob_p.h index 4f7a7146c..27b3d4ed2 100644 --- a/src/render/renderers/opengl/jobs/filtercompatibletechniquejob_p.h +++ b/src/render/renderers/opengl/jobs/filtercompatibletechniquejob_p.h @@ -64,7 +64,7 @@ namespace Render { class TechniqueManager; class Renderer; -class QT3DRENDERSHARED_PRIVATE_EXPORT FilterCompatibleTechniqueJob : public Qt3DCore::QAspectJob +class Q_3DRENDERSHARED_PRIVATE_EXPORT FilterCompatibleTechniqueJob : public Qt3DCore::QAspectJob { public: FilterCompatibleTechniqueJob(); diff --git a/src/render/renderers/opengl/jobs/materialparametergathererjob_p.h b/src/render/renderers/opengl/jobs/materialparametergathererjob_p.h index fbfac3364..6ba060841 100644 --- a/src/render/renderers/opengl/jobs/materialparametergathererjob_p.h +++ b/src/render/renderers/opengl/jobs/materialparametergathererjob_p.h @@ -70,7 +70,7 @@ class Renderer; // TO be executed for each FrameGraph branch with a given RenderPassFilter/TechniqueFilter -class QT3DRENDERSHARED_PRIVATE_EXPORT MaterialParameterGathererJob : public Qt3DCore::QAspectJob +class Q_3DRENDERSHARED_PRIVATE_EXPORT MaterialParameterGathererJob : public Qt3DCore::QAspectJob { public: MaterialParameterGathererJob(); diff --git a/src/render/renderers/opengl/renderer/renderer_p.h b/src/render/renderers/opengl/renderer/renderer_p.h index 33ecfe269..97bd4f73e 100644 --- a/src/render/renderers/opengl/renderer/renderer_p.h +++ b/src/render/renderers/opengl/renderer/renderer_p.h @@ -157,7 +157,7 @@ typedef QSharedPointer<UpdateLevelOfDetailJob> UpdateLevelOfDetailJobPtr; using SynchronizerJobPtr = GenericLambdaJobPtr<std::function<void()>>; using IntrospectShadersJobPtr = GenericLambdaJobPtr<std::function<void()>>; -class QT3DRENDERSHARED_PRIVATE_EXPORT Renderer : public AbstractRenderer +class Q_3DRENDERSHARED_PRIVATE_EXPORT Renderer : public AbstractRenderer { public: explicit Renderer(QRenderAspect::RenderType type); diff --git a/src/render/renderstates/qalphacoverage.h b/src/render/renderstates/qalphacoverage.h index 53636d300..7c4e1c2c8 100644 --- a/src/render/renderstates/qalphacoverage.h +++ b/src/render/renderstates/qalphacoverage.h @@ -49,7 +49,7 @@ namespace Qt3DRender { class QAlphaCoveragePrivate; -class QT3DRENDERSHARED_EXPORT QAlphaCoverage : public QRenderState +class Q_3DRENDERSHARED_EXPORT QAlphaCoverage : public QRenderState { Q_OBJECT public: diff --git a/src/render/renderstates/qalphatest.h b/src/render/renderstates/qalphatest.h index 8545d2043..7ec14eaee 100644 --- a/src/render/renderstates/qalphatest.h +++ b/src/render/renderstates/qalphatest.h @@ -49,7 +49,7 @@ namespace Qt3DRender { class QAlphaTestPrivate; -class QT3DRENDERSHARED_EXPORT QAlphaTest : public QRenderState +class Q_3DRENDERSHARED_EXPORT QAlphaTest : public QRenderState { Q_OBJECT Q_PROPERTY(AlphaFunction alphaFunction READ alphaFunction WRITE setAlphaFunction NOTIFY alphaFunctionChanged) diff --git a/src/render/renderstates/qblendequation.h b/src/render/renderstates/qblendequation.h index d084113d7..69a06768d 100644 --- a/src/render/renderstates/qblendequation.h +++ b/src/render/renderstates/qblendequation.h @@ -49,7 +49,7 @@ namespace Qt3DRender { class QBlendEquationPrivate; -class QT3DRENDERSHARED_EXPORT QBlendEquation : public QRenderState +class Q_3DRENDERSHARED_EXPORT QBlendEquation : public QRenderState { Q_OBJECT Q_PROPERTY(BlendFunction blendFunction READ blendFunction WRITE setBlendFunction NOTIFY blendFunctionChanged) diff --git a/src/render/renderstates/qblendequation_p.h b/src/render/renderstates/qblendequation_p.h index 228e61f15..c8a65de11 100644 --- a/src/render/renderstates/qblendequation_p.h +++ b/src/render/renderstates/qblendequation_p.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_PRIVATE_EXPORT QBlendEquationPrivate : public QRenderStatePrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QBlendEquationPrivate : public QRenderStatePrivate { public: QBlendEquationPrivate() diff --git a/src/render/renderstates/qblendequationarguments.h b/src/render/renderstates/qblendequationarguments.h index 1b2e039f7..e454dbae5 100644 --- a/src/render/renderstates/qblendequationarguments.h +++ b/src/render/renderstates/qblendequationarguments.h @@ -49,7 +49,7 @@ namespace Qt3DRender { class QBlendEquationArgumentsPrivate; -class QT3DRENDERSHARED_EXPORT QBlendEquationArguments : public QRenderState +class Q_3DRENDERSHARED_EXPORT QBlendEquationArguments : public QRenderState { Q_OBJECT Q_PROPERTY(Blending sourceRgb READ sourceRgb WRITE setSourceRgb NOTIFY sourceRgbChanged) diff --git a/src/render/renderstates/qblendequationarguments_p.h b/src/render/renderstates/qblendequationarguments_p.h index 110039295..d2aae69c7 100644 --- a/src/render/renderstates/qblendequationarguments_p.h +++ b/src/render/renderstates/qblendequationarguments_p.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_PRIVATE_EXPORT QBlendEquationArgumentsPrivate : public QRenderStatePrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QBlendEquationArgumentsPrivate : public QRenderStatePrivate { public: QBlendEquationArgumentsPrivate(Render::StateMask type = Render::BlendEquationArgumentsMask) diff --git a/src/render/renderstates/qclipplane.h b/src/render/renderstates/qclipplane.h index fa210d668..94bfaa57d 100644 --- a/src/render/renderstates/qclipplane.h +++ b/src/render/renderstates/qclipplane.h @@ -49,7 +49,7 @@ namespace Qt3DRender { class QClipPlanePrivate; -class QT3DRENDERSHARED_EXPORT QClipPlane : public QRenderState +class Q_3DRENDERSHARED_EXPORT QClipPlane : public QRenderState { Q_OBJECT Q_PROPERTY(int planeIndex READ planeIndex WRITE setPlaneIndex NOTIFY planeIndexChanged) diff --git a/src/render/renderstates/qclipplane_p.h b/src/render/renderstates/qclipplane_p.h index 517831e10..9c59675c6 100644 --- a/src/render/renderstates/qclipplane_p.h +++ b/src/render/renderstates/qclipplane_p.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_PRIVATE_EXPORT QClipPlanePrivate : public QRenderStatePrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QClipPlanePrivate : public QRenderStatePrivate { public: QClipPlanePrivate() diff --git a/src/render/renderstates/qcolormask.h b/src/render/renderstates/qcolormask.h index 7d28e80c6..980cde5ac 100644 --- a/src/render/renderstates/qcolormask.h +++ b/src/render/renderstates/qcolormask.h @@ -48,7 +48,7 @@ namespace Qt3DRender { class QColorMaskPrivate; -class QT3DRENDERSHARED_EXPORT QColorMask : public QRenderState +class Q_3DRENDERSHARED_EXPORT QColorMask : public QRenderState { Q_OBJECT Q_PROPERTY(bool redMasked READ isRedMasked WRITE setRedMasked NOTIFY redMaskedChanged) diff --git a/src/render/renderstates/qcolormask_p.h b/src/render/renderstates/qcolormask_p.h index 1e2386eb9..bd041de3b 100644 --- a/src/render/renderstates/qcolormask_p.h +++ b/src/render/renderstates/qcolormask_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_PRIVATE_EXPORT QColorMaskPrivate : public QRenderStatePrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QColorMaskPrivate : public QRenderStatePrivate { public: QColorMaskPrivate() diff --git a/src/render/renderstates/qcullface.h b/src/render/renderstates/qcullface.h index ab60d342e..053e86215 100644 --- a/src/render/renderstates/qcullface.h +++ b/src/render/renderstates/qcullface.h @@ -50,7 +50,7 @@ namespace Qt3DRender { class QCullFacePrivate; -class QT3DRENDERSHARED_EXPORT QCullFace : public QRenderState +class Q_3DRENDERSHARED_EXPORT QCullFace : public QRenderState { Q_OBJECT Q_PROPERTY(CullingMode mode READ mode WRITE setMode NOTIFY modeChanged) diff --git a/src/render/renderstates/qcullface_p.h b/src/render/renderstates/qcullface_p.h index 98cf99454..fd85b27a7 100644 --- a/src/render/renderstates/qcullface_p.h +++ b/src/render/renderstates/qcullface_p.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_PRIVATE_EXPORT QCullFacePrivate : public QRenderStatePrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QCullFacePrivate : public QRenderStatePrivate { public: QCullFacePrivate() diff --git a/src/render/renderstates/qdepthtest.h b/src/render/renderstates/qdepthtest.h index 91c06c649..419c36b57 100644 --- a/src/render/renderstates/qdepthtest.h +++ b/src/render/renderstates/qdepthtest.h @@ -49,7 +49,7 @@ namespace Qt3DRender { class QDepthTestPrivate; -class QT3DRENDERSHARED_EXPORT QDepthTest : public QRenderState +class Q_3DRENDERSHARED_EXPORT QDepthTest : public QRenderState { Q_OBJECT Q_PROPERTY(DepthFunction depthFunction READ depthFunction WRITE setDepthFunction NOTIFY depthFunctionChanged) diff --git a/src/render/renderstates/qdepthtest_p.h b/src/render/renderstates/qdepthtest_p.h index 555be2d4a..82689a50f 100644 --- a/src/render/renderstates/qdepthtest_p.h +++ b/src/render/renderstates/qdepthtest_p.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_PRIVATE_EXPORT QDepthTestPrivate : public QRenderStatePrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QDepthTestPrivate : public QRenderStatePrivate { public : QDepthTestPrivate() diff --git a/src/render/renderstates/qdithering.h b/src/render/renderstates/qdithering.h index db6667f8a..4f118977d 100644 --- a/src/render/renderstates/qdithering.h +++ b/src/render/renderstates/qdithering.h @@ -49,7 +49,7 @@ namespace Qt3DRender { class QDitheringPrivate; -class QT3DRENDERSHARED_EXPORT QDithering : public QRenderState +class Q_3DRENDERSHARED_EXPORT QDithering : public QRenderState { Q_OBJECT public: diff --git a/src/render/renderstates/qfrontface.h b/src/render/renderstates/qfrontface.h index 9ef32d8ed..10cc9b422 100644 --- a/src/render/renderstates/qfrontface.h +++ b/src/render/renderstates/qfrontface.h @@ -49,7 +49,7 @@ namespace Qt3DRender { class QFrontFacePrivate; -class QT3DRENDERSHARED_EXPORT QFrontFace : public QRenderState +class Q_3DRENDERSHARED_EXPORT QFrontFace : public QRenderState { Q_OBJECT Q_PROPERTY(WindingDirection direction READ direction WRITE setDirection NOTIFY directionChanged) diff --git a/src/render/renderstates/qfrontface_p.h b/src/render/renderstates/qfrontface_p.h index 3849714fd..605e78196 100644 --- a/src/render/renderstates/qfrontface_p.h +++ b/src/render/renderstates/qfrontface_p.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_PRIVATE_EXPORT QFrontFacePrivate : public QRenderStatePrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QFrontFacePrivate : public QRenderStatePrivate { public: QFrontFacePrivate() diff --git a/src/render/renderstates/qlinewidth.h b/src/render/renderstates/qlinewidth.h index 764ebc82a..3e53a5f29 100644 --- a/src/render/renderstates/qlinewidth.h +++ b/src/render/renderstates/qlinewidth.h @@ -47,7 +47,7 @@ namespace Qt3DRender { class QLineWidthPrivate; -class QT3DRENDERSHARED_EXPORT QLineWidth : public QRenderState +class Q_3DRENDERSHARED_EXPORT QLineWidth : public QRenderState { Q_OBJECT Q_PROPERTY(float value READ value WRITE setValue NOTIFY valueChanged) diff --git a/src/render/renderstates/qmultisampleantialiasing.h b/src/render/renderstates/qmultisampleantialiasing.h index 087f32ce2..5ac0dfdb5 100644 --- a/src/render/renderstates/qmultisampleantialiasing.h +++ b/src/render/renderstates/qmultisampleantialiasing.h @@ -48,7 +48,7 @@ namespace Qt3DRender { class QMultiSampleAntiAliasingPrivate; -class QT3DRENDERSHARED_EXPORT QMultiSampleAntiAliasing : public QRenderState +class Q_3DRENDERSHARED_EXPORT QMultiSampleAntiAliasing : public QRenderState { Q_OBJECT diff --git a/src/render/renderstates/qnodepthmask.h b/src/render/renderstates/qnodepthmask.h index 20171595e..221052699 100644 --- a/src/render/renderstates/qnodepthmask.h +++ b/src/render/renderstates/qnodepthmask.h @@ -49,7 +49,7 @@ namespace Qt3DRender { class QNoDepthMaskPrivate; -class QT3DRENDERSHARED_EXPORT QNoDepthMask : public QRenderState +class Q_3DRENDERSHARED_EXPORT QNoDepthMask : public QRenderState { Q_OBJECT public: diff --git a/src/render/renderstates/qpointsize.h b/src/render/renderstates/qpointsize.h index 7e50a7953..49fdd5c9c 100644 --- a/src/render/renderstates/qpointsize.h +++ b/src/render/renderstates/qpointsize.h @@ -47,7 +47,7 @@ namespace Qt3DRender { class QPointSizePrivate; -class QT3DRENDERSHARED_EXPORT QPointSize : public QRenderState +class Q_3DRENDERSHARED_EXPORT QPointSize : public QRenderState { Q_OBJECT Q_PROPERTY(SizeMode sizeMode READ sizeMode WRITE setSizeMode NOTIFY sizeModeChanged) diff --git a/src/render/renderstates/qpointsize_p.h b/src/render/renderstates/qpointsize_p.h index eb669b131..fab7baf30 100644 --- a/src/render/renderstates/qpointsize_p.h +++ b/src/render/renderstates/qpointsize_p.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_PRIVATE_EXPORT QPointSizePrivate : public QRenderStatePrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QPointSizePrivate : public QRenderStatePrivate { public: QPointSizePrivate(QPointSize::SizeMode sizeMode, float value) diff --git a/src/render/renderstates/qpolygonoffset.h b/src/render/renderstates/qpolygonoffset.h index f89203c6b..9ba18f2e4 100644 --- a/src/render/renderstates/qpolygonoffset.h +++ b/src/render/renderstates/qpolygonoffset.h @@ -48,7 +48,7 @@ namespace Qt3DRender { class QPolygonOffsetPrivate; -class QT3DRENDERSHARED_EXPORT QPolygonOffset : public QRenderState +class Q_3DRENDERSHARED_EXPORT QPolygonOffset : public QRenderState { Q_OBJECT diff --git a/src/render/renderstates/qpolygonoffset_p.h b/src/render/renderstates/qpolygonoffset_p.h index 66a62674e..11edaf445 100644 --- a/src/render/renderstates/qpolygonoffset_p.h +++ b/src/render/renderstates/qpolygonoffset_p.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_PRIVATE_EXPORT QPolygonOffsetPrivate : public QRenderStatePrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QPolygonOffsetPrivate : public QRenderStatePrivate { public: QPolygonOffsetPrivate() diff --git a/src/render/renderstates/qrenderstate.h b/src/render/renderstates/qrenderstate.h index 6892432be..3b7ff03bc 100644 --- a/src/render/renderstates/qrenderstate.h +++ b/src/render/renderstates/qrenderstate.h @@ -50,7 +50,7 @@ namespace Qt3DRender { class QRenderStatePrivate; -class QT3DRENDERSHARED_EXPORT QRenderState : public Qt3DCore::QNode +class Q_3DRENDERSHARED_EXPORT QRenderState : public Qt3DCore::QNode { Q_OBJECT public: diff --git a/src/render/renderstates/qrenderstate_p.h b/src/render/renderstates/qrenderstate_p.h index c3457afd7..e43097020 100644 --- a/src/render/renderstates/qrenderstate_p.h +++ b/src/render/renderstates/qrenderstate_p.h @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_PRIVATE_EXPORT QRenderStatePrivate : public Qt3DCore::QNodePrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QRenderStatePrivate : public Qt3DCore::QNodePrivate { public: explicit QRenderStatePrivate(Render::StateMask type); diff --git a/src/render/renderstates/qscissortest.h b/src/render/renderstates/qscissortest.h index f94e997f8..c808dc1c6 100644 --- a/src/render/renderstates/qscissortest.h +++ b/src/render/renderstates/qscissortest.h @@ -49,7 +49,7 @@ namespace Qt3DRender { class QScissorTestPrivate; -class QT3DRENDERSHARED_EXPORT QScissorTest : public QRenderState +class Q_3DRENDERSHARED_EXPORT QScissorTest : public QRenderState { Q_OBJECT Q_PROPERTY(int left READ left WRITE setLeft NOTIFY leftChanged) diff --git a/src/render/renderstates/qscissortest_p.h b/src/render/renderstates/qscissortest_p.h index 7c7bfdfe0..eebf3c326 100644 --- a/src/render/renderstates/qscissortest_p.h +++ b/src/render/renderstates/qscissortest_p.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_PRIVATE_EXPORT QScissorTestPrivate : public QRenderStatePrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QScissorTestPrivate : public QRenderStatePrivate { public: QScissorTestPrivate() diff --git a/src/render/renderstates/qseamlesscubemap.h b/src/render/renderstates/qseamlesscubemap.h index 40ae0a955..d2f63a8df 100644 --- a/src/render/renderstates/qseamlesscubemap.h +++ b/src/render/renderstates/qseamlesscubemap.h @@ -48,7 +48,7 @@ namespace Qt3DRender { class QSeamlessCubemapPrivate; -class QT3DRENDERSHARED_EXPORT QSeamlessCubemap : public QRenderState +class Q_3DRENDERSHARED_EXPORT QSeamlessCubemap : public QRenderState { Q_OBJECT diff --git a/src/render/renderstates/qstencilmask.h b/src/render/renderstates/qstencilmask.h index 5f6e3b686..08396a86f 100644 --- a/src/render/renderstates/qstencilmask.h +++ b/src/render/renderstates/qstencilmask.h @@ -48,7 +48,7 @@ namespace Qt3DRender { class QStencilMaskPrivate; -class QT3DRENDERSHARED_EXPORT QStencilMask : public QRenderState +class Q_3DRENDERSHARED_EXPORT QStencilMask : public QRenderState { Q_OBJECT Q_PROPERTY(uint frontOutputMask READ frontOutputMask WRITE setFrontOutputMask NOTIFY frontOutputMaskChanged) diff --git a/src/render/renderstates/qstencilmask_p.h b/src/render/renderstates/qstencilmask_p.h index 762b249f8..c9af3d7f1 100644 --- a/src/render/renderstates/qstencilmask_p.h +++ b/src/render/renderstates/qstencilmask_p.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_PRIVATE_EXPORT QStencilMaskPrivate : public QRenderStatePrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QStencilMaskPrivate : public QRenderStatePrivate { public: QStencilMaskPrivate() diff --git a/src/render/renderstates/qstenciloperation.h b/src/render/renderstates/qstenciloperation.h index 889bb73dc..90c7da7ba 100644 --- a/src/render/renderstates/qstenciloperation.h +++ b/src/render/renderstates/qstenciloperation.h @@ -49,7 +49,7 @@ namespace Qt3DRender { class QStencilOperationPrivate; class QStencilOperationArguments; -class QT3DRENDERSHARED_EXPORT QStencilOperation : public QRenderState +class Q_3DRENDERSHARED_EXPORT QStencilOperation : public QRenderState { Q_OBJECT Q_PROPERTY(Qt3DRender::QStencilOperationArguments *front READ front CONSTANT) diff --git a/src/render/renderstates/qstenciloperation_p.h b/src/render/renderstates/qstenciloperation_p.h index dbce734b1..a1c0cda4a 100644 --- a/src/render/renderstates/qstenciloperation_p.h +++ b/src/render/renderstates/qstenciloperation_p.h @@ -64,7 +64,7 @@ struct QStencilOperationData QStencilOperationArgumentsData back; }; -class QT3DRENDERSHARED_PRIVATE_EXPORT QStencilOperationPrivate : public QRenderStatePrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QStencilOperationPrivate : public QRenderStatePrivate { public: QStencilOperationPrivate() diff --git a/src/render/renderstates/qstenciloperationarguments.h b/src/render/renderstates/qstenciloperationarguments.h index 9705c9822..e8e23c6fe 100644 --- a/src/render/renderstates/qstenciloperationarguments.h +++ b/src/render/renderstates/qstenciloperationarguments.h @@ -50,7 +50,7 @@ namespace Qt3DRender { class QStencilOperationPrivate; class QStencilOperationArgumentsPrivate; -class QT3DRENDERSHARED_EXPORT QStencilOperationArguments : public QObject +class Q_3DRENDERSHARED_EXPORT QStencilOperationArguments : public QObject { Q_OBJECT Q_PROPERTY(FaceMode faceMode READ faceMode NOTIFY faceModeChanged) diff --git a/src/render/renderstates/qstenciloperationarguments_p.h b/src/render/renderstates/qstenciloperationarguments_p.h index 3babd3373..b24ddf09d 100644 --- a/src/render/renderstates/qstenciloperationarguments_p.h +++ b/src/render/renderstates/qstenciloperationarguments_p.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_PRIVATE_EXPORT QStencilOperationArgumentsPrivate : public QObjectPrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QStencilOperationArgumentsPrivate : public QObjectPrivate { public: QStencilOperationArgumentsPrivate(QStencilOperationArguments::FaceMode mode) diff --git a/src/render/renderstates/qstenciltest.h b/src/render/renderstates/qstenciltest.h index 0178ef968..f17baa23f 100644 --- a/src/render/renderstates/qstenciltest.h +++ b/src/render/renderstates/qstenciltest.h @@ -50,7 +50,7 @@ namespace Qt3DRender { class QStencilTestPrivate; class QStencilTestArguments; -class QT3DRENDERSHARED_EXPORT QStencilTest : public QRenderState +class Q_3DRENDERSHARED_EXPORT QStencilTest : public QRenderState { Q_OBJECT Q_PROPERTY(Qt3DRender::QStencilTestArguments *front READ front CONSTANT) diff --git a/src/render/renderstates/qstenciltest_p.h b/src/render/renderstates/qstenciltest_p.h index 838ba5bc0..328e34878 100644 --- a/src/render/renderstates/qstenciltest_p.h +++ b/src/render/renderstates/qstenciltest_p.h @@ -64,7 +64,7 @@ struct QStencilTestData QStencilTestArgumentsData back; }; -class QT3DRENDERSHARED_PRIVATE_EXPORT QStencilTestPrivate : public QRenderStatePrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QStencilTestPrivate : public QRenderStatePrivate { public: QStencilTestPrivate() diff --git a/src/render/renderstates/qstenciltestarguments.h b/src/render/renderstates/qstenciltestarguments.h index 35447d477..92696806d 100644 --- a/src/render/renderstates/qstenciltestarguments.h +++ b/src/render/renderstates/qstenciltestarguments.h @@ -50,7 +50,7 @@ namespace Qt3DRender { class QStencilTestPrivate; class QStencilTestArgumentsPrivate; -class QT3DRENDERSHARED_EXPORT QStencilTestArguments : public QObject +class Q_3DRENDERSHARED_EXPORT QStencilTestArguments : public QObject { Q_OBJECT Q_PROPERTY(StencilFaceMode faceMode READ faceMode NOTIFY faceModeChanged) diff --git a/src/render/renderstates/qstenciltestarguments_p.h b/src/render/renderstates/qstenciltestarguments_p.h index 662301843..9a85c93a6 100644 --- a/src/render/renderstates/qstenciltestarguments_p.h +++ b/src/render/renderstates/qstenciltestarguments_p.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_PRIVATE_EXPORT QStencilTestArgumentsPrivate : public QObjectPrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QStencilTestArgumentsPrivate : public QObjectPrivate { public: QStencilTestArgumentsPrivate(QStencilTestArguments::StencilFaceMode face) diff --git a/src/render/texture/qabstracttexture.h b/src/render/texture/qabstracttexture.h index 40953f253..6097e4449 100644 --- a/src/render/texture/qabstracttexture.h +++ b/src/render/texture/qabstracttexture.h @@ -55,7 +55,7 @@ class QTextureGenerator; typedef QSharedPointer<QTextureGenerator> QTextureGeneratorPtr; -class QT3DRENDERSHARED_EXPORT QAbstractTexture : public Qt3DCore::QNode +class Q_3DRENDERSHARED_EXPORT QAbstractTexture : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(Target target READ target CONSTANT) diff --git a/src/render/texture/qabstracttexture_p.h b/src/render/texture/qabstracttexture_p.h index 0ad1d0737..f4bdecacc 100644 --- a/src/render/texture/qabstracttexture_p.h +++ b/src/render/texture/qabstracttexture_p.h @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_PRIVATE_EXPORT QAbstractTexturePrivate : public Qt3DCore::QNodePrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QAbstractTexturePrivate : public Qt3DCore::QNodePrivate { public : QAbstractTexturePrivate(); diff --git a/src/render/texture/qabstracttextureimage.h b/src/render/texture/qabstracttextureimage.h index 7e840fdd4..e072a26dc 100644 --- a/src/render/texture/qabstracttextureimage.h +++ b/src/render/texture/qabstracttextureimage.h @@ -49,7 +49,7 @@ namespace Qt3DRender { class QAbstractTextureImagePrivate; -class QT3DRENDERSHARED_EXPORT QAbstractTextureImage : public Qt3DCore::QNode +class Q_3DRENDERSHARED_EXPORT QAbstractTextureImage : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(int mipLevel READ mipLevel WRITE setMipLevel NOTIFY mipLevelChanged) diff --git a/src/render/texture/qabstracttextureimage_p.h b/src/render/texture/qabstracttextureimage_p.h index f0d836055..a5299acd7 100644 --- a/src/render/texture/qabstracttextureimage_p.h +++ b/src/render/texture/qabstracttextureimage_p.h @@ -61,7 +61,7 @@ namespace Qt3DRender { class QAbstractTextureImage; -class QT3DRENDERSHARED_PRIVATE_EXPORT QAbstractTextureImagePrivate : public Qt3DCore::QNodePrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QAbstractTextureImagePrivate : public Qt3DCore::QNodePrivate { public: QAbstractTextureImagePrivate(); diff --git a/src/render/texture/qpaintedtextureimage.h b/src/render/texture/qpaintedtextureimage.h index 5b884a42e..1e8cf90ae 100644 --- a/src/render/texture/qpaintedtextureimage.h +++ b/src/render/texture/qpaintedtextureimage.h @@ -50,7 +50,7 @@ namespace Qt3DRender { class QPaintedTextureImagePrivate; -class QT3DRENDERSHARED_EXPORT QPaintedTextureImage : public QAbstractTextureImage +class Q_3DRENDERSHARED_EXPORT QPaintedTextureImage : public QAbstractTextureImage { Q_OBJECT Q_PROPERTY(int width READ width WRITE setWidth NOTIFY widthChanged) diff --git a/src/render/texture/qpaintedtextureimage_p.h b/src/render/texture/qpaintedtextureimage_p.h index 4e554f1c1..48553323d 100644 --- a/src/render/texture/qpaintedtextureimage_p.h +++ b/src/render/texture/qpaintedtextureimage_p.h @@ -63,7 +63,7 @@ class QPainter; namespace Qt3DRender { -class QT3DRENDERSHARED_PRIVATE_EXPORT QPaintedTextureImagePrivate : public QAbstractTextureImagePrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QPaintedTextureImagePrivate : public QAbstractTextureImagePrivate { public: QPaintedTextureImagePrivate(); diff --git a/src/render/texture/qtexture.h b/src/render/texture/qtexture.h index 991725de2..7556c6fc4 100644 --- a/src/render/texture/qtexture.h +++ b/src/render/texture/qtexture.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_EXPORT QTexture1D : public QAbstractTexture +class Q_3DRENDERSHARED_EXPORT QTexture1D : public QAbstractTexture { Q_OBJECT public: @@ -63,7 +63,7 @@ public: ~QTexture1D(); }; -class QT3DRENDERSHARED_EXPORT QTexture1DArray : public QAbstractTexture +class Q_3DRENDERSHARED_EXPORT QTexture1DArray : public QAbstractTexture { Q_OBJECT public: @@ -71,7 +71,7 @@ public: ~QTexture1DArray(); }; -class QT3DRENDERSHARED_EXPORT QTexture2D : public QAbstractTexture +class Q_3DRENDERSHARED_EXPORT QTexture2D : public QAbstractTexture { Q_OBJECT public: @@ -79,7 +79,7 @@ public: ~QTexture2D(); }; -class QT3DRENDERSHARED_EXPORT QTexture2DArray : public QAbstractTexture +class Q_3DRENDERSHARED_EXPORT QTexture2DArray : public QAbstractTexture { Q_OBJECT public: @@ -87,7 +87,7 @@ public: ~QTexture2DArray(); }; -class QT3DRENDERSHARED_EXPORT QTexture3D : public QAbstractTexture +class Q_3DRENDERSHARED_EXPORT QTexture3D : public QAbstractTexture { Q_OBJECT public: @@ -95,7 +95,7 @@ public: ~QTexture3D(); }; -class QT3DRENDERSHARED_EXPORT QTextureCubeMap : public QAbstractTexture +class Q_3DRENDERSHARED_EXPORT QTextureCubeMap : public QAbstractTexture { Q_OBJECT public: @@ -103,7 +103,7 @@ public: ~QTextureCubeMap(); }; -class QT3DRENDERSHARED_EXPORT QTextureCubeMapArray : public QAbstractTexture +class Q_3DRENDERSHARED_EXPORT QTextureCubeMapArray : public QAbstractTexture { Q_OBJECT public: @@ -111,7 +111,7 @@ public: ~QTextureCubeMapArray(); }; -class QT3DRENDERSHARED_EXPORT QTexture2DMultisample : public QAbstractTexture +class Q_3DRENDERSHARED_EXPORT QTexture2DMultisample : public QAbstractTexture { Q_OBJECT public: @@ -119,7 +119,7 @@ public: ~QTexture2DMultisample(); }; -class QT3DRENDERSHARED_EXPORT QTexture2DMultisampleArray : public QAbstractTexture +class Q_3DRENDERSHARED_EXPORT QTexture2DMultisampleArray : public QAbstractTexture { Q_OBJECT public: @@ -127,7 +127,7 @@ public: ~QTexture2DMultisampleArray(); }; -class QT3DRENDERSHARED_EXPORT QTextureRectangle : public QAbstractTexture +class Q_3DRENDERSHARED_EXPORT QTextureRectangle : public QAbstractTexture { Q_OBJECT public: @@ -135,7 +135,7 @@ public: ~QTextureRectangle(); }; -class QT3DRENDERSHARED_EXPORT QTextureBuffer : public QAbstractTexture +class Q_3DRENDERSHARED_EXPORT QTextureBuffer : public QAbstractTexture { Q_OBJECT public: @@ -145,7 +145,7 @@ public: class QTextureLoaderPrivate; -class QT3DRENDERSHARED_EXPORT QTextureLoader : public QAbstractTexture +class Q_3DRENDERSHARED_EXPORT QTextureLoader : public QAbstractTexture { Q_OBJECT Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) @@ -169,7 +169,7 @@ private: Q_DECLARE_PRIVATE(QTextureLoader) }; -class QT3DRENDERSHARED_EXPORT QSharedGLTexture : public QAbstractTexture +class Q_3DRENDERSHARED_EXPORT QSharedGLTexture : public QAbstractTexture { Q_OBJECT Q_PROPERTY(int textureId READ textureId WRITE setTextureId NOTIFY textureIdChanged) diff --git a/src/render/texture/qtexture_p.h b/src/render/texture/qtexture_p.h index 087480340..012b719ff 100644 --- a/src/render/texture/qtexture_p.h +++ b/src/render/texture/qtexture_p.h @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_PRIVATE_EXPORT QTextureLoaderPrivate : public QAbstractTexturePrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QTextureLoaderPrivate : public QAbstractTexturePrivate { public: QTextureLoaderPrivate(); diff --git a/src/render/texture/qtexturedata.h b/src/render/texture/qtexturedata.h index a86a3ec45..04324ca14 100644 --- a/src/render/texture/qtexturedata.h +++ b/src/render/texture/qtexturedata.h @@ -51,7 +51,7 @@ namespace Qt3DRender { class QTextureDataPrivate; -class QT3DRENDERSHARED_EXPORT QTextureData +class Q_3DRENDERSHARED_EXPORT QTextureData { public: QTextureData(); diff --git a/src/render/texture/qtexturegenerator.h b/src/render/texture/qtexturegenerator.h index 10f0cde57..7ae3d3a84 100644 --- a/src/render/texture/qtexturegenerator.h +++ b/src/render/texture/qtexturegenerator.h @@ -52,7 +52,7 @@ namespace Qt3DRender { class QTextureData; typedef QSharedPointer<QTextureData> QTextureDataPtr; -class QT3DRENDERSHARED_EXPORT QTextureGenerator : public QAbstractFunctor +class Q_3DRENDERSHARED_EXPORT QTextureGenerator : public QAbstractFunctor { public: virtual ~QTextureGenerator(); diff --git a/src/render/texture/qtextureimage.h b/src/render/texture/qtextureimage.h index d3fccde70..7d08c8e6e 100644 --- a/src/render/texture/qtextureimage.h +++ b/src/render/texture/qtextureimage.h @@ -49,7 +49,7 @@ namespace Qt3DRender { class QTextureImagePrivate; -class QT3DRENDERSHARED_EXPORT QTextureImage : public QAbstractTextureImage +class Q_3DRENDERSHARED_EXPORT QTextureImage : public QAbstractTextureImage { Q_OBJECT Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) diff --git a/src/render/texture/qtextureimage_p.h b/src/render/texture/qtextureimage_p.h index 5a4ea8f5a..3cb704cf8 100644 --- a/src/render/texture/qtextureimage_p.h +++ b/src/render/texture/qtextureimage_p.h @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_PRIVATE_EXPORT QTextureImagePrivate : public QAbstractTextureImagePrivate +class Q_3DRENDERSHARED_PRIVATE_EXPORT QTextureImagePrivate : public QAbstractTextureImagePrivate { public: QTextureImagePrivate() diff --git a/src/render/texture/qtextureimagedata.h b/src/render/texture/qtextureimagedata.h index 6d66f2390..68ceebabc 100644 --- a/src/render/texture/qtextureimagedata.h +++ b/src/render/texture/qtextureimagedata.h @@ -51,7 +51,7 @@ namespace Qt3DRender { class QTextureImageDataPrivate; -class QT3DRENDERSHARED_EXPORT QTextureImageData +class Q_3DRENDERSHARED_EXPORT QTextureImageData { public: QTextureImageData(); diff --git a/src/render/texture/qtextureimagedatagenerator.h b/src/render/texture/qtextureimagedatagenerator.h index 0e7e6c782..7c58b3878 100644 --- a/src/render/texture/qtextureimagedatagenerator.h +++ b/src/render/texture/qtextureimagedatagenerator.h @@ -55,7 +55,7 @@ namespace Qt3DRender { class QTextureImageData; typedef QSharedPointer<QTextureImageData> QTextureImageDataPtr; -class QT3DRENDERSHARED_EXPORT QTextureImageDataGenerator : public QAbstractFunctor +class Q_3DRENDERSHARED_EXPORT QTextureImageDataGenerator : public QAbstractFunctor { public: virtual ~QTextureImageDataGenerator() {} diff --git a/src/render/texture/qtexturewrapmode.h b/src/render/texture/qtexturewrapmode.h index 36af013a8..b31ccc17b 100644 --- a/src/render/texture/qtexturewrapmode.h +++ b/src/render/texture/qtexturewrapmode.h @@ -49,7 +49,7 @@ namespace Qt3DRender { class QTextureWrapModePrivate; -class QT3DRENDERSHARED_EXPORT QTextureWrapMode : public QObject +class Q_3DRENDERSHARED_EXPORT QTextureWrapMode : public QObject { Q_OBJECT Q_PROPERTY(WrapMode x READ x WRITE setX NOTIFY xChanged) |