diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-17 18:16:35 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-22 01:06:20 +0200 |
| commit | 21198a676128a52e892557bc434035bcd1ddfaac (patch) | |
| tree | 10b165b797a7723507b8da375444549a5420e1e8 /src/qml/jsruntime/qv4value.cpp | |
| parent | e441692b0b8f8fffdfdfa8a21c570adcd5cbae7a (diff) | |
Don't use Value::emptyValue() anymore.
emptyValue is special and reserved for usage inside the
engine to mark missing values. The main to use cases
are when converting property descriptors, and to mark
holes in array data.
Change-Id: I0ed357e65102b1041bf9a878e6e9a4ae0657523b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4value.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4value.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4value.cpp b/src/qml/jsruntime/qv4value.cpp index 570ba9e82e..197b1c2ee5 100644 --- a/src/qml/jsruntime/qv4value.cpp +++ b/src/qml/jsruntime/qv4value.cpp @@ -107,8 +107,9 @@ double Value::toNumberImpl() const QString Value::toQStringNoThrow() const { switch (type()) { - case Value::Undefined_Type: case Value::Empty_Type: + Q_ASSERT(!"empty Value encountered"); + case Value::Undefined_Type: return QStringLiteral("undefined"); case Value::Null_Type: return QStringLiteral("null"); @@ -156,8 +157,9 @@ QString Value::toQStringNoThrow() const QString Value::toQString() const { switch (type()) { - case Value::Undefined_Type: case Value::Empty_Type: + Q_ASSERT(!"empty Value encountered"); + case Value::Undefined_Type: return QStringLiteral("undefined"); case Value::Null_Type: return QStringLiteral("null"); |