diff options
| author | Paul Lemire <paul.lemire.ecortex.kdab.com> | 2014-10-28 16:14:29 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-11-02 12:42:55 +0100 |
| commit | e60989e6f180b767babb2153cb54eb35c043ab74 (patch) | |
| tree | e41575acfb5d11262adc8e5926f0f360f4ac9699 /tests | |
| parent | d91ace86e584b7123087d5e61f5cd57c0c62316c (diff) | |
QObservableInterface refactored
Explicit registerArbiter/unregisterArbiter methods.
QNode: removed QReadWriteLock for the QChangeArbiter, no need to protect as
the QChangeArbiter is always set in the main thread.
QBackendNode: similar for the QBackend, all locks removed as we are always
locked when synching changes.
QObservable was removed.
Change-Id: I570afbf3e3230ac9d9613474fedd7849aba7412a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/core/qscene/tst_qscene.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/tests/auto/core/qscene/tst_qscene.cpp b/tests/auto/core/qscene/tst_qscene.cpp index 40480d3f9..b8c11bcb9 100644 --- a/tests/auto/core/qscene/tst_qscene.cpp +++ b/tests/auto/core/qscene/tst_qscene.cpp @@ -70,15 +70,9 @@ private slots: class tst_Observable : public Qt3D::QObservableInterface { public: - void registerObserver(Qt3D::QObserverInterface *observer) + void setArbiter(Qt3D::QChangeArbiter *observer) { - m_arbiter = dynamic_cast<Qt3D::QChangeArbiter *>(observer); - QVERIFY(m_arbiter != Q_NULLPTR); - } - - void unregisterObserver(Qt3D::QObserverInterface *observer) - { - QVERIFY(m_arbiter == observer); + m_arbiter = observer; } protected: |