From 23edfa374787caa879517ddc08c870e61129a807 Mon Sep 17 00:00:00 2001 From: Heather Anderson Date: Fri, 3 Sep 2021 16:48:44 -0700 Subject: [PATCH] more changes in response to build log on other compilers --- libraries/script-engine/src/ScriptValue.cpp | 72 +++++++++---------- .../src/qtscript/ScriptEngineQtScript.h | 34 +++++---- libraries/ui/src/ui/OffscreenQmlSurface.h | 4 +- libraries/ui/src/ui/QmlWrapper.h | 1 + 4 files changed, 62 insertions(+), 49 deletions(-) diff --git a/libraries/script-engine/src/ScriptValue.cpp b/libraries/script-engine/src/ScriptValue.cpp index 344d9a6393..83f8e6b50a 100644 --- a/libraries/script-engine/src/ScriptValue.cpp +++ b/libraries/script-engine/src/ScriptValue.cpp @@ -16,52 +16,52 @@ class ScriptValueProxyNull : public ScriptValueProxy { public: - virtual void release(); - virtual ScriptValueProxy* copy() const; + virtual void release() override; + virtual ScriptValueProxy* copy() const override; public: - virtual ScriptValue call(const ScriptValue& thisObject = ScriptValue(), const ScriptValueList& args = ScriptValueList()); - virtual ScriptValue call(const ScriptValue& thisObject, const ScriptValue& arguments); - virtual ScriptValue construct(const ScriptValueList& args = ScriptValueList()); - virtual ScriptValue construct(const ScriptValue& arguments); - virtual ScriptValue data() const; - virtual ScriptEnginePointer engine() const; - virtual bool equals(const ScriptValue& other) const; - virtual bool isArray() const; - virtual bool isBool() const; - virtual bool isError() const; - virtual bool isFunction() const; - virtual bool isNumber() const; - virtual bool isNull() const; - virtual bool isObject() const; - virtual bool isString() const; - virtual bool isUndefined() const; - virtual bool isValid() const; - virtual bool isVariant() const; - virtual ScriptValueIteratorPointer newIterator() const; + virtual ScriptValue call(const ScriptValue& thisObject = ScriptValue(), const ScriptValueList& args = ScriptValueList()) override; + virtual ScriptValue call(const ScriptValue& thisObject, const ScriptValue& arguments) override; + virtual ScriptValue construct(const ScriptValueList& args = ScriptValueList()) override; + virtual ScriptValue construct(const ScriptValue& arguments) override; + virtual ScriptValue data() const override; + virtual ScriptEnginePointer engine() const override; + virtual bool equals(const ScriptValue& other) const override; + virtual bool isArray() const override; + virtual bool isBool() const override; + virtual bool isError() const override; + virtual bool isFunction() const override; + virtual bool isNumber() const override; + virtual bool isNull() const override; + virtual bool isObject() const override; + virtual bool isString() const override; + virtual bool isUndefined() const override; + virtual bool isValid() const override; + virtual bool isVariant() const override; + virtual ScriptValueIteratorPointer newIterator() const override; virtual ScriptValue property(const QString& name, - const ScriptValue::ResolveFlags& mode = ScriptValue::ResolvePrototype) const; + const ScriptValue::ResolveFlags& mode = ScriptValue::ResolvePrototype) const override; virtual ScriptValue property(quint32 arrayIndex, - const ScriptValue::ResolveFlags& mode = ScriptValue::ResolvePrototype) const; + const ScriptValue::ResolveFlags& mode = ScriptValue::ResolvePrototype) const override; virtual void setData(const ScriptValue& val); virtual void setProperty(const QString& name, const ScriptValue& value, - const ScriptValue::PropertyFlags& flags = ScriptValue::KeepExistingFlags); + const ScriptValue::PropertyFlags& flags = ScriptValue::KeepExistingFlags) override; virtual void setProperty(quint32 arrayIndex, const ScriptValue& value, - const ScriptValue::PropertyFlags& flags = ScriptValue::KeepExistingFlags); - virtual void setPrototype(const ScriptValue& prototype); - virtual bool strictlyEquals(const ScriptValue& other) const; + const ScriptValue::PropertyFlags& flags = ScriptValue::KeepExistingFlags) override; + virtual void setPrototype(const ScriptValue& prototype) override; + virtual bool strictlyEquals(const ScriptValue& other) const override; - virtual bool toBool() const; - virtual qint32 toInt32() const; - virtual double toInteger() const; - virtual double toNumber() const; - virtual QString toString() const; - virtual quint16 toUInt16() const; - virtual quint32 toUInt32() const; - virtual QVariant toVariant() const; - virtual QObject* toQObject() const; + virtual bool toBool() const override; + virtual qint32 toInt32() const override; + virtual double toInteger() const override; + virtual double toNumber() const override; + virtual QString toString() const override; + virtual quint16 toUInt16() const override; + virtual quint32 toUInt32() const override; + virtual QVariant toVariant() const override; + virtual QObject* toQObject() const override; }; static ScriptValueProxyNull SCRIPT_VALUE_NULL; diff --git a/libraries/script-engine/src/qtscript/ScriptEngineQtScript.h b/libraries/script-engine/src/qtscript/ScriptEngineQtScript.h index e17fa037f7..eca6a9d9d2 100644 --- a/libraries/script-engine/src/qtscript/ScriptEngineQtScript.h +++ b/libraries/script-engine/src/qtscript/ScriptEngineQtScript.h @@ -130,7 +130,7 @@ public: * @deprecated This function is deprecated and will be removed. */ /// registers a global object by name - Q_INVOKABLE virtual void registerGlobalObject(const QString& name, QObject* object); + Q_INVOKABLE virtual void registerGlobalObject(const QString& name, QObject* object) override; /**jsdoc * @function Script.registerGetterSetter @@ -144,7 +144,10 @@ public: Q_INVOKABLE void registerGetterSetter(const QString& name, QScriptEngine::FunctionSignature getter, QScriptEngine::FunctionSignature setter, const QString& parent = QString("")); - Q_INVOKABLE virtual void registerGetterSetter(const QString& name, ScriptEngine::FunctionSignature getter, ScriptEngine::FunctionSignature setter, const QString& parent = QString("")); + Q_INVOKABLE virtual void registerGetterSetter(const QString& name, + ScriptEngine::FunctionSignature getter, + ScriptEngine::FunctionSignature setter, + const QString& parent = QString("")) override; /**jsdoc * @function Script.registerFunction @@ -157,7 +160,9 @@ public: Q_INVOKABLE void registerFunction(const QString& name, QScriptEngine::FunctionSignature fun, int numArguments = -1); - Q_INVOKABLE virtual void registerFunction(const QString& name, ScriptEngine::FunctionSignature fun, int numArguments = -1); + Q_INVOKABLE virtual void registerFunction(const QString& name, + ScriptEngine::FunctionSignature fun, + int numArguments = -1) override; /**jsdoc * @function Script.registerFunction @@ -172,7 +177,10 @@ public: int numArguments = -1); - Q_INVOKABLE virtual void registerFunction(const QString& parent, const QString& name, ScriptEngine::FunctionSignature fun, int numArguments = -1); + Q_INVOKABLE virtual void registerFunction(const QString& parent, + const QString& name, + ScriptEngine::FunctionSignature fun, + int numArguments = -1) override; /**jsdoc * @function Script.registerEnum @@ -183,7 +191,7 @@ public: // WARNING: This function must be called after a registerGlobalObject that creates the namespace this enum is located in, or // the globalObject won't function. E.g., if you have a Foo object and a Foo.FooType enum, Foo must be registered first. /// registers a global enum - Q_INVOKABLE virtual void registerEnum(const QString& enumName, QMetaEnum newEnum); + Q_INVOKABLE virtual void registerEnum(const QString& enumName, QMetaEnum newEnum) override; /**jsdoc * @function Script.registerValue @@ -203,10 +211,11 @@ public: * @deprecated This function is deprecated and will be removed. */ /// evaluate some code in the context of the ScriptEngineQtScript and return the result - Q_INVOKABLE virtual ScriptValue evaluate(const QString& program, const QString& fileName); // this is also used by the script tool widget + Q_INVOKABLE virtual ScriptValue evaluate(const QString& program, + const QString& fileName) override; // this is also used by the script tool widget - Q_INVOKABLE virtual ScriptValue evaluate(const ScriptProgramPointer& program); + Q_INVOKABLE virtual ScriptValue evaluate(const ScriptProgramPointer& program) override; /**jsdoc * @function Script.evaluateInClosure @@ -215,7 +224,7 @@ public: * @returns {object} Object. * @deprecated This function is deprecated and will be removed. */ - Q_INVOKABLE virtual ScriptValue evaluateInClosure(const ScriptValue& locals, const ScriptProgramPointer& program); + Q_INVOKABLE virtual ScriptValue evaluateInClosure(const ScriptValue& locals, const ScriptProgramPointer& program) override; /**jsdoc * Checks whether the application was compiled as a debug build. @@ -260,7 +269,7 @@ public: * @param {number} deltaSize - Delta size. * @deprecated This function is deprecated and will be removed. */ - virtual void updateMemoryCost(const qint64& deltaSize); + virtual void updateMemoryCost(const qint64& deltaSize) override; signals: @@ -381,10 +390,11 @@ signals: void entityScriptDetailsUpdated(); public: // not for public use, but I don't like how Qt strings this along with private friend functions - virtual ScriptValue create(int type, const void* ptr); - virtual bool convert(const ScriptValue& value, int type, void* ptr); + virtual ScriptValue create(int type, const void* ptr) override; + virtual bool convert(const ScriptValue& value, int type, void* ptr) override; virtual void registerCustomType(int type, ScriptEngine::MarshalFunction marshalFunc, - ScriptEngine::DemarshalFunction demarshalFunc, const ScriptValue& prototype); + ScriptEngine::DemarshalFunction demarshalFunc, + const ScriptValue& prototype) override; protected: // like `newFunction`, but allows mapping inline C++ lambdas with captures as callable QScriptValues diff --git a/libraries/ui/src/ui/OffscreenQmlSurface.h b/libraries/ui/src/ui/OffscreenQmlSurface.h index 76533a49cb..7597f7f8fe 100644 --- a/libraries/ui/src/ui/OffscreenQmlSurface.h +++ b/libraries/ui/src/ui/OffscreenQmlSurface.h @@ -13,7 +13,9 @@ #include #include -#include "PointerEvent.h" + +#include +#include using QmlContextCallback = std::function; diff --git a/libraries/ui/src/ui/QmlWrapper.h b/libraries/ui/src/ui/QmlWrapper.h index 84873472b9..8e110ffee3 100644 --- a/libraries/ui/src/ui/QmlWrapper.h +++ b/libraries/ui/src/ui/QmlWrapper.h @@ -12,6 +12,7 @@ #include #include +#include #include class ScriptEngine;