diff options
| author | Kevin Ottens <kevin.ottens@kdab.com> | 2015-02-03 12:53:28 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-02-08 11:25:20 +0000 |
| commit | ea21cc6c3418ca3df9ef6f383ba338ae4d49915b (patch) | |
| tree | b153039cdab5390592b9f9fab1fdc1cac0cf3ff6 /src/core/qchangearbiter_p.h | |
| parent | ba7f13b912dbbe208358e7ae925924ccba413ee1 (diff) | |
Introduce QLockableObserverInterface
We introduce QLockableObserverInterface as an intermediate interface
before the QChangeArbiter and depend on that interface whenever
possible.
Change-Id: Ic92efec8d68c88344bb43f8fc7dc10b1212180af
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/core/qchangearbiter_p.h')
| -rw-r--r-- | src/core/qchangearbiter_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/qchangearbiter_p.h b/src/core/qchangearbiter_p.h index 33d81d8af..090e151eb 100644 --- a/src/core/qchangearbiter_p.h +++ b/src/core/qchangearbiter_p.h @@ -52,7 +52,7 @@ #include <QMutex> #include <Qt3DCore/qnodeid.h> #include <Qt3DCore/qscenechange.h> -#include <Qt3DCore/private/qobserverinterface_p.h> +#include <Qt3DCore/private/qlockableobserverinterface_p.h> QT_BEGIN_NAMESPACE @@ -67,7 +67,7 @@ class QSceneInterface; class QT3DCORESHARED_EXPORT QChangeArbiter : public QObject - , public QObserverInterface + , public QLockableObserverInterface { Q_OBJECT public: @@ -87,8 +87,8 @@ public: void registerSceneObserver(QSceneObserverInterface *observer); void unregisterSceneObserver(QSceneObserverInterface *observer); - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; // QObserverInterface impl - void sceneChangeEventWithLock(const QSceneChangePtr &e); + void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; // QLockableObserverInterface impl + void sceneChangeEventWithLock(const QSceneChangePtr &e) Q_DECL_OVERRIDE; // QLockableObserverInterface impl Q_INVOKABLE void setPostman(Qt3D::QObserverInterface *postman); Q_INVOKABLE void setScene(Qt3D::QSceneInterface *scene); |