diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-05-07 12:56:58 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-07 13:09:56 +0200 |
| commit | 76a173c8be3eaf9c4468fd076d6ec9b334bf2f31 (patch) | |
| tree | 19935fab6619505c69bd6c9d42a16fcc3925320a /src/qml/qml/qqmlpropertycache.cpp | |
| parent | 0ae4fb4647d6b286805e01763341c126000155ea (diff) | |
Rename Value::deletedValue() to Value::emptyValue()
This reflects a bit better how this special value is being used.
Change-Id: I136c8ab648bf82102fb2627e17c574a980c4d5ff
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlpropertycache.cpp')
| -rw-r--r-- | src/qml/qml/qqmlpropertycache.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp index c2ad069391..df3d558cb4 100644 --- a/src/qml/qml/qqmlpropertycache.cpp +++ b/src/qml/qml/qqmlpropertycache.cpp @@ -290,8 +290,8 @@ QQmlPropertyCache::~QQmlPropertyCache() void QQmlPropertyCache::destroy() { - Q_ASSERT(engine || constructor->isDeleted()); - if (constructor->isDeleted()) + Q_ASSERT(engine || constructor->isEmpty()); + if (constructor->isEmpty()) delete this; else QQmlEnginePrivate::deleteInEngineThread(engine, this); @@ -598,7 +598,7 @@ void QQmlPropertyCache::append(QQmlEngine *engine, const QMetaObject *metaObject QQmlPropertyData::Flag signalFlags) { Q_UNUSED(revision); - Q_ASSERT(constructor->isDeleted()); // We should not be appending to an in-use property cache + Q_ASSERT(constructor->isEmpty()); // We should not be appending to an in-use property cache _metaObject = metaObject; |