diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2015-10-12 20:45:19 +0100 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2015-10-13 13:19:50 +0000 |
commit | 7c971e0e7791ab38d7d3d8ebc25468c44cbe49c5 (patch) | |
tree | 53197a9e5eb7501d6f5b497f70c25dad9c265a6f /src/core/qchangearbiter_p.h | |
parent | 0bfd20ad3b8eb3edec8d6317af9eb5504f8c0871 (diff) |
Move Qt3DCore into Qt3DCore namespace
Update other aspects, tests and examples accordingly.
Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/core/qchangearbiter_p.h')
-rw-r--r-- | src/core/qchangearbiter_p.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/qchangearbiter_p.h b/src/core/qchangearbiter_p.h index 62ec64c27..1fc914b11 100644 --- a/src/core/qchangearbiter_p.h +++ b/src/core/qchangearbiter_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QCHANGEARBITER_P_H -#define QT3D_QCHANGEARBITER_P_H +#ifndef QT3DCORE_QCHANGEARBITER_P_H +#define QT3DCORE_QCHANGEARBITER_P_H // // W A R N I N G @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QNode; class QObservableInterface; @@ -88,7 +88,7 @@ public: explicit QChangeArbiter(QObject *parent = 0); ~QChangeArbiter(); - void initialize(Qt3D::QAbstractAspectJobManager *jobManager); + void initialize(Qt3DCore::QAbstractAspectJobManager *jobManager); void syncChanges(); @@ -105,8 +105,8 @@ public: void sceneChangeEventWithLock(const QSceneChangePtr &e) Q_DECL_OVERRIDE; // QLockableObserverInterface impl void sceneChangeEventWithLock(const QSceneChangeList &e) Q_DECL_OVERRIDE; // QLockableObserverInterface impl - Q_INVOKABLE void setPostman(Qt3D::QAbstractPostman *postman); - Q_INVOKABLE void setScene(Qt3D::QScene *scene); + Q_INVOKABLE void setPostman(Qt3DCore::QAbstractPostman *postman); + Q_INVOKABLE void setScene(Qt3DCore::QScene *scene); QAbstractPostman *postman() const Q_DECL_FINAL; QScene *scene() const; @@ -156,8 +156,8 @@ private: QScene *m_scene; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QCHANGEARBITER_P_H +#endif // QT3DCORE_QCHANGEARBITER_P_H |