summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/corelib/kernel/qproperty.cpp4
-rw-r--r--src/corelib/kernel/qproperty_p.h2
-rw-r--r--src/corelib/tools/qtaggedpointer.h16
3 files changed, 11 insertions, 11 deletions
diff --git a/src/corelib/kernel/qproperty.cpp b/src/corelib/kernel/qproperty.cpp
index acb2de5369..2dbe8b6310 100644
--- a/src/corelib/kernel/qproperty.cpp
+++ b/src/corelib/kernel/qproperty.cpp
@@ -299,7 +299,7 @@ void QPropertyObserverPointer::unlink()
if (ptr->next)
ptr->next->prev = ptr->prev;
if (ptr->prev)
- ptr->prev.setPointer(ptr->next.pointer());
+ ptr->prev.setPointer(ptr->next.data());
ptr->next = nullptr;
ptr->prev.clear();
}
@@ -323,7 +323,7 @@ void QPropertyObserverPointer::notify(QPropertyBindingPrivate *triggeringBinding
auto observer = const_cast<QPropertyObserver*>(ptr);
while (observer) {
- auto * const next = observer->next.pointer();
+ auto * const next = observer->next.data();
if (observer->next.tag() == QPropertyObserver::ObserverNotifiesChangeHandler) {
if (!knownIfPropertyChanged && triggeringBinding) {
knownIfPropertyChanged = true;
diff --git a/src/corelib/kernel/qproperty_p.h b/src/corelib/kernel/qproperty_p.h
index 8815e66b69..1fbe5231fe 100644
--- a/src/corelib/kernel/qproperty_p.h
+++ b/src/corelib/kernel/qproperty_p.h
@@ -94,7 +94,7 @@ struct QPropertyObserverPointer
explicit operator bool() const { return ptr != nullptr; }
- QPropertyObserverPointer nextObserver() const { return {ptr->next.pointer()}; }
+ QPropertyObserverPointer nextObserver() const { return {ptr->next.data()}; }
};
class QPropertyBindingErrorPrivate : public QSharedData
diff --git a/src/corelib/tools/qtaggedpointer.h b/src/corelib/tools/qtaggedpointer.h
index 11f02d2807..0c48fa6e4f 100644
--- a/src/corelib/tools/qtaggedpointer.h
+++ b/src/corelib/tools/qtaggedpointer.h
@@ -93,13 +93,13 @@ public:
Type &operator*() const noexcept
{
- Q_ASSERT(pointer());
- return *pointer();
+ Q_ASSERT(data());
+ return *data();
}
Type *operator->() const noexcept
{
- return pointer();
+ return data();
}
explicit operator bool() const noexcept
@@ -137,14 +137,14 @@ public:
return TagType(typename QtPrivate::TagInfo<T>::TagType(d & tagMask()));
}
- T* pointer() const noexcept
+ T* data() const noexcept
{
return reinterpret_cast<T*>(d & pointerMask());
}
bool isNull() const noexcept
{
- return !pointer();
+ return !data();
}
void swap(QTaggedPointer<T, Tag> &other) noexcept
@@ -154,12 +154,12 @@ public:
friend inline bool operator==(const QTaggedPointer<T, Tag> &lhs, const QTaggedPointer<T, Tag> &rhs) noexcept
{
- return lhs.pointer() == rhs.pointer();
+ return lhs.data() == rhs.data();
}
friend inline bool operator!=(const QTaggedPointer<T, Tag> &lhs, const QTaggedPointer<T, Tag> &rhs) noexcept
{
- return lhs.pointer() != rhs.pointer();
+ return lhs.data() != rhs.data();
}
friend inline bool operator==(const QTaggedPointer<T, Tag> &lhs, std::nullptr_t) noexcept
@@ -184,7 +184,7 @@ public:
friend inline bool operator!(const QTaggedPointer<T, Tag> &ptr) noexcept
{
- return !ptr.pointer();
+ return !ptr.data();
}
protected: