diff --git a/src/corelib/global/qendian_p.h b/src/corelib/global/qendian_p.h index 8d96eba60c1..efa962937ff 100644 --- a/src/corelib/global/qendian_p.h +++ b/src/corelib/global/qendian_p.h @@ -51,16 +51,16 @@ public: operator Type() const noexcept { if constexpr (std::is_signed_v) { - UnsignedType i = S::fromSpecial(storage->val); + UnsignedType i = S::fromSpecial(m_storage->val); i <<= (sizeof(Type) * 8) - width - pos; Type t = Type(i); t >>= (sizeof(Type) * 8) - width; return t; } - return (S::fromSpecial(storage->val) & mask()) >> pos; + return (S::fromSpecial(m_storage->val) & mask()) >> pos; } - bool operator!() const noexcept { return !(storage->val & S::toSpecial(mask())); } + bool operator!() const noexcept { return !(m_storage->val & S::toSpecial(mask())); } static constexpr UnsignedType mask() noexcept { @@ -77,21 +77,21 @@ private: friend class QSpecialIntegerBitfieldUnion; friend class QSpecialIntegerAccessor; - explicit QSpecialIntegerConstAccessor(Storage *storage) : storage(storage) {} + explicit QSpecialIntegerConstAccessor(Storage *storage) : m_storage(storage) {} friend bool operator==(const QSpecialIntegerConstAccessor &i, const QSpecialIntegerConstAccessor &j) noexcept { - return ((i.storage->val ^ j.storage->val) & S::toSpecial(mask())) == 0; + return ((i.m_storage->val ^ j.m_storage->val) & S::toSpecial(mask())) == 0; } friend bool operator!=(const QSpecialIntegerConstAccessor &i, const QSpecialIntegerConstAccessor &j) noexcept { - return ((i.storage->val ^ j.storage->val) & S::toSpecial(mask())) != 0; + return ((i.m_storage->val ^ j.m_storage->val) & S::toSpecial(mask())) != 0; } - Storage *storage; + Storage *m_storage; }; template @@ -106,22 +106,22 @@ public: QSpecialIntegerAccessor &operator=(Type t) { - UnsignedType i = S::fromSpecial(storage->val); + UnsignedType i = S::fromSpecial(m_storage->val); i &= ~Const::mask(); i |= (UnsignedType(t) << pos) & Const::mask(); - storage->val = S::toSpecial(i); + m_storage->val = S::toSpecial(i); return *this; } - operator Const() { return Const(storage); } + operator Const() { return Const(m_storage); } private: template friend class QSpecialIntegerBitfieldUnion; - explicit QSpecialIntegerAccessor(Storage *storage) : storage(storage) {} + explicit QSpecialIntegerAccessor(Storage *storage) : m_storage(storage) {} - Storage *storage; + Storage *m_storage; }; template