diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-04-13 07:36:52 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-04-14 08:34:00 +0000 |
| commit | e60cbd64251dd6b2bad4ca4afa277fedd56e9d7d (patch) | |
| tree | 3e765434528bd58d6b7d24e71980fde3ef6633df /src/core/aspects/qabstractaspect.cpp | |
| parent | fae5232d47844c49dc237757e874b1b261240cfe (diff) | |
Move enabled property to QBackendNode
Change-Id: I30e40a89041d7ff12c7bb7117d1e91d9d4244647
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/core/aspects/qabstractaspect.cpp')
| -rw-r--r-- | src/core/aspects/qabstractaspect.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp index 12dcb33e1..9697d1c2f 100644 --- a/src/core/aspects/qabstractaspect.cpp +++ b/src/core/aspects/qabstractaspect.cpp @@ -180,6 +180,7 @@ QBackendNode *QAbstractAspectPrivate::createBackendNode(QNode *frontend) const if (backend == Q_NULLPTR) return Q_NULLPTR; QBackendNodePrivate *backendPriv = QBackendNodePrivate::get(backend); + backendPriv->setEnabled(frontend->isEnabled()); // TO DO: Find a way to specify the changes to observe // Register backendNode with QChangeArbiter if (m_arbiter != Q_NULLPTR) { // Unit tests may not have the arbiter registered @@ -209,19 +210,19 @@ QBackendNode *QAbstractAspectPrivate::createBackendNodeNoClone(const QNodeCreate return backend; backend = backendNodeMapper->create(change); + if (!backend) + return nullptr; + // TODO: Find some place else to do all of this function from the arbiter - if (backend) { - backend->setPeerId(change->subjectId()); - backend->initializeFromPeer(change); - } + backend->setPeerId(change->subjectId()); + backend->initializeFromPeer(change); // Backend could be null if the user decides that his functor should only // perform some action when encountering a given type of item but doesn't need to // return a QBackendNode pointer. - if (!backend) - return nullptr; QBackendNodePrivate *backendPriv = QBackendNodePrivate::get(backend); + backendPriv->setEnabled(change->isNodeEnabled()); // TO DO: Find a way to specify the changes to observe // Register backendNode with QChangeArbiter if (m_arbiter != Q_NULLPTR) { // Unit tests may not have the arbiter registered |