diff options
Diffstat (limited to 'src/core')
88 files changed, 141 insertions, 115 deletions
diff --git a/src/core/aspects/qabstractaspect.h b/src/core/aspects/qabstractaspect.h index 8ac1b251f..1ae85e4e6 100644 --- a/src/core/aspects/qabstractaspect.h +++ b/src/core/aspects/qabstractaspect.h @@ -60,7 +60,7 @@ class QBackendNodeMapper; typedef QSharedPointer<QAspectJob> QAspectJobPtr; typedef QSharedPointer<QBackendNodeMapper> QBackendNodeMapperPtr; -class QT3DCORESHARED_EXPORT QAbstractAspect : public QObject +class Q_3DCORESHARED_EXPORT QAbstractAspect : public QObject { Q_OBJECT @@ -118,8 +118,8 @@ QT_END_NAMESPACE QT_BEGIN_NAMESPACE \ namespace Qt3DCore { \ typedef QAbstractAspect *(*AspectCreateFunction)(QObject *); \ - QT_DEPRECATED QT3DCORESHARED_EXPORT void qt3d_QAspectFactory_addDefaultFactory(const QString &, const QMetaObject *, AspectCreateFunction); \ - QT3DCORESHARED_EXPORT void qt3d_QAspectFactory_addDefaultFactory(const QLatin1String &, const QMetaObject *, AspectCreateFunction); \ + QT_DEPRECATED Q_3DCORESHARED_EXPORT void qt3d_QAspectFactory_addDefaultFactory(const QString &, const QMetaObject *, AspectCreateFunction); \ + Q_3DCORESHARED_EXPORT void qt3d_QAspectFactory_addDefaultFactory(const QLatin1String &, const QMetaObject *, AspectCreateFunction); \ } \ QT_END_NAMESPACE \ namespace { \ diff --git a/src/core/aspects/qabstractaspect_p.h b/src/core/aspects/qabstractaspect_p.h index 6b0490d91..e743dc63a 100644 --- a/src/core/aspects/qabstractaspect_p.h +++ b/src/core/aspects/qabstractaspect_p.h @@ -78,7 +78,7 @@ class QServiceLocator; namespace Debug { -class QT3DCORE_PRIVATE_EXPORT AsynchronousCommandReply : public QObject +class Q_3DCORE_PRIVATE_EXPORT AsynchronousCommandReply : public QObject { Q_OBJECT public: @@ -102,7 +102,7 @@ private: } // Debug -class QT3DCORE_PRIVATE_EXPORT QAbstractAspectPrivate +class Q_3DCORE_PRIVATE_EXPORT QAbstractAspectPrivate : public QObjectPrivate , public QBackendNodeFactory , public QSceneObserverInterface diff --git a/src/core/aspects/qaspectengine.h b/src/core/aspects/qaspectengine.h index 28b15046b..7f900ad52 100644 --- a/src/core/aspects/qaspectengine.h +++ b/src/core/aspects/qaspectengine.h @@ -56,7 +56,7 @@ class QNode; typedef QSharedPointer<QEntity> QEntityPtr; -class QT3DCORESHARED_EXPORT QAspectEngine : public QObject +class Q_3DCORESHARED_EXPORT QAspectEngine : public QObject { Q_OBJECT public: diff --git a/src/core/aspects/qaspectengine_p.h b/src/core/aspects/qaspectengine_p.h index 6b0aae9cb..2d7d0fe93 100644 --- a/src/core/aspects/qaspectengine_p.h +++ b/src/core/aspects/qaspectengine_p.h @@ -75,7 +75,7 @@ class AspectCommandDebugger; } // Debug #endif -class QT3DCORE_PRIVATE_EXPORT QAspectEnginePrivate : public QObjectPrivate +class Q_3DCORE_PRIVATE_EXPORT QAspectEnginePrivate : public QObjectPrivate { public: QAspectEnginePrivate(); diff --git a/src/core/aspects/qaspectfactory.cpp b/src/core/aspects/qaspectfactory.cpp index 94e04b34d..2f1530257 100644 --- a/src/core/aspects/qaspectfactory.cpp +++ b/src/core/aspects/qaspectfactory.cpp @@ -52,7 +52,7 @@ Q_GLOBAL_STATIC(defaultFactories_t, defaultFactories) typedef QHash<const QMetaObject*, QLatin1String> defaultAspectNames_t; Q_GLOBAL_STATIC(defaultAspectNames_t, defaultAspectNames) -QT3DCORESHARED_EXPORT void qt3d_QAspectFactory_addDefaultFactory(const QLatin1String &name, +Q_3DCORESHARED_EXPORT void qt3d_QAspectFactory_addDefaultFactory(const QLatin1String &name, const QMetaObject *metaObject, QAspectFactory::CreateFunction factory) { @@ -60,7 +60,7 @@ QT3DCORESHARED_EXPORT void qt3d_QAspectFactory_addDefaultFactory(const QLatin1St defaultAspectNames->insert(metaObject, name); } -QT3DCORESHARED_EXPORT void qt3d_QAspectFactory_addDefaultFactory(const QString &name, +Q_3DCORESHARED_EXPORT void qt3d_QAspectFactory_addDefaultFactory(const QString &name, const QMetaObject *metaObject, QAspectFactory::CreateFunction factory) { diff --git a/src/core/aspects/qaspectfactory_p.h b/src/core/aspects/qaspectfactory_p.h index 67b5e0b9d..41a063900 100644 --- a/src/core/aspects/qaspectfactory_p.h +++ b/src/core/aspects/qaspectfactory_p.h @@ -65,7 +65,7 @@ namespace Qt3DCore { class QAbstractAspect; -class QT3DCORE_PRIVATE_EXPORT QAspectFactory +class Q_3DCORE_PRIVATE_EXPORT QAspectFactory { public: typedef QAbstractAspect *(*CreateFunction)(QObject *); diff --git a/src/core/aspects/qaspectmanager_p.h b/src/core/aspects/qaspectmanager_p.h index 0a703a776..de978b8e9 100644 --- a/src/core/aspects/qaspectmanager_p.h +++ b/src/core/aspects/qaspectmanager_p.h @@ -75,7 +75,7 @@ class QAbstractAspectJobManager; class QSceneObserverInterface; class QServiceLocator; -class QT3DCORE_PRIVATE_EXPORT QAspectManager : public QObject +class Q_3DCORE_PRIVATE_EXPORT QAspectManager : public QObject { Q_OBJECT public: diff --git a/src/core/changes/qcomponentaddedchange.h b/src/core/changes/qcomponentaddedchange.h index e7676a026..ef2f6a227 100644 --- a/src/core/changes/qcomponentaddedchange.h +++ b/src/core/changes/qcomponentaddedchange.h @@ -50,7 +50,7 @@ class QComponent; class QEntity; class QComponentAddedChangePrivate; -class QT3DCORESHARED_EXPORT QComponentAddedChange : public QSceneChange +class Q_3DCORESHARED_EXPORT QComponentAddedChange : public QSceneChange { public: explicit QComponentAddedChange(const QEntity *entity, diff --git a/src/core/changes/qcomponentaddedchange_p.h b/src/core/changes/qcomponentaddedchange_p.h index 5eb453363..2a600288d 100644 --- a/src/core/changes/qcomponentaddedchange_p.h +++ b/src/core/changes/qcomponentaddedchange_p.h @@ -65,7 +65,7 @@ namespace Qt3DCore { class QComponent; class QEntity; -class QT3DCORE_PRIVATE_EXPORT QComponentAddedChangePrivate : public QSceneChangePrivate +class Q_3DCORE_PRIVATE_EXPORT QComponentAddedChangePrivate : public QSceneChangePrivate { public: QComponentAddedChangePrivate(const QEntity *entity, const QComponent *component); diff --git a/src/core/changes/qcomponentremovedchange.h b/src/core/changes/qcomponentremovedchange.h index 66743b1ae..8108b33d5 100644 --- a/src/core/changes/qcomponentremovedchange.h +++ b/src/core/changes/qcomponentremovedchange.h @@ -50,7 +50,7 @@ class QComponent; class QEntity; class QComponentRemovedChangePrivate; -class QT3DCORESHARED_EXPORT QComponentRemovedChange : public QSceneChange +class Q_3DCORESHARED_EXPORT QComponentRemovedChange : public QSceneChange { public: explicit QComponentRemovedChange(const QEntity *entity, diff --git a/src/core/changes/qcomponentremovedchange_p.h b/src/core/changes/qcomponentremovedchange_p.h index 5284c7bbd..fe84da252 100644 --- a/src/core/changes/qcomponentremovedchange_p.h +++ b/src/core/changes/qcomponentremovedchange_p.h @@ -65,7 +65,7 @@ namespace Qt3DCore { class QComponent; class QEntity; -class QT3DCORE_PRIVATE_EXPORT QComponentRemovedChangePrivate : public QSceneChangePrivate +class Q_3DCORE_PRIVATE_EXPORT QComponentRemovedChangePrivate : public QSceneChangePrivate { public: QComponentRemovedChangePrivate(const QEntity *entity, const QComponent *component); diff --git a/src/core/changes/qdynamicpropertyupdatedchange.h b/src/core/changes/qdynamicpropertyupdatedchange.h index 2eee6d6d6..0509582b0 100644 --- a/src/core/changes/qdynamicpropertyupdatedchange.h +++ b/src/core/changes/qdynamicpropertyupdatedchange.h @@ -48,7 +48,7 @@ namespace Qt3DCore { class QDynamicPropertyUpdatedChangePrivate; -class QT3DCORESHARED_EXPORT QDynamicPropertyUpdatedChange : public QPropertyUpdatedChangeBase +class Q_3DCORESHARED_EXPORT QDynamicPropertyUpdatedChange : public QPropertyUpdatedChangeBase { public: explicit QDynamicPropertyUpdatedChange(QNodeId subjectId); diff --git a/src/core/changes/qdynamicpropertyupdatedchange_p.h b/src/core/changes/qdynamicpropertyupdatedchange_p.h index c71c2a71a..233d55c8e 100644 --- a/src/core/changes/qdynamicpropertyupdatedchange_p.h +++ b/src/core/changes/qdynamicpropertyupdatedchange_p.h @@ -63,7 +63,7 @@ namespace Qt3DCore { class QPropertyUpdatedChange; class QFrameAllocator; -class QT3DCORE_PRIVATE_EXPORT QDynamicPropertyUpdatedChangePrivate : public QPropertyUpdatedChangeBasePrivate +class Q_3DCORE_PRIVATE_EXPORT QDynamicPropertyUpdatedChangePrivate : public QPropertyUpdatedChangeBasePrivate { public: QDynamicPropertyUpdatedChangePrivate(); diff --git a/src/core/changes/qnodecommand.h b/src/core/changes/qnodecommand.h index f4371b03c..3622f7421 100644 --- a/src/core/changes/qnodecommand.h +++ b/src/core/changes/qnodecommand.h @@ -48,7 +48,7 @@ namespace Qt3DCore { class QNodeCommandPrivate; -class QT3DCORESHARED_EXPORT QNodeCommand : public QSceneChange +class Q_3DCORESHARED_EXPORT QNodeCommand : public QSceneChange { public: #if defined(Q_ATOMIC_INT64_IS_SUPPORTED) diff --git a/src/core/changes/qnodecommand_p.h b/src/core/changes/qnodecommand_p.h index dd4259b20..e89dbe1a9 100644 --- a/src/core/changes/qnodecommand_p.h +++ b/src/core/changes/qnodecommand_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { -class QT3DCORE_PRIVATE_EXPORT QNodeCommandPrivate : public QSceneChangePrivate +class Q_3DCORE_PRIVATE_EXPORT QNodeCommandPrivate : public QSceneChangePrivate { public: QNodeCommandPrivate(); diff --git a/src/core/changes/qnodecreatedchange.h b/src/core/changes/qnodecreatedchange.h index 85444e00c..f46e8abee 100644 --- a/src/core/changes/qnodecreatedchange.h +++ b/src/core/changes/qnodecreatedchange.h @@ -48,7 +48,7 @@ namespace Qt3DCore { class QNode; class QNodeCreatedChangeBasePrivate; -class QT3DCORESHARED_EXPORT QNodeCreatedChangeBase : public QSceneChange +class Q_3DCORESHARED_EXPORT QNodeCreatedChangeBase : public QSceneChange { public: explicit QNodeCreatedChangeBase(const QNode *node); diff --git a/src/core/changes/qnodecreatedchange_p.h b/src/core/changes/qnodecreatedchange_p.h index 5e4c5b91d..153ccc0e8 100644 --- a/src/core/changes/qnodecreatedchange_p.h +++ b/src/core/changes/qnodecreatedchange_p.h @@ -61,7 +61,7 @@ namespace Qt3DCore { class QNode; -class QT3DCORE_PRIVATE_EXPORT QNodeCreatedChangeBasePrivate : public QSceneChangePrivate +class Q_3DCORE_PRIVATE_EXPORT QNodeCreatedChangeBasePrivate : public QSceneChangePrivate { public: QNodeCreatedChangeBasePrivate(const QNode *node); diff --git a/src/core/changes/qnodedestroyedchange.h b/src/core/changes/qnodedestroyedchange.h index 11a54f8e2..c072dd412 100644 --- a/src/core/changes/qnodedestroyedchange.h +++ b/src/core/changes/qnodedestroyedchange.h @@ -47,7 +47,7 @@ namespace Qt3DCore { class QNodeDestroyedChangePrivate; -class QT3DCORESHARED_EXPORT QNodeDestroyedChange : public QSceneChange +class Q_3DCORESHARED_EXPORT QNodeDestroyedChange : public QSceneChange { public: explicit QNodeDestroyedChange(const QNode *node, const QVector<QNodeIdTypePair> &subtreeIdsAndTypes); diff --git a/src/core/changes/qpropertynodeaddedchange.h b/src/core/changes/qpropertynodeaddedchange.h index a816f711c..ce3288a65 100644 --- a/src/core/changes/qpropertynodeaddedchange.h +++ b/src/core/changes/qpropertynodeaddedchange.h @@ -50,7 +50,7 @@ namespace Qt3DCore { class QPropertyNodeAddedChangePrivate; -class QT3DCORESHARED_EXPORT QPropertyNodeAddedChange : public QStaticPropertyValueAddedChangeBase +class Q_3DCORESHARED_EXPORT QPropertyNodeAddedChange : public QStaticPropertyValueAddedChangeBase { public: explicit QPropertyNodeAddedChange(QNodeId subjectId, QNode *node); diff --git a/src/core/changes/qpropertynoderemovedchange.h b/src/core/changes/qpropertynoderemovedchange.h index d97bec6e6..1a4db8f1c 100644 --- a/src/core/changes/qpropertynoderemovedchange.h +++ b/src/core/changes/qpropertynoderemovedchange.h @@ -50,7 +50,7 @@ namespace Qt3DCore { class QPropertyNodeRemovedChangePrivate; -class QT3DCORESHARED_EXPORT QPropertyNodeRemovedChange : public QStaticPropertyValueRemovedChangeBase +class Q_3DCORESHARED_EXPORT QPropertyNodeRemovedChange : public QStaticPropertyValueRemovedChangeBase { public: explicit QPropertyNodeRemovedChange(QNodeId subjectId, QNode *node); diff --git a/src/core/changes/qpropertyupdatedchange.h b/src/core/changes/qpropertyupdatedchange.h index acec44694..e0c12f13d 100644 --- a/src/core/changes/qpropertyupdatedchange.h +++ b/src/core/changes/qpropertyupdatedchange.h @@ -48,7 +48,7 @@ namespace Qt3DCore { class QPropertyUpdatedChangePrivate; -class QT3DCORESHARED_EXPORT QPropertyUpdatedChange : public QStaticPropertyUpdatedChangeBase +class Q_3DCORESHARED_EXPORT QPropertyUpdatedChange : public QStaticPropertyUpdatedChangeBase { public: explicit QPropertyUpdatedChange(QNodeId subjectId); diff --git a/src/core/changes/qpropertyupdatedchangebase.h b/src/core/changes/qpropertyupdatedchangebase.h index 1abbd899a..800abb477 100644 --- a/src/core/changes/qpropertyupdatedchangebase.h +++ b/src/core/changes/qpropertyupdatedchangebase.h @@ -50,7 +50,7 @@ namespace Qt3DCore { class QPropertyUpdatedChangeBasePrivate; -class QT3DCORESHARED_EXPORT QPropertyUpdatedChangeBase : public QSceneChange +class Q_3DCORESHARED_EXPORT QPropertyUpdatedChangeBase : public QSceneChange { public: ~QPropertyUpdatedChangeBase(); diff --git a/src/core/changes/qpropertyupdatedchangebase_p.h b/src/core/changes/qpropertyupdatedchangebase_p.h index 7c66812a1..6dd7186f2 100644 --- a/src/core/changes/qpropertyupdatedchangebase_p.h +++ b/src/core/changes/qpropertyupdatedchangebase_p.h @@ -60,7 +60,7 @@ namespace Qt3DCore { class QPropertyUpdatedChangeBase; -class QT3DCORE_PRIVATE_EXPORT QPropertyUpdatedChangeBasePrivate : public QSceneChangePrivate +class Q_3DCORE_PRIVATE_EXPORT QPropertyUpdatedChangeBasePrivate : public QSceneChangePrivate { public: QPropertyUpdatedChangeBasePrivate(); diff --git a/src/core/changes/qpropertyvalueaddedchange.h b/src/core/changes/qpropertyvalueaddedchange.h index 80b41c9f8..d85720246 100644 --- a/src/core/changes/qpropertyvalueaddedchange.h +++ b/src/core/changes/qpropertyvalueaddedchange.h @@ -50,7 +50,7 @@ namespace Qt3DCore { class QPropertyValueAddedChangePrivate; -class QT3DCORESHARED_EXPORT QPropertyValueAddedChange : public QStaticPropertyValueAddedChangeBase +class Q_3DCORESHARED_EXPORT QPropertyValueAddedChange : public QStaticPropertyValueAddedChangeBase { public: explicit QPropertyValueAddedChange(QNodeId subjectId); diff --git a/src/core/changes/qpropertyvalueaddedchange_p.h b/src/core/changes/qpropertyvalueaddedchange_p.h index edd59489f..3f7ea33fe 100644 --- a/src/core/changes/qpropertyvalueaddedchange_p.h +++ b/src/core/changes/qpropertyvalueaddedchange_p.h @@ -62,7 +62,7 @@ namespace Qt3DCore { class QPropertyValueAddedChange; -class QT3DCORE_PRIVATE_EXPORT QPropertyValueAddedChangePrivate : public QStaticPropertyValueAddedChangeBasePrivate +class Q_3DCORE_PRIVATE_EXPORT QPropertyValueAddedChangePrivate : public QStaticPropertyValueAddedChangeBasePrivate { public: QPropertyValueAddedChangePrivate(); diff --git a/src/core/changes/qpropertyvalueaddedchangebase.h b/src/core/changes/qpropertyvalueaddedchangebase.h index 2ac449667..2be39ad47 100644 --- a/src/core/changes/qpropertyvalueaddedchangebase.h +++ b/src/core/changes/qpropertyvalueaddedchangebase.h @@ -50,7 +50,7 @@ namespace Qt3DCore { class QPropertyValueAddedChangeBasePrivate; -class QT3DCORESHARED_EXPORT QPropertyValueAddedChangeBase : public QSceneChange +class Q_3DCORESHARED_EXPORT QPropertyValueAddedChangeBase : public QSceneChange { public: ~QPropertyValueAddedChangeBase(); diff --git a/src/core/changes/qpropertyvalueaddedchangebase_p.h b/src/core/changes/qpropertyvalueaddedchangebase_p.h index be92e2d5b..57d97e4c0 100644 --- a/src/core/changes/qpropertyvalueaddedchangebase_p.h +++ b/src/core/changes/qpropertyvalueaddedchangebase_p.h @@ -60,7 +60,7 @@ namespace Qt3DCore { class QPropertyValueAddedChangeBase; -class QT3DCORE_PRIVATE_EXPORT QPropertyValueAddedChangeBasePrivate : public QSceneChangePrivate +class Q_3DCORE_PRIVATE_EXPORT QPropertyValueAddedChangeBasePrivate : public QSceneChangePrivate { public: QPropertyValueAddedChangeBasePrivate(); diff --git a/src/core/changes/qpropertyvalueremovedchange.h b/src/core/changes/qpropertyvalueremovedchange.h index 06bb1dd39..2bd781ed5 100644 --- a/src/core/changes/qpropertyvalueremovedchange.h +++ b/src/core/changes/qpropertyvalueremovedchange.h @@ -50,7 +50,7 @@ namespace Qt3DCore { class QPropertyValueRemovedChangePrivate; -class QT3DCORESHARED_EXPORT QPropertyValueRemovedChange : public QStaticPropertyValueRemovedChangeBase +class Q_3DCORESHARED_EXPORT QPropertyValueRemovedChange : public QStaticPropertyValueRemovedChangeBase { public: explicit QPropertyValueRemovedChange(QNodeId subjectId); diff --git a/src/core/changes/qpropertyvalueremovedchange_p.h b/src/core/changes/qpropertyvalueremovedchange_p.h index b4e86bc9e..119dabefc 100644 --- a/src/core/changes/qpropertyvalueremovedchange_p.h +++ b/src/core/changes/qpropertyvalueremovedchange_p.h @@ -62,7 +62,7 @@ namespace Qt3DCore { class QPropertyValueRemovedChange; -class QT3DCORE_PRIVATE_EXPORT QPropertyValueRemovedChangePrivate : public QStaticPropertyValueRemovedChangeBasePrivate +class Q_3DCORE_PRIVATE_EXPORT QPropertyValueRemovedChangePrivate : public QStaticPropertyValueRemovedChangeBasePrivate { public: QPropertyValueRemovedChangePrivate(); diff --git a/src/core/changes/qpropertyvalueremovedchangebase.h b/src/core/changes/qpropertyvalueremovedchangebase.h index 44bc57726..233354078 100644 --- a/src/core/changes/qpropertyvalueremovedchangebase.h +++ b/src/core/changes/qpropertyvalueremovedchangebase.h @@ -50,7 +50,7 @@ namespace Qt3DCore { class QPropertyValueRemovedChangeBasePrivate; -class QT3DCORESHARED_EXPORT QPropertyValueRemovedChangeBase : public QSceneChange +class Q_3DCORESHARED_EXPORT QPropertyValueRemovedChangeBase : public QSceneChange { public: ~QPropertyValueRemovedChangeBase(); diff --git a/src/core/changes/qpropertyvalueremovedchangebase_p.h b/src/core/changes/qpropertyvalueremovedchangebase_p.h index f9c1b4009..f62f7f24d 100644 --- a/src/core/changes/qpropertyvalueremovedchangebase_p.h +++ b/src/core/changes/qpropertyvalueremovedchangebase_p.h @@ -60,7 +60,7 @@ namespace Qt3DCore { class QPropertyValueRemovedChangeBase; -class QT3DCORE_PRIVATE_EXPORT QPropertyValueRemovedChangeBasePrivate : public QSceneChangePrivate +class Q_3DCORE_PRIVATE_EXPORT QPropertyValueRemovedChangeBasePrivate : public QSceneChangePrivate { public: QPropertyValueRemovedChangeBasePrivate(); diff --git a/src/core/changes/qscenechange.h b/src/core/changes/qscenechange.h index 7679fb030..7d88d334f 100644 --- a/src/core/changes/qscenechange.h +++ b/src/core/changes/qscenechange.h @@ -65,7 +65,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(ChangeFlags) class QSceneChangePrivate; -class QT3DCORESHARED_EXPORT QSceneChange +class Q_3DCORESHARED_EXPORT QSceneChange { public: enum DeliveryFlag { diff --git a/src/core/changes/qscenechange_p.h b/src/core/changes/qscenechange_p.h index cd0194b01..d32f6eec3 100644 --- a/src/core/changes/qscenechange_p.h +++ b/src/core/changes/qscenechange_p.h @@ -63,7 +63,7 @@ namespace Qt3DCore { class QSceneChange; class QNodeId; -class QT3DCORE_PRIVATE_EXPORT QSceneChangePrivate +class Q_3DCORE_PRIVATE_EXPORT QSceneChangePrivate { public : QSceneChangePrivate(); diff --git a/src/core/changes/qskeletoncreatedchange_p.h b/src/core/changes/qskeletoncreatedchange_p.h index 337a4bf26..09b37d545 100644 --- a/src/core/changes/qskeletoncreatedchange_p.h +++ b/src/core/changes/qskeletoncreatedchange_p.h @@ -57,7 +57,7 @@ namespace Qt3DCore { class QSkeletonCreatedChangeBasePrivate; -class QT3DCORESHARED_EXPORT QSkeletonCreatedChangeBase : public QNodeCreatedChangeBase +class Q_3DCORESHARED_EXPORT QSkeletonCreatedChangeBase : public QNodeCreatedChangeBase { public: explicit QSkeletonCreatedChangeBase(const QAbstractSkeleton *skeleton); diff --git a/src/core/changes/qstaticpropertyupdatedchangebase.h b/src/core/changes/qstaticpropertyupdatedchangebase.h index ca145e975..b698d1f06 100644 --- a/src/core/changes/qstaticpropertyupdatedchangebase.h +++ b/src/core/changes/qstaticpropertyupdatedchangebase.h @@ -48,7 +48,7 @@ namespace Qt3DCore { class QStaticPropertyUpdatedChangeBasePrivate; -class QT3DCORESHARED_EXPORT QStaticPropertyUpdatedChangeBase : public QPropertyUpdatedChangeBase +class Q_3DCORESHARED_EXPORT QStaticPropertyUpdatedChangeBase : public QPropertyUpdatedChangeBase { public: ~QStaticPropertyUpdatedChangeBase(); diff --git a/src/core/changes/qstaticpropertyvalueaddedchangebase.h b/src/core/changes/qstaticpropertyvalueaddedchangebase.h index bf55ac31c..e56e8f18a 100644 --- a/src/core/changes/qstaticpropertyvalueaddedchangebase.h +++ b/src/core/changes/qstaticpropertyvalueaddedchangebase.h @@ -49,7 +49,7 @@ namespace Qt3DCore { class QStaticPropertyValueAddedChangeBasePrivate; -class QT3DCORESHARED_EXPORT QStaticPropertyValueAddedChangeBase : public QPropertyValueAddedChangeBase +class Q_3DCORESHARED_EXPORT QStaticPropertyValueAddedChangeBase : public QPropertyValueAddedChangeBase { public: ~QStaticPropertyValueAddedChangeBase(); diff --git a/src/core/changes/qstaticpropertyvalueaddedchangebase_p.h b/src/core/changes/qstaticpropertyvalueaddedchangebase_p.h index cd995d739..3c7d62840 100644 --- a/src/core/changes/qstaticpropertyvalueaddedchangebase_p.h +++ b/src/core/changes/qstaticpropertyvalueaddedchangebase_p.h @@ -60,7 +60,7 @@ namespace Qt3DCore { class QStaticPropertyValueAddedChangeBase; -class QT3DCORE_PRIVATE_EXPORT QStaticPropertyValueAddedChangeBasePrivate : public QPropertyValueAddedChangeBasePrivate +class Q_3DCORE_PRIVATE_EXPORT QStaticPropertyValueAddedChangeBasePrivate : public QPropertyValueAddedChangeBasePrivate { public: QStaticPropertyValueAddedChangeBasePrivate(); diff --git a/src/core/changes/qstaticpropertyvalueremovedchangebase.h b/src/core/changes/qstaticpropertyvalueremovedchangebase.h index f6f554397..e9f53fb12 100644 --- a/src/core/changes/qstaticpropertyvalueremovedchangebase.h +++ b/src/core/changes/qstaticpropertyvalueremovedchangebase.h @@ -49,7 +49,7 @@ namespace Qt3DCore { class QStaticPropertyValueRemovedChangeBasePrivate; -class QT3DCORESHARED_EXPORT QStaticPropertyValueRemovedChangeBase : public QPropertyValueRemovedChangeBase +class Q_3DCORESHARED_EXPORT QStaticPropertyValueRemovedChangeBase : public QPropertyValueRemovedChangeBase { public: ~QStaticPropertyValueRemovedChangeBase(); diff --git a/src/core/changes/qstaticpropertyvalueremovedchangebase_p.h b/src/core/changes/qstaticpropertyvalueremovedchangebase_p.h index ac4e1d875..1c26efa6c 100644 --- a/src/core/changes/qstaticpropertyvalueremovedchangebase_p.h +++ b/src/core/changes/qstaticpropertyvalueremovedchangebase_p.h @@ -60,7 +60,7 @@ namespace Qt3DCore { class QStaticPropertyValueRemovedChangeBase; -class QT3DCORE_PRIVATE_EXPORT QStaticPropertyValueRemovedChangeBasePrivate : public QPropertyValueRemovedChangeBasePrivate +class Q_3DCORE_PRIVATE_EXPORT QStaticPropertyValueRemovedChangeBasePrivate : public QPropertyValueRemovedChangeBasePrivate { public: QStaticPropertyValueRemovedChangeBasePrivate(); diff --git a/src/core/jobs/qabstractaspectjobmanager_p.h b/src/core/jobs/qabstractaspectjobmanager_p.h index 5c4e9f699..b3e76b86d 100644 --- a/src/core/jobs/qabstractaspectjobmanager_p.h +++ b/src/core/jobs/qabstractaspectjobmanager_p.h @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { -class QT3DCORESHARED_EXPORT QAbstractAspectJobManager : public QObject +class Q_3DCORESHARED_EXPORT QAbstractAspectJobManager : public QObject { Q_OBJECT public: diff --git a/src/core/jobs/qaspectjob.h b/src/core/jobs/qaspectjob.h index 398cd88d1..5c088fd1a 100644 --- a/src/core/jobs/qaspectjob.h +++ b/src/core/jobs/qaspectjob.h @@ -50,7 +50,7 @@ namespace Qt3DCore { class QAspectJobPrivate; -class QT3DCORESHARED_EXPORT QAspectJob +class Q_3DCORESHARED_EXPORT QAspectJob { public: QAspectJob(); diff --git a/src/core/jobs/qaspectjob_p.h b/src/core/jobs/qaspectjob_p.h index ff708443e..7aa3151a0 100644 --- a/src/core/jobs/qaspectjob_p.h +++ b/src/core/jobs/qaspectjob_p.h @@ -103,7 +103,7 @@ struct JobRunStats }; #endif -class QT3DCORE_PRIVATE_EXPORT QAspectJobPrivate +class Q_3DCORE_PRIVATE_EXPORT QAspectJobPrivate { public: QAspectJobPrivate(); diff --git a/src/core/jobs/qaspectjobmanager_p.h b/src/core/jobs/qaspectjobmanager_p.h index d59860039..77e535491 100644 --- a/src/core/jobs/qaspectjobmanager_p.h +++ b/src/core/jobs/qaspectjobmanager_p.h @@ -64,7 +64,7 @@ namespace Qt3DCore { class QThreadPooler; class DependencyHandler; -class QT3DCORE_PRIVATE_EXPORT QAspectJobManager : public QAbstractAspectJobManager +class Q_3DCORE_PRIVATE_EXPORT QAspectJobManager : public QAbstractAspectJobManager { Q_OBJECT public: diff --git a/src/core/jobs/qthreadpooler_p.h b/src/core/jobs/qthreadpooler_p.h index 00742f8fc..65459efba 100644 --- a/src/core/jobs/qthreadpooler_p.h +++ b/src/core/jobs/qthreadpooler_p.h @@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { -class QT3DCORE_PRIVATE_EXPORT QThreadPooler : public QObject +class Q_3DCORE_PRIVATE_EXPORT QThreadPooler : public QObject { Q_OBJECT diff --git a/src/core/nodes/propertychangehandler_p.h b/src/core/nodes/propertychangehandler_p.h index ff8d6d5c2..6a3911dbd 100644 --- a/src/core/nodes/propertychangehandler_p.h +++ b/src/core/nodes/propertychangehandler_p.h @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { -class QT3DCORESHARED_EXPORT PropertyChangeHandlerBase : public QObject +class Q_3DCORESHARED_EXPORT PropertyChangeHandlerBase : public QObject { Q_OBJECT public: diff --git a/src/core/nodes/qabstractnodefactory_p.h b/src/core/nodes/qabstractnodefactory_p.h index dbe0adffe..de1b758a9 100644 --- a/src/core/nodes/qabstractnodefactory_p.h +++ b/src/core/nodes/qabstractnodefactory_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { -class QT3DCORE_PRIVATE_EXPORT QAbstractNodeFactory +class Q_3DCORE_PRIVATE_EXPORT QAbstractNodeFactory { public: virtual ~QAbstractNodeFactory(); diff --git a/src/core/nodes/qbackendnode.h b/src/core/nodes/qbackendnode.h index 99e483cff..21485cd5f 100644 --- a/src/core/nodes/qbackendnode.h +++ b/src/core/nodes/qbackendnode.h @@ -58,7 +58,7 @@ class QAspectEngine; class QBackendNodeTester; #endif -class QT3DCORESHARED_EXPORT QBackendNodeMapper +class Q_3DCORESHARED_EXPORT QBackendNodeMapper { public: virtual ~QBackendNodeMapper(); @@ -69,7 +69,7 @@ public: typedef QSharedPointer<QBackendNodeMapper> QBackendNodeMapperPtr; -class QT3DCORESHARED_EXPORT QBackendNode +class Q_3DCORESHARED_EXPORT QBackendNode { public: enum Mode { diff --git a/src/core/nodes/qbackendnode_p.h b/src/core/nodes/qbackendnode_p.h index 358b3ab8e..dde86fa48 100644 --- a/src/core/nodes/qbackendnode_p.h +++ b/src/core/nodes/qbackendnode_p.h @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { -class QT3DCORE_PRIVATE_EXPORT QBackendNodePrivate +class Q_3DCORE_PRIVATE_EXPORT QBackendNodePrivate : public QObserverInterface , public QObservableInterface { diff --git a/src/core/nodes/qcomponent.h b/src/core/nodes/qcomponent.h index 639f9446c..182a21e50 100644 --- a/src/core/nodes/qcomponent.h +++ b/src/core/nodes/qcomponent.h @@ -49,7 +49,7 @@ namespace Qt3DCore { class QComponentPrivate; -class QT3DCORESHARED_EXPORT QComponent : public QNode +class Q_3DCORESHARED_EXPORT QComponent : public QNode { Q_OBJECT Q_PROPERTY(bool isShareable READ isShareable WRITE setShareable NOTIFY shareableChanged) diff --git a/src/core/nodes/qcomponent_p.h b/src/core/nodes/qcomponent_p.h index 0b3a961ab..d28433d23 100644 --- a/src/core/nodes/qcomponent_p.h +++ b/src/core/nodes/qcomponent_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { -class QT3DCORE_PRIVATE_EXPORT QComponentPrivate : public QNodePrivate +class Q_3DCORE_PRIVATE_EXPORT QComponentPrivate : public QNodePrivate { public: QComponentPrivate(); diff --git a/src/core/nodes/qentity.cpp b/src/core/nodes/qentity.cpp index 3c8805a67..69d774dd1 100644 --- a/src/core/nodes/qentity.cpp +++ b/src/core/nodes/qentity.cpp @@ -159,6 +159,8 @@ void QEntity::addComponent(QComponent *comp) if (!comp->parent()) comp->setParent(this); + QNodePrivate::get(comp)->_q_ensureBackendNodeCreated(); + d->m_components.append(comp); // Ensures proper bookkeeping diff --git a/src/core/nodes/qentity.h b/src/core/nodes/qentity.h index ef6aedc4d..bbf38efb4 100644 --- a/src/core/nodes/qentity.h +++ b/src/core/nodes/qentity.h @@ -53,7 +53,7 @@ class QEntityPrivate; typedef QVector<QComponent*> QComponentVector; -class QT3DCORESHARED_EXPORT QEntity : public QNode +class Q_3DCORESHARED_EXPORT QEntity : public QNode { Q_OBJECT public: diff --git a/src/core/nodes/qentity_p.h b/src/core/nodes/qentity_p.h index 8fe03cd6b..ee6db75db 100644 --- a/src/core/nodes/qentity_p.h +++ b/src/core/nodes/qentity_p.h @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { -class QT3DCORE_PRIVATE_EXPORT QEntityPrivate : public QNodePrivate +class Q_3DCORE_PRIVATE_EXPORT QEntityPrivate : public QNodePrivate { public : QEntityPrivate(); diff --git a/src/core/nodes/qnode.cpp b/src/core/nodes/qnode.cpp index 83ac49471..c2373b805 100644 --- a/src/core/nodes/qnode.cpp +++ b/src/core/nodes/qnode.cpp @@ -394,15 +394,15 @@ void QNodePrivate::propertyChanged(int propertyIndex) if (data.canConvert<QNode*>()) { QNode *node = data.value<QNode*>(); - // Ensure the node has issued a node creation change. We can end - // up here if a newly created node with a parent is immediately set + // Ensure the node and all ancestors have issued their node creation changes. + // We can end up here if a newly created node with a parent is immediately set // as a property on another node. In this case the deferred call to // _q_postConstructorInit() will not have happened yet as the event - // loop will still be blocked. So force it here and we catch this - // eventuality in the _q_postConstructorInit() function so that we - // do not repeat the creation and new child scene change events. + // loop will still be blocked. We need to do this for all ancestors, + // since the subtree of this node otherwise can end up on the backend + // with a reference to a non-existent parent. if (node) - QNodePrivate::get(node)->_q_postConstructorInit(); + QNodePrivate::get(node)->_q_ensureBackendNodeCreated(); const QNodeId id = node ? node->id() : QNodeId(); return QVariant::fromValue(id); @@ -506,6 +506,29 @@ void QNodePrivate::setArbiter(QLockableObserverInterface *arbiter) } /*! + * \internal + * Makes sure this node has a backend by traversing the tree up to the most distant ancestor + * without a backend node and initializing that node. This is done to make sure the parent nodes + * are always created before the child nodes, since child nodes reference parent nodes at creation + * time. + */ +void QNodePrivate::_q_ensureBackendNodeCreated() +{ + if (m_hasBackendNode) + return; + + Q_Q(QNode); + + QNode *nextNode = q; + QNode *topNodeWithoutBackend = nullptr; + while (nextNode != nullptr && !QNodePrivate::get(nextNode)->m_hasBackendNode) { + topNodeWithoutBackend = nextNode; + nextNode = nextNode->parentNode(); + } + QNodePrivate::get(topNodeWithoutBackend)->_q_postConstructorInit(); +} + +/*! \class Qt3DCore::QNode \inherits QObject diff --git a/src/core/nodes/qnode.h b/src/core/nodes/qnode.h index 1fe03f5e0..d4e4ff088 100644 --- a/src/core/nodes/qnode.h +++ b/src/core/nodes/qnode.h @@ -65,7 +65,7 @@ class QBackendNodeTester; typedef QVector<QNode *> QNodeVector; typedef QSharedPointer<QNode> QNodePtr; -class QT3DCORESHARED_EXPORT QNode : public QObject +class Q_3DCORESHARED_EXPORT QNode : public QObject { Q_OBJECT Q_PROPERTY(Qt3DCore::QNode *parent READ parentNode WRITE setParent NOTIFY parentChanged) diff --git a/src/core/nodes/qnode_p.h b/src/core/nodes/qnode_p.h index 73893cc1e..fd3265870 100644 --- a/src/core/nodes/qnode_p.h +++ b/src/core/nodes/qnode_p.h @@ -68,7 +68,7 @@ namespace Qt3DCore { class QNode; class QAspectEngine; -class QT3DCORE_PRIVATE_EXPORT QNodePrivate : public QObjectPrivate, public QObservableInterface +class Q_3DCORE_PRIVATE_EXPORT QNodePrivate : public QObjectPrivate, public QObservableInterface { public: QNodePrivate(); @@ -152,6 +152,7 @@ public: static const QMetaObject *findStaticMetaObject(const QMetaObject *metaObject); void _q_postConstructorInit(); + void _q_ensureBackendNodeCreated(); private: void notifyCreationChange(); diff --git a/src/core/nodes/qnodecreatedchangegenerator_p.h b/src/core/nodes/qnodecreatedchangegenerator_p.h index 42c2847cc..b2e8fa08b 100644 --- a/src/core/nodes/qnodecreatedchangegenerator_p.h +++ b/src/core/nodes/qnodecreatedchangegenerator_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { -class QT3DCORE_PRIVATE_EXPORT QNodeCreatedChangeGenerator +class Q_3DCORE_PRIVATE_EXPORT QNodeCreatedChangeGenerator { public: QNodeCreatedChangeGenerator(QNode *rootNode); diff --git a/src/core/nodes/qnodeid.h b/src/core/nodes/qnodeid.h index a00559df3..0fd81e790 100644 --- a/src/core/nodes/qnodeid.h +++ b/src/core/nodes/qnodeid.h @@ -58,7 +58,7 @@ public: : m_id(0) {} - QT3DCORESHARED_EXPORT static QNodeId createId() Q_DECL_NOTHROW; + Q_3DCORESHARED_EXPORT static QNodeId createId() Q_DECL_NOTHROW; Q_DECL_CONSTEXPR bool isNull() const Q_DECL_NOTHROW { @@ -103,7 +103,7 @@ QT3D_DECLARE_TYPEINFO(Qt3DCore, QNodeId, Q_PRIMITIVE_TYPE) typedef QVector<QNodeId> QNodeIdVector; #ifndef QT_NO_DEBUG_STREAM -QT3DCORESHARED_EXPORT QDebug operator<<(QDebug d, QNodeId id); +Q_3DCORESHARED_EXPORT QDebug operator<<(QDebug d, QNodeId id); #endif inline Q_DECL_CONSTEXPR uint qHash(QNodeId id, uint seed = 0) Q_DECL_NOTHROW diff --git a/src/core/nodes/qnodevisitor_p.h b/src/core/nodes/qnodevisitor_p.h index 15bfa90db..c7c75710a 100644 --- a/src/core/nodes/qnodevisitor_p.h +++ b/src/core/nodes/qnodevisitor_p.h @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { -class QT3DCORESHARED_EXPORT QNodeVisitor +class Q_3DCORESHARED_EXPORT QNodeVisitor { public: QNodeVisitor(); diff --git a/src/core/qbackendnodefactory_p.h b/src/core/qbackendnodefactory_p.h index 46e68266f..5752205c0 100644 --- a/src/core/qbackendnodefactory_p.h +++ b/src/core/qbackendnodefactory_p.h @@ -61,7 +61,7 @@ namespace Qt3DCore { class QBackendNode; -class QT3DCORE_PRIVATE_EXPORT QBackendNodeFactory +class Q_3DCORE_PRIVATE_EXPORT QBackendNodeFactory { public: virtual ~QBackendNodeFactory(); diff --git a/src/core/qchangearbiter_p.h b/src/core/qchangearbiter_p.h index ef2c07dc0..4a82061ed 100644 --- a/src/core/qchangearbiter_p.h +++ b/src/core/qchangearbiter_p.h @@ -77,13 +77,13 @@ class QAbstractPostman; class QScene; -class QT3DCORE_PRIVATE_EXPORT QAbstractArbiter : public QLockableObserverInterface +class Q_3DCORE_PRIVATE_EXPORT QAbstractArbiter : public QLockableObserverInterface { public: virtual QAbstractPostman *postman() const = 0; }; -class QT3DCORE_PRIVATE_EXPORT QChangeArbiter final +class Q_3DCORE_PRIVATE_EXPORT QChangeArbiter final : public QObject , public QAbstractArbiter { diff --git a/src/core/qlockableobserverinterface_p.h b/src/core/qlockableobserverinterface_p.h index b33a84ec4..57650aba2 100644 --- a/src/core/qlockableobserverinterface_p.h +++ b/src/core/qlockableobserverinterface_p.h @@ -60,7 +60,7 @@ namespace Qt3DCore { typedef std::vector<QSceneChangePtr> QSceneChangeList; -class QT3DCORE_PRIVATE_EXPORT QLockableObserverInterface : public QObserverInterface +class Q_3DCORE_PRIVATE_EXPORT QLockableObserverInterface : public QObserverInterface { public: virtual ~QLockableObserverInterface(); diff --git a/src/core/qobservableinterface_p.h b/src/core/qobservableinterface_p.h index 8b92168ff..e4d343d63 100644 --- a/src/core/qobservableinterface_p.h +++ b/src/core/qobservableinterface_p.h @@ -61,7 +61,7 @@ namespace Qt3DCore { class QLockableObserverInterface; -class QT3DCORE_PRIVATE_EXPORT QObservableInterface +class Q_3DCORE_PRIVATE_EXPORT QObservableInterface { public: virtual ~QObservableInterface(); diff --git a/src/core/qobserverinterface_p.h b/src/core/qobserverinterface_p.h index f2ed52aab..d19905dd2 100644 --- a/src/core/qobserverinterface_p.h +++ b/src/core/qobserverinterface_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { -class QT3DCORESHARED_EXPORT QObserverInterface +class Q_3DCORESHARED_EXPORT QObserverInterface { public: virtual ~QObserverInterface(); diff --git a/src/core/qpostman_p.h b/src/core/qpostman_p.h index ec00c50ae..23c638239 100644 --- a/src/core/qpostman_p.h +++ b/src/core/qpostman_p.h @@ -61,7 +61,7 @@ namespace Qt3DCore { class QScene; class QPostmanPrivate; -class QT3DCORE_PRIVATE_EXPORT QAbstractPostman : public QObserverInterface +class Q_3DCORE_PRIVATE_EXPORT QAbstractPostman : public QObserverInterface { public: virtual void setScene(QScene *sceneLookup) = 0; diff --git a/src/core/qpostman_p_p.h b/src/core/qpostman_p_p.h index 1b5cca3c9..0a34c2e02 100644 --- a/src/core/qpostman_p_p.h +++ b/src/core/qpostman_p_p.h @@ -62,7 +62,7 @@ namespace Qt3DCore { class QScene; class QPostman; -class QT3DCORE_PRIVATE_EXPORT QPostmanPrivate : public QObjectPrivate +class Q_3DCORE_PRIVATE_EXPORT QPostmanPrivate : public QObjectPrivate { public: QPostmanPrivate() diff --git a/src/core/qscene_p.h b/src/core/qscene_p.h index aaa8d9e92..379316247 100644 --- a/src/core/qscene_p.h +++ b/src/core/qscene_p.h @@ -67,7 +67,7 @@ class QAspectEngine; typedef QList<QObservableInterface *> QObservableList; -class QT3DCORE_PRIVATE_EXPORT QScene +class Q_3DCORE_PRIVATE_EXPORT QScene { public: QScene(QAspectEngine *engine = nullptr); diff --git a/src/core/qsceneobserverinterface_p.h b/src/core/qsceneobserverinterface_p.h index f183ab571..7ffc20742 100644 --- a/src/core/qsceneobserverinterface_p.h +++ b/src/core/qsceneobserverinterface_p.h @@ -61,7 +61,7 @@ namespace Qt3DCore { class QChangeArbiter; -class QT3DCORE_PRIVATE_EXPORT QSceneObserverInterface +class Q_3DCORE_PRIVATE_EXPORT QSceneObserverInterface { public: virtual ~QSceneObserverInterface(); diff --git a/src/core/qt3dcore_global.h b/src/core/qt3dcore_global.h index a449a2e52..b2ad787c0 100644 --- a/src/core/qt3dcore_global.h +++ b/src/core/qt3dcore_global.h @@ -47,12 +47,12 @@ QT_BEGIN_NAMESPACE #if defined(QT_SHARED) || !defined(QT_STATIC) # if defined(QT_BUILD_3DCORE_LIB) -# define QT3DCORESHARED_EXPORT Q_DECL_EXPORT +# define Q_3DCORESHARED_EXPORT Q_DECL_EXPORT # else -# define QT3DCORESHARED_EXPORT Q_DECL_IMPORT +# define Q_3DCORESHARED_EXPORT Q_DECL_IMPORT # endif #else -# define QT3DCORESHARED_EXPORT +# define Q_3DCORESHARED_EXPORT #endif #define QT3D_DECLARE_TYPEINFO(NS, Class, Flags) \ diff --git a/src/core/qt3dcore_global_p.h b/src/core/qt3dcore_global_p.h index 2d6793744..fd4e9c31d 100644 --- a/src/core/qt3dcore_global_p.h +++ b/src/core/qt3dcore_global_p.h @@ -54,6 +54,6 @@ #include <Qt3DCore/qt3dcore_global.h> #include <Qt3DCore/private/qt3dcore-config_p.h> -#define QT3DCORE_PRIVATE_EXPORT QT3DCORESHARED_EXPORT +#define Q_3DCORE_PRIVATE_EXPORT Q_3DCORESHARED_EXPORT #endif // QT3DCORE_GLOBAL_P_H diff --git a/src/core/resources/qframeallocator_p.h b/src/core/resources/qframeallocator_p.h index b3ded0760..4c2b5a961 100644 --- a/src/core/resources/qframeallocator_p.h +++ b/src/core/resources/qframeallocator_p.h @@ -68,7 +68,7 @@ namespace Qt3DCore { class QFrameAllocatorPrivate; -class QT3DCORE_PRIVATE_EXPORT QFrameAllocator +class Q_3DCORE_PRIVATE_EXPORT QFrameAllocator { public: explicit QFrameAllocator(uint maxObjectSize, uint alignment = 16, uint pageSize = 128); diff --git a/src/core/resources/qresourcemanager_p.h b/src/core/resources/qresourcemanager_p.h index d944c16c7..b3837fb1f 100644 --- a/src/core/resources/qresourcemanager_p.h +++ b/src/core/resources/qresourcemanager_p.h @@ -233,7 +233,7 @@ template<typename T> inline T *QHandle<T>::data() const { return (d && counter == d->counter) ? &static_cast<QHandleData<T> *>(d)->data : nullptr; } -class QT3DCORE_PRIVATE_EXPORT AlignedAllocator +class Q_3DCORE_PRIVATE_EXPORT AlignedAllocator { public: static void *allocate(uint size); diff --git a/src/core/services/qabstractframeadvanceservice_p.h b/src/core/services/qabstractframeadvanceservice_p.h index dac72a98d..73907c779 100644 --- a/src/core/services/qabstractframeadvanceservice_p.h +++ b/src/core/services/qabstractframeadvanceservice_p.h @@ -62,7 +62,7 @@ namespace Qt3DCore { class QAbstractFrameAdvanceServicePrivate; -class QT3DCORESHARED_EXPORT QAbstractFrameAdvanceService : public QAbstractServiceProvider +class Q_3DCORESHARED_EXPORT QAbstractFrameAdvanceService : public QAbstractServiceProvider { Q_OBJECT public: diff --git a/src/core/services/qdownloadhelperservice_p.h b/src/core/services/qdownloadhelperservice_p.h index b74bcbaa1..507563ead 100644 --- a/src/core/services/qdownloadhelperservice_p.h +++ b/src/core/services/qdownloadhelperservice_p.h @@ -72,7 +72,7 @@ class QDownloadNetworkWorker; class QDownloadHelperService; class QDownloadHelperServicePrivate; -class QT3DCORESHARED_EXPORT QDownloadRequest +class Q_3DCORESHARED_EXPORT QDownloadRequest { public: QDownloadRequest(const QUrl &url); @@ -99,7 +99,7 @@ private: typedef QSharedPointer<QDownloadRequest> QDownloadRequestPtr; -class QT3DCORESHARED_EXPORT QDownloadHelperService : public QAbstractServiceProvider +class Q_3DCORESHARED_EXPORT QDownloadHelperService : public QAbstractServiceProvider { Q_OBJECT public: diff --git a/src/core/services/qeventfilterservice_p.h b/src/core/services/qeventfilterservice_p.h index 58b87d9cc..7efe51df4 100644 --- a/src/core/services/qeventfilterservice_p.h +++ b/src/core/services/qeventfilterservice_p.h @@ -61,7 +61,7 @@ namespace Qt3DCore { class QEventFilterServicePrivate; -class QT3DCORESHARED_EXPORT QEventFilterService : public QAbstractServiceProvider +class Q_3DCORESHARED_EXPORT QEventFilterService : public QAbstractServiceProvider { Q_OBJECT public: diff --git a/src/core/services/qopenglinformationservice_p.h b/src/core/services/qopenglinformationservice_p.h index 2adf73307..dcba480b6 100644 --- a/src/core/services/qopenglinformationservice_p.h +++ b/src/core/services/qopenglinformationservice_p.h @@ -63,7 +63,7 @@ namespace Qt3DCore { class QOpenGLInformationServicePrivate; -class QT3DCORESHARED_EXPORT QOpenGLInformationService : public QAbstractServiceProvider +class Q_3DCORESHARED_EXPORT QOpenGLInformationService : public QAbstractServiceProvider { Q_OBJECT public: diff --git a/src/core/services/qservicelocator_p.h b/src/core/services/qservicelocator_p.h index 9534b33ce..9111a14ab 100644 --- a/src/core/services/qservicelocator_p.h +++ b/src/core/services/qservicelocator_p.h @@ -61,7 +61,7 @@ namespace Qt3DCore { class QAbstractServiceProviderPrivate; -class QT3DCORESHARED_EXPORT QAbstractServiceProvider : public QObject +class Q_3DCORESHARED_EXPORT QAbstractServiceProvider : public QObject { Q_OBJECT public: @@ -86,7 +86,7 @@ class QServiceLocatorPrivate; class QEventFilterService; class QDownloadHelperService; -class QT3DCORESHARED_EXPORT QServiceLocator +class Q_3DCORESHARED_EXPORT QServiceLocator { public: QServiceLocator(); diff --git a/src/core/services/qsysteminformationservice_p.h b/src/core/services/qsysteminformationservice_p.h index 01e976b77..a8a83701b 100644 --- a/src/core/services/qsysteminformationservice_p.h +++ b/src/core/services/qsysteminformationservice_p.h @@ -62,7 +62,7 @@ namespace Qt3DCore { class QSystemInformationServicePrivate; -class QT3DCORESHARED_EXPORT QSystemInformationService : public QAbstractServiceProvider +class Q_3DCORESHARED_EXPORT QSystemInformationService : public QAbstractServiceProvider { Q_OBJECT public: diff --git a/src/core/transforms/matrix4x4_avx2_p.h b/src/core/transforms/matrix4x4_avx2_p.h index 363aaa6e9..74e7c911c 100644 --- a/src/core/transforms/matrix4x4_avx2_p.h +++ b/src/core/transforms/matrix4x4_avx2_p.h @@ -487,10 +487,10 @@ public: friend Vector4D operator*(const Vector4D &vector, const Matrix4x4_AVX2 &matrix); friend Vector4D operator*(const Matrix4x4_AVX2 &matrix, const Vector4D &vector); - friend QT3DCORE_PRIVATE_EXPORT Vector3D operator*(const Vector3D &vector, const Matrix4x4_AVX2 &matrix); - friend QT3DCORE_PRIVATE_EXPORT Vector3D operator*(const Matrix4x4_AVX2 &matrix, const Vector3D &vector); + friend Q_3DCORE_PRIVATE_EXPORT Vector3D operator*(const Vector3D &vector, const Matrix4x4_AVX2 &matrix); + friend Q_3DCORE_PRIVATE_EXPORT Vector3D operator*(const Matrix4x4_AVX2 &matrix, const Vector3D &vector); - friend QT3DCORE_PRIVATE_EXPORT QDebug operator<<(QDebug dbg, const Matrix4x4_AVX2 &m); + friend Q_3DCORE_PRIVATE_EXPORT QDebug operator<<(QDebug dbg, const Matrix4x4_AVX2 &m); private: // column major order // aligned on 32 bytes boundaries for AVX, compatible with 16 bytes boundary for SSE diff --git a/src/core/transforms/matrix4x4_sse_p.h b/src/core/transforms/matrix4x4_sse_p.h index be314ca4d..287094be5 100644 --- a/src/core/transforms/matrix4x4_sse_p.h +++ b/src/core/transforms/matrix4x4_sse_p.h @@ -373,7 +373,7 @@ public: friend Q_ALWAYS_INLINE Vector3D operator*(const Vector3D &vector, const Matrix4x4_SSE &matrix); friend Q_ALWAYS_INLINE Vector3D operator*(const Matrix4x4_SSE &matrix, const Vector3D &vector); - friend QT3DCORE_PRIVATE_EXPORT QDebug operator<<(QDebug dbg, const Matrix4x4_SSE &m); + friend Q_3DCORE_PRIVATE_EXPORT QDebug operator<<(QDebug dbg, const Matrix4x4_SSE &m); private: // Internally we will store the matrix as indicated below // Q_DECL_ALIGN(16) // aligned on 16 bytes boundary for SSE (column major) @@ -484,7 +484,7 @@ Q_ALWAYS_INLINE Vector3D operator*(const Vector3D &vector, const Matrix4x4_SSE & return v; } -QT3DCORE_PRIVATE_EXPORT Q_ALWAYS_INLINE Vector3D operator*(const Matrix4x4_SSE &matrix, const Vector3D &vector) +Q_3DCORE_PRIVATE_EXPORT Q_ALWAYS_INLINE Vector3D operator*(const Matrix4x4_SSE &matrix, const Vector3D &vector) { const Matrix4x4_SSE transposed = matrix.transposed(); return vector * transposed; diff --git a/src/core/transforms/qabstractskeleton.h b/src/core/transforms/qabstractskeleton.h index 3fc13fb70..902def9f8 100644 --- a/src/core/transforms/qabstractskeleton.h +++ b/src/core/transforms/qabstractskeleton.h @@ -49,7 +49,7 @@ namespace Qt3DCore { class QAbstractSkeletonPrivate; -class QT3DCORESHARED_EXPORT QAbstractSkeleton : public Qt3DCore::QNode +class Q_3DCORESHARED_EXPORT QAbstractSkeleton : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(int jointCount READ jointCount NOTIFY jointCountChanged) diff --git a/src/core/transforms/qarmature.h b/src/core/transforms/qarmature.h index a5ccc9d28..e3beffa01 100644 --- a/src/core/transforms/qarmature.h +++ b/src/core/transforms/qarmature.h @@ -50,7 +50,7 @@ namespace Qt3DCore { class QArmaturePrivate; class QAbstractSkeleton; -class QT3DCORESHARED_EXPORT QArmature : public Qt3DCore::QComponent +class Q_3DCORESHARED_EXPORT QArmature : public Qt3DCore::QComponent { Q_OBJECT Q_PROPERTY(Qt3DCore::QAbstractSkeleton* skeleton READ skeleton WRITE setSkeleton NOTIFY skeletonChanged) diff --git a/src/core/transforms/qjoint.h b/src/core/transforms/qjoint.h index fdc3d51a3..d3672e99f 100644 --- a/src/core/transforms/qjoint.h +++ b/src/core/transforms/qjoint.h @@ -53,7 +53,7 @@ namespace Qt3DCore { class QJointPrivate; -class QT3DCORESHARED_EXPORT QJoint : public QNode +class Q_3DCORESHARED_EXPORT QJoint : public QNode { Q_OBJECT Q_PROPERTY(QVector3D scale READ scale WRITE setScale NOTIFY scaleChanged) diff --git a/src/core/transforms/qskeleton.h b/src/core/transforms/qskeleton.h index e3c0c9194..ecffe1aa9 100644 --- a/src/core/transforms/qskeleton.h +++ b/src/core/transforms/qskeleton.h @@ -50,7 +50,7 @@ namespace Qt3DCore { class QJoint; class QSkeletonPrivate; -class QT3DCORESHARED_EXPORT QSkeleton : public QAbstractSkeleton +class Q_3DCORESHARED_EXPORT QSkeleton : public QAbstractSkeleton { Q_OBJECT Q_PROPERTY(Qt3DCore::QJoint* rootJoint READ rootJoint WRITE setRootJoint NOTIFY rootJointChanged) diff --git a/src/core/transforms/qskeletonloader.h b/src/core/transforms/qskeletonloader.h index 1185ba6c7..516a84b0a 100644 --- a/src/core/transforms/qskeletonloader.h +++ b/src/core/transforms/qskeletonloader.h @@ -51,7 +51,7 @@ namespace Qt3DCore { class QJoint; class QSkeletonLoaderPrivate; -class QT3DCORESHARED_EXPORT QSkeletonLoader : public QAbstractSkeleton +class Q_3DCORESHARED_EXPORT QSkeletonLoader : public QAbstractSkeleton { Q_OBJECT Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) diff --git a/src/core/transforms/qtransform.h b/src/core/transforms/qtransform.h index 0a88cb49c..a80385a1b 100644 --- a/src/core/transforms/qtransform.h +++ b/src/core/transforms/qtransform.h @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { class QTransformPrivate; -class QT3DCORESHARED_EXPORT QTransform : public QComponent +class Q_3DCORESHARED_EXPORT QTransform : public QComponent { Q_OBJECT Q_PROPERTY(QMatrix4x4 matrix READ matrix WRITE setMatrix NOTIFY matrixChanged) diff --git a/src/core/transforms/vector3d_sse_p.h b/src/core/transforms/vector3d_sse_p.h index c7f9a403c..bc25cd705 100644 --- a/src/core/transforms/vector3d_sse_p.h +++ b/src/core/transforms/vector3d_sse_p.h @@ -89,7 +89,7 @@ public: { } - explicit QT3DCORE_PRIVATE_EXPORT Vector3D_SSE(const Vector4D_SSE &v); + explicit Q_3DCORE_PRIVATE_EXPORT Vector3D_SSE(const Vector4D_SSE &v); Q_ALWAYS_INLINE Vector3D_SSE &operator+=(Vector3D_SSE vector) { @@ -179,11 +179,11 @@ public: } #ifdef __AVX2__ - QT3DCORE_PRIVATE_EXPORT Vector3D_SSE unproject(const Matrix4x4_AVX2 &modelView, const Matrix4x4_AVX2 &projection, const QRect &viewport) const; - QT3DCORE_PRIVATE_EXPORT Vector3D_SSE project(const Matrix4x4_AVX2 &modelView, const Matrix4x4_AVX2 &projection, const QRect &viewport) const; + Q_3DCORE_PRIVATE_EXPORT Vector3D_SSE unproject(const Matrix4x4_AVX2 &modelView, const Matrix4x4_AVX2 &projection, const QRect &viewport) const; + Q_3DCORE_PRIVATE_EXPORT Vector3D_SSE project(const Matrix4x4_AVX2 &modelView, const Matrix4x4_AVX2 &projection, const QRect &viewport) const; #else - QT3DCORE_PRIVATE_EXPORT Vector3D_SSE unproject(const Matrix4x4_SSE &modelView, const Matrix4x4_SSE &projection, const QRect &viewport) const; - QT3DCORE_PRIVATE_EXPORT Vector3D_SSE project(const Matrix4x4_SSE &modelView, const Matrix4x4_SSE &projection, const QRect &viewport) const; + Q_3DCORE_PRIVATE_EXPORT Vector3D_SSE unproject(const Matrix4x4_SSE &modelView, const Matrix4x4_SSE &projection, const QRect &viewport) const; + Q_3DCORE_PRIVATE_EXPORT Vector3D_SSE project(const Matrix4x4_SSE &modelView, const Matrix4x4_SSE &projection, const QRect &viewport) const; #endif Q_ALWAYS_INLINE float x() const { return _mm_cvtss_f32(m_xyzw); } @@ -350,13 +350,13 @@ public: #ifdef __AVX2__ friend class Matrix4x4_AVX2; - friend QT3DCORE_PRIVATE_EXPORT Vector3D_SSE operator*(const Vector3D_SSE &vector, const Matrix4x4_AVX2 &matrix); - friend QT3DCORE_PRIVATE_EXPORT Vector3D_SSE operator*(const Matrix4x4_AVX2 &matrix, const Vector3D_SSE &vector); + friend Q_3DCORE_PRIVATE_EXPORT Vector3D_SSE operator*(const Vector3D_SSE &vector, const Matrix4x4_AVX2 &matrix); + friend Q_3DCORE_PRIVATE_EXPORT Vector3D_SSE operator*(const Matrix4x4_AVX2 &matrix, const Vector3D_SSE &vector); #endif friend class Matrix4x4_SSE; - friend QT3DCORE_PRIVATE_EXPORT Vector3D_SSE operator*(const Vector3D_SSE &vector, const Matrix4x4_SSE &matrix); - friend QT3DCORE_PRIVATE_EXPORT Vector3D_SSE operator*(const Matrix4x4_SSE &matrix, const Vector3D_SSE &vector); + friend Q_3DCORE_PRIVATE_EXPORT Vector3D_SSE operator*(const Vector3D_SSE &vector, const Matrix4x4_SSE &matrix); + friend Q_3DCORE_PRIVATE_EXPORT Vector3D_SSE operator*(const Matrix4x4_SSE &matrix, const Vector3D_SSE &vector); friend Q_ALWAYS_INLINE const Vector3D_SSE operator+(Vector3D_SSE v1, Vector3D_SSE v2) { return v1 += v2; } friend Q_ALWAYS_INLINE const Vector3D_SSE operator-(Vector3D_SSE v1, Vector3D_SSE v2) { return v1 -= v2; } @@ -375,7 +375,7 @@ public: friend Q_ALWAYS_INLINE const Vector3D_SSE operator/(Vector3D_SSE vector, float divisor) { return vector /= divisor; } friend Q_ALWAYS_INLINE const Vector3D_SSE operator/(Vector3D_SSE vector, Vector3D_SSE divisor) { return vector /= divisor; } - friend QT3DCORE_PRIVATE_EXPORT QDebug operator<<(QDebug dbg, const Vector3D_SSE &v); + friend Q_3DCORE_PRIVATE_EXPORT QDebug operator<<(QDebug dbg, const Vector3D_SSE &v); friend Q_ALWAYS_INLINE bool qFuzzyCompare(const Vector3D_SSE& v1, const Vector3D_SSE& v2) { return ::qFuzzyCompare(v1.x(), v2.x()) && diff --git a/src/core/transforms/vector4d_sse_p.h b/src/core/transforms/vector4d_sse_p.h index 0be5e3787..50e5c6836 100644 --- a/src/core/transforms/vector4d_sse_p.h +++ b/src/core/transforms/vector4d_sse_p.h @@ -371,7 +371,7 @@ public: friend Q_ALWAYS_INLINE const Vector4D_SSE operator/(Vector4D_SSE vector, float divisor) { return vector /= divisor; } friend Q_ALWAYS_INLINE const Vector4D_SSE operator/(Vector4D_SSE vector, Vector4D_SSE divisor) { return vector /= divisor; } - friend QT3DCORE_PRIVATE_EXPORT QDebug operator<<(QDebug dbg, const Vector4D_SSE &v); + friend Q_3DCORE_PRIVATE_EXPORT QDebug operator<<(QDebug dbg, const Vector4D_SSE &v); friend Q_ALWAYS_INLINE bool qFuzzyCompare(const Vector4D_SSE& v1, const Vector4D_SSE& v2) { return ::qFuzzyCompare(v1.x(), v2.x()) && |