Showing the changes to libraries/script-engine/src/ScriptValue.cpp (1 of 6 files). Show all
Unified · Split
| @@ -45,6 +45,7 @@ public: · 44 unmodified lines | |||
| 45 | const ScriptValue::ResolveFlags& mode = ScriptValue::ResolvePrototype) const override; | 45 | const ScriptValue::ResolveFlags& mode = ScriptValue::ResolvePrototype) const override; |
| 46 | virtual ScriptValue property(quint32 arrayIndex, | 46 | virtual ScriptValue property(quint32 arrayIndex, |
| 47 | const ScriptValue::ResolveFlags& mode = ScriptValue::ResolvePrototype) const override; | 47 | const ScriptValue::ResolveFlags& mode = ScriptValue::ResolvePrototype) const override; |
| 48 | virtual ScriptValue prototype() const override; | ||
| 48 | virtual void setData(const ScriptValue& val) override; | 49 | virtual void setData(const ScriptValue& val) override; |
| 49 | virtual bool hasProperty(const QString &name) const override; | 50 | virtual bool hasProperty(const QString &name) const override; |
| 50 | virtual void setProperty(const QString& name, | 51 | virtual void setProperty(const QString& name, |
| @@ -55,7 +56,7 @@ public: · 4 unmodified lines | |||
| 55 | const ScriptValue::PropertyFlags& flags = ScriptValue::KeepExistingFlags) override; | 56 | const ScriptValue::PropertyFlags& flags = ScriptValue::KeepExistingFlags) override; |
| 56 | virtual void setPrototype(const ScriptValue& prototype) override; | 57 | virtual void setPrototype(const ScriptValue& prototype) override; |
| 57 | virtual bool strictlyEquals(const ScriptValue& other) const override; | 58 | virtual bool strictlyEquals(const ScriptValue& other) const override; |
| 58 | virtual inline QList<QString> getPropertyNames() const override; | 59 | virtual QList<QString> getPropertyNames() const override; |
| 59 | 60 | ||
| 60 | virtual bool toBool() const override; | 61 | virtual bool toBool() const override; |
| 61 | virtual qint32 toInt32() const override; | 62 | virtual qint32 toInt32() const override; |
| @@ -177,6 +178,10 @@ ScriptValue ScriptValueProxyNull::property(quint32 arrayIndex, const ScriptValue · 115 unmodified lines | |||
| 177 | return ScriptValue(); | 178 | return ScriptValue(); |
| 178 | } | 179 | } |
| 179 | 180 | ||
| 181 | ScriptValue ScriptValueProxyNull::prototype() const { | ||
| 182 | return ScriptValue(); | ||
| 183 | } | ||
| 184 | |||
| 180 | void ScriptValueProxyNull::setData(const ScriptValue& val) { | 185 | void ScriptValueProxyNull::setData(const ScriptValue& val) { |
| 181 | Q_ASSERT(false); | 186 | Q_ASSERT(false); |
| 182 | qCWarning(scriptengine_script, "ScriptValue::setData called on empty value"); | 187 | qCWarning(scriptengine_script, "ScriptValue::setData called on empty value"); |