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 | 45 | const ScriptValue::ResolveFlags& mode = ScriptValue::ResolvePrototype) const override; |
| 46 | 46 | virtual ScriptValue property(quint32 arrayIndex, |
| 47 | 47 | const ScriptValue::ResolveFlags& mode = ScriptValue::ResolvePrototype) const override; |
| 48 | + virtual ScriptValue prototype() const override; | |
| 48 | 49 | virtual void setData(const ScriptValue& val) override; |
| 49 | 50 | virtual bool hasProperty(const QString &name) const override; |
| 50 | 51 | virtual void setProperty(const QString& name, |
| @@ -55,7 +56,7 @@ public: · 4 unmodified lines | ||
| 55 | 56 | const ScriptValue::PropertyFlags& flags = ScriptValue::KeepExistingFlags) override; |
| 56 | 57 | virtual void setPrototype(const ScriptValue& prototype) override; |
| 57 | 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 | 61 | virtual bool toBool() const override; |
| 61 | 62 | virtual qint32 toInt32() const override; |
| @@ -177,6 +178,10 @@ ScriptValue ScriptValueProxyNull::property(quint32 arrayIndex, const ScriptValue · 115 unmodified lines | ||
| 177 | 178 | return ScriptValue(); |
| 178 | 179 | } |
| 179 | 180 | |
| 181 | +ScriptValue ScriptValueProxyNull::prototype() const { | |
| 182 | + return ScriptValue(); | |
| 183 | +} | |
| 184 | + | |
| 180 | 185 | void ScriptValueProxyNull::setData(const ScriptValue& val) { |
| 181 | 186 | Q_ASSERT(false); |
| 182 | 187 | qCWarning(scriptengine_script, "ScriptValue::setData called on empty value"); |