QT_BEGIN_NAMESPACE
QDeclarativeAbstractBinding::QDeclarativeAbstractBinding()
-: m_object(0), m_propertyIndex(-1), m_mePtr(0), m_prevBinding(0), m_nextBinding(0)
+: m_object(0), m_propertyIndex(-1), m_prevBinding(0), m_nextBinding(0)
{
}
QDeclarativeAbstractBinding::~QDeclarativeAbstractBinding()
{
Q_ASSERT(m_prevBinding == 0);
- Q_ASSERT(m_mePtr == 0);
+ Q_ASSERT(*m_mePtr == 0);
}
/*!
QDeclarativeAbstractBinding::Pointer QDeclarativeAbstractBinding::weakPointer()
{
- if (m_selfPointer.isNull())
- m_selfPointer = QSharedPointer<QDeclarativeAbstractBinding>(this, bindingDummyDeleter);
+ if (m_mePtr.value().isNull())
+ m_mePtr.value() = QSharedPointer<QDeclarativeAbstractBinding>(this, bindingDummyDeleter);
- return m_selfPointer.toWeakRef();
+ return m_mePtr.value().toWeakRef();
}
void QDeclarativeAbstractBinding::clear()
{
- if (m_mePtr) {
- *m_mePtr = 0;
+ if (!m_mePtr.isNull()) {
+ **m_mePtr = 0;
m_mePtr = 0;
}
}
#include <QtCore/QObject>
#include <QtCore/QMetaProperty>
+#include <private/qpointervaluepair_p.h>
+
QT_BEGIN_NAMESPACE
class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeAbstractBinding
void addToObject(QObject *, int);
void removeFromObject();
- static Pointer getPointer(QDeclarativeAbstractBinding *p) { return p ? p->weakPointer() : Pointer(); }
+ static inline Pointer getPointer(QDeclarativeAbstractBinding *p);
protected:
virtual ~QDeclarativeAbstractBinding();
QObject *m_object;
int m_propertyIndex;
- QDeclarativeAbstractBinding **m_mePtr;
+
+ typedef QSharedPointer<QDeclarativeAbstractBinding> SharedPointer;
+ // To save memory, we also store the rarely used weakPointer() instance in here
+ QPointerValuePair<QDeclarativeAbstractBinding*, SharedPointer> m_mePtr;
+
QDeclarativeAbstractBinding **m_prevBinding;
QDeclarativeAbstractBinding *m_nextBinding;
- QSharedPointer<QDeclarativeAbstractBinding> m_selfPointer;
};
class QDeclarativeValueTypeProxyBinding : public QDeclarativeAbstractBinding
Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativeBinding::EvaluateFlags)
+QDeclarativeAbstractBinding::Pointer
+QDeclarativeAbstractBinding::getPointer(QDeclarativeAbstractBinding *p)
+{
+ return p ? p->weakPointer() : Pointer();
+}
+
QT_END_NAMESPACE
Q_DECLARE_METATYPE(QDeclarativeBinding*)