Showing the changes to libraries/script-engine/src/qtscript/ScriptEngineQtScript.h (1 of 8 files). Show all
Unified · Split
| @@ -45,55 +45,55 @@ class ScriptEngineQtScript : public QScriptEngine, public ScriptEngine, public Q · 44 unmodified lines | |||
| 45 | Q_OBJECT | 45 | Q_OBJECT |
| 46 | 46 | ||
| 47 | public: // ScriptEngine implementation | 47 | public: // ScriptEngine implementation |
| 48 | virtual void abortEvaluation(); | 48 | virtual void abortEvaluation() override; |
| 49 | virtual void clearExceptions(); | 49 | virtual void clearExceptions() override; |
| 50 | virtual ScriptValue cloneUncaughtException(const QString& detail = QString()); | 50 | virtual ScriptValue cloneUncaughtException(const QString& detail = QString()) override; |
| 51 | virtual ScriptContext* currentContext() const; | 51 | virtual ScriptContext* currentContext() const override; |
| 52 | //virtual ScriptValue evaluate(const QString& program, const QString& fileName = QString()); | 52 | //virtual ScriptValue evaluate(const QString& program, const QString& fileName = QString()) override; |
| 53 | //virtual ScriptValue evaluate(const ScriptProgramPointer &program); | 53 | //virtual ScriptValue evaluate(const ScriptProgramPointer &program) override; |
| 54 | //virtual ScriptValue evaluateInClosure(const ScriptValue& locals, const ScriptProgramPointer& program); | 54 | //virtual ScriptValue evaluateInClosure(const ScriptValue& locals, const ScriptProgramPointer& program) override; |
| 55 | virtual ScriptValue globalObject() const; | 55 | virtual ScriptValue globalObject() const override; |
| 56 | virtual bool hasUncaughtException() const; | 56 | virtual bool hasUncaughtException() const override; |
| 57 | virtual bool isEvaluating() const; | 57 | virtual bool isEvaluating() const override; |
| 58 | virtual ScriptValue lintScript(const QString& sourceCode, const QString& fileName, const int lineNumber = 1); | 58 | virtual ScriptValue lintScript(const QString& sourceCode, const QString& fileName, const int lineNumber = 1) override; |
| 59 | virtual ScriptValue makeError(const ScriptValue& other, const QString& type = "Error"); | 59 | virtual ScriptValue makeError(const ScriptValue& other, const QString& type = "Error") override; |
| 60 | virtual ScriptManager* manager() const; | 60 | virtual ScriptManager* manager() const override; |
| 61 | 61 | ||
| 62 | // if there is a pending exception and we are at the top level (non-recursive) stack frame, this emits and resets it | 62 | // if there is a pending exception and we are at the top level (non-recursive) stack frame, this emits and resets it |
| 63 | virtual bool maybeEmitUncaughtException(const QString& debugHint = QString()); | 63 | virtual bool maybeEmitUncaughtException(const QString& debugHint = QString()) override; |
| 64 | 64 | ||
| 65 | virtual ScriptValue newArray(uint length = 0); | 65 | virtual ScriptValue newArray(uint length = 0) override; |
| 66 | virtual ScriptValue newArrayBuffer(const QByteArray& message); | 66 | virtual ScriptValue newArrayBuffer(const QByteArray& message) override; |
| 67 | virtual ScriptValue newFunction(ScriptEngine::FunctionSignature fun, int length = 0); | 67 | virtual ScriptValue newFunction(ScriptEngine::FunctionSignature fun, int length = 0) override; |
| 68 | virtual ScriptValue newObject(); | 68 | virtual ScriptValue newObject() override; |
| 69 | virtual ScriptProgramPointer newProgram(const QString& sourceCode, const QString& fileName); | 69 | virtual ScriptProgramPointer newProgram(const QString& sourceCode, const QString& fileName) override; |
| 70 | virtual ScriptValue newQObject(QObject *object, ScriptEngine::ValueOwnership ownership = ScriptEngine::QtOwnership, | 70 | virtual ScriptValue newQObject(QObject *object, ScriptEngine::ValueOwnership ownership = ScriptEngine::QtOwnership, |
| 71 | const ScriptEngine::QObjectWrapOptions &options = ScriptEngine::QObjectWrapOptions()); | 71 | const ScriptEngine::QObjectWrapOptions& options = ScriptEngine::QObjectWrapOptions()) override; |
| 72 | virtual ScriptValue newValue(bool value); | 72 | virtual ScriptValue newValue(bool value) override; |
| 73 | virtual ScriptValue newValue(int value); | 73 | virtual ScriptValue newValue(int value) override; |
| 74 | virtual ScriptValue newValue(uint value); | 74 | virtual ScriptValue newValue(uint value) override; |
| 75 | virtual ScriptValue newValue(double value); | 75 | virtual ScriptValue newValue(double value) override; |
| 76 | virtual ScriptValue newValue(const QString& value); | 76 | virtual ScriptValue newValue(const QString& value) override; |
| 77 | virtual ScriptValue newValue(const QLatin1String& value); | 77 | virtual ScriptValue newValue(const QLatin1String& value) override; |
| 78 | virtual ScriptValue newValue(const char* value); | 78 | virtual ScriptValue newValue(const char* value) override; |
| 79 | virtual ScriptValue newVariant(const QVariant& value); | 79 | virtual ScriptValue newVariant(const QVariant& value) override; |
| 80 | virtual ScriptValue nullValue(); | 80 | virtual ScriptValue nullValue() override; |
| 81 | virtual bool raiseException(const ScriptValue& exception); | 81 | virtual bool raiseException(const ScriptValue& exception) override; |
| 82 | //virtual void registerEnum(const QString& enumName, QMetaEnum newEnum); | 82 | //virtual void registerEnum(const QString& enumName, QMetaEnum newEnum) override; |
| 83 | //Q_INVOKABLE virtual void registerFunction(const QString& name, ScriptEngine::FunctionSignature fun, int numArguments = -1); | 83 | //Q_INVOKABLE virtual void registerFunction(const QString& name, ScriptEngine::FunctionSignature fun, int numArguments = -1) override; |
| 84 | //Q_INVOKABLE virtual void registerFunction(const QString& parent, const QString& name, ScriptEngine::FunctionSignature fun, int numArguments = -1); | 84 | //Q_INVOKABLE virtual void registerFunction(const QString& parent, const QString& name, ScriptEngine::FunctionSignature fun, int numArguments = -1) override; |
| 85 | //Q_INVOKABLE virtual void registerGetterSetter(const QString& name, ScriptEngine::FunctionSignature getter, ScriptEngine::FunctionSignature setter, const QString& parent = QString("")); | 85 | //Q_INVOKABLE virtual void registerGetterSetter(const QString& name, ScriptEngine::FunctionSignature getter, ScriptEngine::FunctionSignature setter, const QString& parent = QString("")) override; |
| 86 | //virtual void registerGlobalObject(const QString& name, QObject* object); | 86 | //virtual void registerGlobalObject(const QString& name, QObject* object) override; |
| 87 | virtual void setDefaultPrototype(int metaTypeId, const ScriptValue& prototype); | 87 | virtual void setDefaultPrototype(int metaTypeId, const ScriptValue& prototype) override; |
| 88 | virtual void setObjectName(const QString& name); | 88 | virtual void setObjectName(const QString& name) override; |
| 89 | virtual bool setProperty(const char* name, const QVariant& value); | 89 | virtual bool setProperty(const char* name, const QVariant& value) override; |
| 90 | virtual void setProcessEventsInterval(int interval); | 90 | virtual void setProcessEventsInterval(int interval) override; |
| 91 | virtual QThread* thread() const; | 91 | virtual QThread* thread() const override; |
| 92 | virtual void setThread(QThread* thread); | 92 | virtual void setThread(QThread* thread) override; |
| 93 | virtual ScriptValue undefinedValue(); | 93 | virtual ScriptValue undefinedValue() override; |
| 94 | virtual ScriptValue uncaughtException() const; | 94 | virtual ScriptValue uncaughtException() const override; |
| 95 | virtual QStringList uncaughtExceptionBacktrace() const; | 95 | virtual QStringList uncaughtExceptionBacktrace() const override; |
| 96 | virtual int uncaughtExceptionLineNumber() const; | 96 | virtual int uncaughtExceptionLineNumber() const override; |
| 97 | 97 | ||
| 98 | // helper to detect and log warnings when other code invokes QScriptEngine/BaseScriptEngine in thread-unsafe ways | 98 | // helper to detect and log warnings when other code invokes QScriptEngine/BaseScriptEngine in thread-unsafe ways |
| 99 | inline bool IS_THREADSAFE_INVOCATION(const QString& method) { return ScriptEngine::IS_THREADSAFE_INVOCATION(method); } | 99 | inline bool IS_THREADSAFE_INVOCATION(const QString& method) { return ScriptEngine::IS_THREADSAFE_INVOCATION(method); } |