History

more simplification of ScriptEngineQtScript declarations

Heather Anderson committed 5 years ago

Commit c9bf36e1 parent bd4a0351 file · +16 −41Browse files

Showing the changes to libraries/script-engine/src/qtscript/ScriptEngineQtScript.h (1 of 1 file). Show all

Unified · Split

libraries/script-engine/src/qtscript/ScriptEngineQtScript.h+16−41
@@ -51,9 +51,9 @@ public: // ScriptEngine implementation · 50 unmodified lines
51 virtual void clearExceptions() override;51 virtual void clearExceptions() override;
52 virtual ScriptValue cloneUncaughtException(const QString& detail = QString()) override;52 virtual ScriptValue cloneUncaughtException(const QString& detail = QString()) override;
53 virtual ScriptContext* currentContext() const override;53 virtual ScriptContext* currentContext() const override;
54 //virtual ScriptValue evaluate(const QString& program, const QString& fileName = QString()) override;54 Q_INVOKABLE virtual ScriptValue evaluate(const QString& program, const QString& fileName = QString()) override;
55 //virtual ScriptValue evaluate(const ScriptProgramPointer &program) override;55 Q_INVOKABLE virtual ScriptValue evaluate(const ScriptProgramPointer& program) override;
56 //virtual ScriptValue evaluateInClosure(const ScriptValue& locals, const ScriptProgramPointer& program) override;56 Q_INVOKABLE virtual ScriptValue evaluateInClosure(const ScriptValue& locals, const ScriptProgramPointer& program) override;
57 virtual ScriptValue globalObject() const override;57 virtual ScriptValue globalObject() const override;
58 virtual bool hasUncaughtException() const override;58 virtual bool hasUncaughtException() const override;
59 virtual bool isEvaluating() const override;59 virtual bool isEvaluating() const override;
@@ -81,11 +81,19 @@ public: // ScriptEngine implementation · 21 unmodified lines
81 virtual ScriptValue newVariant(const QVariant& value) override;81 virtual ScriptValue newVariant(const QVariant& value) override;
82 virtual ScriptValue nullValue() override;82 virtual ScriptValue nullValue() override;
83 virtual bool raiseException(const ScriptValue& exception) override;83 virtual bool raiseException(const ScriptValue& exception) override;
84 //virtual void registerEnum(const QString& enumName, QMetaEnum newEnum) override;84 Q_INVOKABLE virtual void registerEnum(const QString& enumName, QMetaEnum newEnum) override;
85 //Q_INVOKABLE virtual void registerFunction(const QString& name, ScriptEngine::FunctionSignature fun, int numArguments = -1) override;85 Q_INVOKABLE virtual void registerFunction(const QString& name,
86 //Q_INVOKABLE virtual void registerFunction(const QString& parent, const QString& name, ScriptEngine::FunctionSignature fun, int numArguments = -1) override;86 ScriptEngine::FunctionSignature fun,
87 //Q_INVOKABLE virtual void registerGetterSetter(const QString& name, ScriptEngine::FunctionSignature getter, ScriptEngine::FunctionSignature setter, const QString& parent = QString("")) override;87 int numArguments = -1) override;
88 //virtual void registerGlobalObject(const QString& name, QObject* object) override;88 Q_INVOKABLE virtual void registerFunction(const QString& parent,
89 const QString& name,
90 ScriptEngine::FunctionSignature fun,
91 int numArguments = -1) override;
92 Q_INVOKABLE virtual void registerGetterSetter(const QString& name,
93 ScriptEngine::FunctionSignature getter,
94 ScriptEngine::FunctionSignature setter,
95 const QString& parent = QString("")) override;
96 Q_INVOKABLE virtual void registerGlobalObject(const QString& name, QObject* object) override;
89 virtual void setDefaultPrototype(int metaTypeId, const ScriptValue& prototype) override;97 virtual void setDefaultPrototype(int metaTypeId, const ScriptValue& prototype) override;
90 virtual void setObjectName(const QString& name) override;98 virtual void setObjectName(const QString& name) override;
91 virtual bool setProperty(const char* name, const QVariant& value) override;99 virtual bool setProperty(const char* name, const QVariant& value) override;
@@ -120,53 +128,20 @@ public: · 28 unmodified lines
120 // NOTE - these are NOT intended to be public interfaces available to scripts, the are only Q_INVOKABLE so we can128 // NOTE - these are NOT intended to be public interfaces available to scripts, the are only Q_INVOKABLE so we can
121 // properly ensure they are only called on the correct thread129 // properly ensure they are only called on the correct thread
122 130
123 /// registers a global object by name
124 Q_INVOKABLE virtual void registerGlobalObject(const QString& name, QObject* object) override;
125
126 /// registers a global getter/setter131 /// registers a global getter/setter
127 Q_INVOKABLE void registerGetterSetter(const QString& name, QScriptEngine::FunctionSignature getter,132 Q_INVOKABLE void registerGetterSetter(const QString& name, QScriptEngine::FunctionSignature getter,
128 QScriptEngine::FunctionSignature setter, const QString& parent = QString(""));133 QScriptEngine::FunctionSignature setter, const QString& parent = QString(""));
129 134
130 Q_INVOKABLE virtual void registerGetterSetter(const QString& name,
131 ScriptEngine::FunctionSignature getter,
132 ScriptEngine::FunctionSignature setter,
133 const QString& parent = QString("")) override;
134
135 /// register a global function135 /// register a global function
136 Q_INVOKABLE void registerFunction(const QString& name, QScriptEngine::FunctionSignature fun, int numArguments = -1);136 Q_INVOKABLE void registerFunction(const QString& name, QScriptEngine::FunctionSignature fun, int numArguments = -1);
137 137
138
139 Q_INVOKABLE virtual void registerFunction(const QString& name,
140 ScriptEngine::FunctionSignature fun,
141 int numArguments = -1) override;
142
143 /// register a function as a method on a previously registered global object138 /// register a function as a method on a previously registered global object
144 Q_INVOKABLE void registerFunction(const QString& parent, const QString& name, QScriptEngine::FunctionSignature fun,139 Q_INVOKABLE void registerFunction(const QString& parent, const QString& name, QScriptEngine::FunctionSignature fun,
145 int numArguments = -1);140 int numArguments = -1);
146 141
147
148 Q_INVOKABLE virtual void registerFunction(const QString& parent,
149 const QString& name,
150 ScriptEngine::FunctionSignature fun,
151 int numArguments = -1) override;
152
153 // WARNING: This function must be called after a registerGlobalObject that creates the namespace this enum is located in, or
154 // the globalObject won't function. E.g., if you have a Foo object and a Foo.FooType enum, Foo must be registered first.
155 /// registers a global enum
156 Q_INVOKABLE virtual void registerEnum(const QString& enumName, QMetaEnum newEnum) override;
157
158 /// registers a global object by name142 /// registers a global object by name
159 Q_INVOKABLE void registerValue(const QString& valueName, QScriptValue value);143 Q_INVOKABLE void registerValue(const QString& valueName, QScriptValue value);
160 144
161 /// evaluate some code in the context of the ScriptEngineQtScript and return the result
162 Q_INVOKABLE virtual ScriptValue evaluate(const QString& program,
163 const QString& fileName) override; // this is also used by the script tool widget
164
165
166 Q_INVOKABLE virtual ScriptValue evaluate(const ScriptProgramPointer& program) override;
167
168 Q_INVOKABLE virtual ScriptValue evaluateInClosure(const ScriptValue& locals, const ScriptProgramPointer& program) override;
169
170 // NOTE - this is used by the TypedArray implementation. we need to review this for thread safety145 // NOTE - this is used by the TypedArray implementation. we need to review this for thread safety
171 inline ArrayBufferClass* getArrayBufferClass() { return _arrayBufferClass; }146 inline ArrayBufferClass* getArrayBufferClass() { return _arrayBufferClass; }
172 147

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t