diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-11-25 13:02:56 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-11-26 21:40:02 +0100 |
| commit | b1be6e6e6f355bfcb0c3814516f6009c91d2de89 (patch) | |
| tree | 5adeeaaeb1c5acafd61b5a8a0787f5e1c62f32cb /src/corelib/kernel/qproperty_p.h | |
| parent | eda4c29eb26dab32e22040bdda0b9b9109b1408b (diff) | |
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.
Pick-to: dev 6.0.0
Change-Id: I0e4241a2784026aa89deed35f408b094e89a11a0
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/corelib/kernel/qproperty_p.h')
| -rw-r--r-- | src/corelib/kernel/qproperty_p.h | 9 |
1 files changed, 4 insertions, 5 deletions
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> |