diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-11-25 13:02:56 +0100 |
---|---|---|
committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-11-30 23:02:29 +0000 |
commit | 76743374e75df72311f25349b1274256eaddfc75 (patch) | |
tree | 69c98fb1a111c6e42c62e2d09465d0acdb5afba2 | |
parent | f538ce920ec94e07124ebc77f01a00706aa8f4ae (diff) | |
download | qtbase-76743374e75df72311f25349b1274256eaddfc75.tar.gz |
Remove ExtraBit and FlagMask from QPropertyBindingData
They are not needed and removing it can simplify the code in some places
and avoid a couple of masking operations.
Change-Id: I0e4241a2784026aa89deed35f408b094e89a11a0
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit b1be6e6e6f355bfcb0c3814516f6009c91d2de89)
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
-rw-r--r-- | src/corelib/kernel/qproperty.cpp | 9 | ||||
-rw-r--r-- | src/corelib/kernel/qproperty_p.h | 9 | ||||
-rw-r--r-- | src/corelib/kernel/qpropertyprivate.h | 15 |
3 files changed, 11 insertions, 22 deletions
diff --git a/src/corelib/kernel/qproperty.cpp b/src/corelib/kernel/qproperty.cpp index ce2e3d0ce1..d6d58bc448 100644 --- a/src/corelib/kernel/qproperty.cpp +++ b/src/corelib/kernel/qproperty.cpp @@ -73,7 +73,8 @@ void QPropertyBindingDataPointer::addObserver(QPropertyObserver *observer) observer->next->prev = &observer->next; binding->firstObserver.ptr = observer; } else { - auto firstObserver = reinterpret_cast<QPropertyObserver*>(ptr->d_ptr & ~QPropertyBindingData::FlagMask); + Q_ASSERT(!(ptr->d_ptr & QPropertyBindingData::BindingBit)); + auto firstObserver = reinterpret_cast<QPropertyObserver*>(ptr->d_ptr); observer->prev = reinterpret_cast<QPropertyObserver**>(&ptr->d_ptr); observer->next = firstObserver; if (observer->next) @@ -249,14 +250,14 @@ QUntypedPropertyBinding QPropertyBindingData::setBinding(const QUntypedPropertyB oldBinding = QPropertyBindingPrivatePtr(existingBinding); observer = static_cast<QPropertyBindingPrivate *>(oldBinding.data())->takeObservers(); static_cast<QPropertyBindingPrivate *>(oldBinding.data())->unlinkAndDeref(); - d_ptr &= FlagMask; + d_ptr = 0; } else { observer = d.firstObserver(); } if (newBinding) { newBinding.data()->addRef(); - d_ptr = (d_ptr & FlagMask) | reinterpret_cast<quintptr>(newBinding.data()); + d_ptr = reinterpret_cast<quintptr>(newBinding.data()); d_ptr |= BindingBit; auto newBindingRaw = static_cast<QPropertyBindingPrivate *>(newBinding.data()); newBindingRaw->setDirty(true); @@ -339,7 +340,7 @@ void QPropertyBindingData::removeBinding() if (auto *existingBinding = d.bindingPtr()) { auto observer = existingBinding->takeObservers(); - d_ptr &= ExtraBit; + d_ptr = 0; if (observer) d.setObservers(observer.ptr); existingBinding->unlinkAndDeref(); diff --git a/src/corelib/kernel/qproperty_p.h b/src/corelib/kernel/qproperty_p.h index 8f6577a2de..1cd2e80165 100644 --- a/src/corelib/kernel/qproperty_p.h +++ b/src/corelib/kernel/qproperty_p.h @@ -70,14 +70,14 @@ struct Q_AUTOTEST_EXPORT QPropertyBindingDataPointer QPropertyBindingPrivate *bindingPtr() const { if (ptr->d_ptr & QtPrivate::QPropertyBindingData::BindingBit) - return reinterpret_cast<QPropertyBindingPrivate*>(ptr->d_ptr & ~QtPrivate::QPropertyBindingData::FlagMask); + return reinterpret_cast<QPropertyBindingPrivate*>(ptr->d_ptr - QtPrivate::QPropertyBindingData::BindingBit); return nullptr; } void setObservers(QPropertyObserver *observer) { observer->prev = reinterpret_cast<QPropertyObserver**>(&(ptr->d_ptr)); - ptr->d_ptr = (reinterpret_cast<quintptr>(observer) & ~QtPrivate::QPropertyBindingData::FlagMask); + ptr->d_ptr = reinterpret_cast<quintptr>(observer); } void fixupFirstObserverAfterMove() const; void addObserver(QPropertyObserver *observer); @@ -315,7 +315,7 @@ inline void QPropertyBindingDataPointer::setFirstObserver(QPropertyObserver *obs binding->firstObserver.ptr = observer; return; } - ptr->d_ptr = reinterpret_cast<quintptr>(observer) | (ptr->d_ptr & QtPrivate::QPropertyBindingData::FlagMask); + ptr->d_ptr = reinterpret_cast<quintptr>(observer); } inline void QPropertyBindingDataPointer::fixupFirstObserverAfterMove() const @@ -333,8 +333,7 @@ inline QPropertyObserverPointer QPropertyBindingDataPointer::firstObserver() con { if (auto *binding = bindingPtr()) return binding->firstObserver; - return { reinterpret_cast<QPropertyObserver *>(ptr->d_ptr - & ~QtPrivate::QPropertyBindingData::FlagMask) }; + return { reinterpret_cast<QPropertyObserver *>(ptr->d_ptr) }; } template<typename Class, typename T, auto Offset, auto Setter> diff --git a/src/corelib/kernel/qpropertyprivate.h b/src/corelib/kernel/qpropertyprivate.h index 10bf4ca828..8887b86ce3 100644 --- a/src/corelib/kernel/qpropertyprivate.h +++ b/src/corelib/kernel/qpropertyprivate.h @@ -229,6 +229,8 @@ public: QPropertyBindingData &operator=(QPropertyBindingData &&other) = delete; ~QPropertyBindingData(); + static inline constexpr quintptr BindingBit = 0x1; // Is d_ptr pointing to a binding (1) or list of notifiers (0)? + bool hasBinding() const { return d_ptr & BindingBit; } QUntypedPropertyBinding setBinding(const QUntypedPropertyBinding &newBinding, @@ -244,19 +246,6 @@ public: void registerWithCurrentlyEvaluatingBinding() const; void notifyObservers(QUntypedPropertyData *propertyDataPtr) const; - void setExtraBit(bool b) - { - if (b) - d_ptr |= ExtraBit; - else - d_ptr &= ~ExtraBit; - } - - bool extraBit() const { return d_ptr & ExtraBit; } - - static const quintptr ExtraBit = 0x1; // Used for QProperty<bool> specialization - static const quintptr BindingBit = 0x2; // Is d_ptr pointing to a binding (1) or list of notifiers (0)? - static const quintptr FlagMask = BindingBit | ExtraBit; }; template <typename T, typename Tag> |