History

more changes in response to build log on other compilers

Heather Anderson committed 5 years ago

Commit 23edfa31 parent 23776ab4 files · +63 −50Browse files

Showing the changes to libraries/script-engine/src/ScriptValue.cpp (1 of 4 files). Show all

Unified · Split

libraries/script-engine/src/ScriptValue.cpp+37−37
@@ -16,52 +16,52 @@ · 15 unmodified lines
16 16
17class ScriptValueProxyNull : public ScriptValueProxy {17class ScriptValueProxyNull : public ScriptValueProxy {
18public:18public:
19 virtual void release();19 virtual void release() override;
20 virtual ScriptValueProxy* copy() const;20 virtual ScriptValueProxy* copy() const override;
21 21
22public:22public:
23 virtual ScriptValue call(const ScriptValue& thisObject = ScriptValue(), const ScriptValueList& args = ScriptValueList());23 virtual ScriptValue call(const ScriptValue& thisObject = ScriptValue(), const ScriptValueList& args = ScriptValueList()) override;
24 virtual ScriptValue call(const ScriptValue& thisObject, const ScriptValue& arguments);24 virtual ScriptValue call(const ScriptValue& thisObject, const ScriptValue& arguments) override;
25 virtual ScriptValue construct(const ScriptValueList& args = ScriptValueList());25 virtual ScriptValue construct(const ScriptValueList& args = ScriptValueList()) override;
26 virtual ScriptValue construct(const ScriptValue& arguments);26 virtual ScriptValue construct(const ScriptValue& arguments) override;
27 virtual ScriptValue data() const;27 virtual ScriptValue data() const override;
28 virtual ScriptEnginePointer engine() const;28 virtual ScriptEnginePointer engine() const override;
29 virtual bool equals(const ScriptValue& other) const;29 virtual bool equals(const ScriptValue& other) const override;
30 virtual bool isArray() const;30 virtual bool isArray() const override;
31 virtual bool isBool() const;31 virtual bool isBool() const override;
32 virtual bool isError() const;32 virtual bool isError() const override;
33 virtual bool isFunction() const;33 virtual bool isFunction() const override;
34 virtual bool isNumber() const;34 virtual bool isNumber() const override;
35 virtual bool isNull() const;35 virtual bool isNull() const override;
36 virtual bool isObject() const;36 virtual bool isObject() const override;
37 virtual bool isString() const;37 virtual bool isString() const override;
38 virtual bool isUndefined() const;38 virtual bool isUndefined() const override;
39 virtual bool isValid() const;39 virtual bool isValid() const override;
40 virtual bool isVariant() const;40 virtual bool isVariant() const override;
41 virtual ScriptValueIteratorPointer newIterator() const;41 virtual ScriptValueIteratorPointer newIterator() const override;
42 virtual ScriptValue property(const QString& name,42 virtual ScriptValue property(const QString& name,
43 const ScriptValue::ResolveFlags& mode = ScriptValue::ResolvePrototype) const;43 const ScriptValue::ResolveFlags& mode = ScriptValue::ResolvePrototype) const override;
44 virtual ScriptValue property(quint32 arrayIndex,44 virtual ScriptValue property(quint32 arrayIndex,
45 const ScriptValue::ResolveFlags& mode = ScriptValue::ResolvePrototype) const;45 const ScriptValue::ResolveFlags& mode = ScriptValue::ResolvePrototype) const override;
46 virtual void setData(const ScriptValue& val);46 virtual void setData(const ScriptValue& val);
47 virtual void setProperty(const QString& name,47 virtual void setProperty(const QString& name,
48 const ScriptValue& value,48 const ScriptValue& value,
49 const ScriptValue::PropertyFlags& flags = ScriptValue::KeepExistingFlags);49 const ScriptValue::PropertyFlags& flags = ScriptValue::KeepExistingFlags) override;
50 virtual void setProperty(quint32 arrayIndex,50 virtual void setProperty(quint32 arrayIndex,
51 const ScriptValue& value,51 const ScriptValue& value,
52 const ScriptValue::PropertyFlags& flags = ScriptValue::KeepExistingFlags);52 const ScriptValue::PropertyFlags& flags = ScriptValue::KeepExistingFlags) override;
53 virtual void setPrototype(const ScriptValue& prototype);53 virtual void setPrototype(const ScriptValue& prototype) override;
54 virtual bool strictlyEquals(const ScriptValue& other) const;54 virtual bool strictlyEquals(const ScriptValue& other) const override;
55 55
56 virtual bool toBool() const;56 virtual bool toBool() const override;
57 virtual qint32 toInt32() const;57 virtual qint32 toInt32() const override;
58 virtual double toInteger() const;58 virtual double toInteger() const override;
59 virtual double toNumber() const;59 virtual double toNumber() const override;
60 virtual QString toString() const;60 virtual QString toString() const override;
61 virtual quint16 toUInt16() const;61 virtual quint16 toUInt16() const override;
62 virtual quint32 toUInt32() const;62 virtual quint32 toUInt32() const override;
63 virtual QVariant toVariant() const;63 virtual QVariant toVariant() const override;
64 virtual QObject* toQObject() const;64 virtual QObject* toQObject() const override;
65};65};
66 66
67static ScriptValueProxyNull SCRIPT_VALUE_NULL;67static ScriptValueProxyNull SCRIPT_VALUE_NULL;