diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-09-11 17:58:38 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-09-28 17:16:40 +0200 |
| commit | bb65f92dcd780b753124314d72ef761944c99353 (patch) | |
| tree | 2ce7ba8afbc9e974df57ef2236c168ba8c3e45af /src/core/qscene.h | |
| parent | d720a4b7d412dd763f9dec72925b9191435cb4c5 (diff) | |
QScene implements QSceneInterface
Make all classes use QSceneInterface
QScene has a QMutex to protect read/write accesses but maybe the mutex needs
to be available to the QChangeArbiter as well so that it can perform longer
locking, not just for the retrival or lookup of an observable.
Change-Id: If1dfb5e853f9506bb20f327204cdcdeb46bd4a85
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/core/qscene.h')
| -rw-r--r-- | src/core/qscene.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/core/qscene.h b/src/core/qscene.h index b338bd165..fd047978d 100644 --- a/src/core/qscene.h +++ b/src/core/qscene.h @@ -44,6 +44,7 @@ #include <QUuid> #include <Qt3DCore/qt3dcore_global.h> +#include <Qt3DCore/qsceneinterface.h> QT_BEGIN_NAMESPACE @@ -52,14 +53,18 @@ namespace Qt3D { class QNode; class QScenePrivate; -class QScene +class QScene : public QSceneInterface { public: QScene(); - void addNodeLookup(QNode *node); - void removeNodeLookup(QNode *node); - QNode *lookupNode(const QUuid &id) const; + void addObservable(QObservableInterface *observable, const QUuid &uuid) Q_DECL_OVERRIDE; + void addObservable(QNode *observable) Q_DECL_OVERRIDE; + void removeObservable(QObservableInterface *observable, const QUuid &uuid) Q_DECL_OVERRIDE; + void removeObservable(QNode *observable) Q_DECL_OVERRIDE; + QObservableList lookupObservables(const QUuid &uuid) const Q_DECL_OVERRIDE; + QNode *lookupNode(const QUuid &uuid) const Q_DECL_OVERRIDE; + void setArbiter(QChangeArbiter *arbiter) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QScene) |