summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qpropertyprivate.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-08-21 12:56:11 +0200
committerLars Knoll <lars.knoll@qt.io>2020-09-02 22:44:27 +0200
commite638e8a28d74af8129aaaf6b67fabbb5dbdf31e4 (patch)
treeba14567e009d57f417ae326eb346d6b1fd350212 /src/corelib/kernel/qpropertyprivate.h
parent0c89721716d9be43675358cbdb9c3170fd5936af (diff)
Cleanups: Rename some classes
Rename QPropertyBase to QPropertyBindingData, as it contains the data related to bindings. The new name fits better, as the data can now also live somewhere else than the data strored in the property. Change-Id: I489efb86ad2e0bad2740c9d1aa74506fe103d343 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/corelib/kernel/qpropertyprivate.h')
-rw-r--r--src/corelib/kernel/qpropertyprivate.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/corelib/kernel/qpropertyprivate.h b/src/corelib/kernel/qpropertyprivate.h
index acdf405648..bab4162472 100644
--- a/src/corelib/kernel/qpropertyprivate.h
+++ b/src/corelib/kernel/qpropertyprivate.h
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
class QUntypedPropertyBinding;
class QPropertyBindingPrivate;
using QPropertyBindingPrivatePtr = QExplicitlySharedDataPointer<QPropertyBindingPrivate>;
-struct QPropertyBasePointer;
+struct QPropertyBindingDataPointer;
namespace QtPrivate {
@@ -74,21 +74,21 @@ using QPropertyGuardFunction = bool(*)(QMetaType, void *dataPtr,
QPropertyBindingFunction, void *owner);
using QPropertyObserverCallback = void (*)(void *, void *);
-class Q_CORE_EXPORT QPropertyBase
+class Q_CORE_EXPORT QPropertyBindingData
{
// Mutable because the address of the observer of the currently evaluating binding is stored here, for
// notification later when the value changes.
mutable quintptr d_ptr = 0;
- friend struct QT_PREPEND_NAMESPACE(QPropertyBasePointer);
+ friend struct QT_PREPEND_NAMESPACE(QPropertyBindingDataPointer);
public:
- QPropertyBase() = default;
- Q_DISABLE_COPY(QPropertyBase)
- QPropertyBase(QPropertyBase &&other) = delete;
- QPropertyBase(QPropertyBase &&other, void *propertyDataPtr);
- QPropertyBase &operator=(QPropertyBase &&other) = delete;
- ~QPropertyBase();
-
- void moveAssign(QPropertyBase &&other, void *propertyDataPtr);
+ QPropertyBindingData() = default;
+ Q_DISABLE_COPY(QPropertyBindingData)
+ QPropertyBindingData(QPropertyBindingData &&other) = delete;
+ QPropertyBindingData(QPropertyBindingData &&other, void *propertyDataPtr);
+ QPropertyBindingData &operator=(QPropertyBindingData &&other) = delete;
+ ~QPropertyBindingData();
+
+ void moveAssign(QPropertyBindingData &&other, void *propertyDataPtr);
bool hasBinding() const { return d_ptr & BindingBit; }