Showing the changes to libraries/script-engine/src/qtscript/ScriptEngineQtScript.h (1 of 4 files). Show all
Unified · Split
| @@ -130,7 +130,7 @@ public: · 129 unmodified lines | ||
| 130 | 130 | * @deprecated This function is deprecated and will be removed. |
| 131 | 131 | */ |
| 132 | 132 | /// registers a global object by name |
| 133 | − Q_INVOKABLE virtual void registerGlobalObject(const QString& name, QObject* object); | |
| 133 | + Q_INVOKABLE virtual void registerGlobalObject(const QString& name, QObject* object) override; | |
| 134 | 134 | |
| 135 | 135 | /**jsdoc |
| 136 | 136 | * @function Script.registerGetterSetter |
| @@ -144,7 +144,10 @@ public: · 7 unmodified lines | ||
| 144 | 144 | Q_INVOKABLE void registerGetterSetter(const QString& name, QScriptEngine::FunctionSignature getter, |
| 145 | 145 | QScriptEngine::FunctionSignature setter, const QString& parent = QString("")); |
| 146 | 146 | |
| 147 | − Q_INVOKABLE virtual void registerGetterSetter(const QString& name, ScriptEngine::FunctionSignature getter, ScriptEngine::FunctionSignature setter, const QString& parent = QString("")); | |
| 147 | + Q_INVOKABLE virtual void registerGetterSetter(const QString& name, | |
| 148 | + ScriptEngine::FunctionSignature getter, | |
| 149 | + ScriptEngine::FunctionSignature setter, | |
| 150 | + const QString& parent = QString("")) override; | |
| 148 | 151 | |
| 149 | 152 | /**jsdoc |
| 150 | 153 | * @function Script.registerFunction |
| @@ -157,7 +160,9 @@ public: · 6 unmodified lines | ||
| 157 | 160 | Q_INVOKABLE void registerFunction(const QString& name, QScriptEngine::FunctionSignature fun, int numArguments = -1); |
| 158 | 161 | |
| 159 | 162 | |
| 160 | − Q_INVOKABLE virtual void registerFunction(const QString& name, ScriptEngine::FunctionSignature fun, int numArguments = -1); | |
| 163 | + Q_INVOKABLE virtual void registerFunction(const QString& name, | |
| 164 | + ScriptEngine::FunctionSignature fun, | |
| 165 | + int numArguments = -1) override; | |
| 161 | 166 | |
| 162 | 167 | /**jsdoc |
| 163 | 168 | * @function Script.registerFunction |
| @@ -172,7 +177,10 @@ public: · 8 unmodified lines | ||
| 172 | 177 | int numArguments = -1); |
| 173 | 178 | |
| 174 | 179 | |
| 175 | − Q_INVOKABLE virtual void registerFunction(const QString& parent, const QString& name, ScriptEngine::FunctionSignature fun, int numArguments = -1); | |
| 180 | + Q_INVOKABLE virtual void registerFunction(const QString& parent, | |
| 181 | + const QString& name, | |
| 182 | + ScriptEngine::FunctionSignature fun, | |
| 183 | + int numArguments = -1) override; | |
| 176 | 184 | |
| 177 | 185 | /**jsdoc |
| 178 | 186 | * @function Script.registerEnum |
| @@ -183,7 +191,7 @@ public: · 4 unmodified lines | ||
| 183 | 191 | // WARNING: This function must be called after a registerGlobalObject that creates the namespace this enum is located in, or |
| 184 | 192 | // the globalObject won't function. E.g., if you have a Foo object and a Foo.FooType enum, Foo must be registered first. |
| 185 | 193 | /// registers a global enum |
| 186 | − Q_INVOKABLE virtual void registerEnum(const QString& enumName, QMetaEnum newEnum); | |
| 194 | + Q_INVOKABLE virtual void registerEnum(const QString& enumName, QMetaEnum newEnum) override; | |
| 187 | 195 | |
| 188 | 196 | /**jsdoc |
| 189 | 197 | * @function Script.registerValue |
| @@ -203,10 +211,11 @@ public: · 13 unmodified lines | ||
| 203 | 211 | * @deprecated This function is deprecated and will be removed. |
| 204 | 212 | */ |
| 205 | 213 | /// evaluate some code in the context of the ScriptEngineQtScript and return the result |
| 206 | − Q_INVOKABLE virtual ScriptValue evaluate(const QString& program, const QString& fileName); // this is also used by the script tool widget | |
| 214 | + Q_INVOKABLE virtual ScriptValue evaluate(const QString& program, | |
| 215 | + const QString& fileName) override; // this is also used by the script tool widget | |
| 207 | 216 | |
| 208 | 217 | |
| 209 | − Q_INVOKABLE virtual ScriptValue evaluate(const ScriptProgramPointer& program); | |
| 218 | + Q_INVOKABLE virtual ScriptValue evaluate(const ScriptProgramPointer& program) override; | |
| 210 | 219 | |
| 211 | 220 | /**jsdoc |
| 212 | 221 | * @function Script.evaluateInClosure |
| @@ -215,7 +224,7 @@ public: · 2 unmodified lines | ||
| 215 | 224 | * @returns {object} Object. |
| 216 | 225 | * @deprecated This function is deprecated and will be removed. |
| 217 | 226 | */ |
| 218 | − Q_INVOKABLE virtual ScriptValue evaluateInClosure(const ScriptValue& locals, const ScriptProgramPointer& program); | |
| 227 | + Q_INVOKABLE virtual ScriptValue evaluateInClosure(const ScriptValue& locals, const ScriptProgramPointer& program) override; | |
| 219 | 228 | |
| 220 | 229 | /**jsdoc |
| 221 | 230 | * Checks whether the application was compiled as a debug build. |
| @@ -260,7 +269,7 @@ public: · 38 unmodified lines | ||
| 260 | 269 | * @param {number} deltaSize - Delta size. |
| 261 | 270 | * @deprecated This function is deprecated and will be removed. |
| 262 | 271 | */ |
| 263 | − virtual void updateMemoryCost(const qint64& deltaSize); | |
| 272 | + virtual void updateMemoryCost(const qint64& deltaSize) override; | |
| 264 | 273 | |
| 265 | 274 | signals: |
| 266 | 275 | |
| @@ -381,10 +390,11 @@ signals: · 114 unmodified lines | ||
| 381 | 390 | void entityScriptDetailsUpdated(); |
| 382 | 391 | |
| 383 | 392 | public: // not for public use, but I don't like how Qt strings this along with private friend functions |
| 384 | − virtual ScriptValue create(int type, const void* ptr); | |
| 385 | − virtual bool convert(const ScriptValue& value, int type, void* ptr); | |
| 393 | + virtual ScriptValue create(int type, const void* ptr) override; | |
| 394 | + virtual bool convert(const ScriptValue& value, int type, void* ptr) override; | |
| 386 | 395 | virtual void registerCustomType(int type, ScriptEngine::MarshalFunction marshalFunc, |
| 387 | − ScriptEngine::DemarshalFunction demarshalFunc, const ScriptValue& prototype); | |
| 396 | + ScriptEngine::DemarshalFunction demarshalFunc, | |
| 397 | + const ScriptValue& prototype) override; | |
| 388 | 398 | |
| 389 | 399 | protected: |
| 390 | 400 | // like `newFunction`, but allows mapping inline C++ lambdas with captures as callable QScriptValues |