Showing the changes to libraries/script-engine/src/qtscript/ScriptContextQtWrapper.cpp (1 of 170 files). Show all
Unified · Split
| @@ -28,18 +28,18 @@ int ScriptContextQtWrapper::argumentCount() const { · 27 unmodified lines | ||
| 28 | 28 | return _context->argumentCount(); |
| 29 | 29 | } |
| 30 | 30 | |
| 31 | −ScriptValuePointer ScriptContextQtWrapper::argument(int index) const { | |
| 31 | +ScriptValue ScriptContextQtWrapper::argument(int index) const { | |
| 32 | 32 | QScriptValue result = _context->argument(index); |
| 33 | − return ScriptValuePointer(new ScriptValueQtWrapper(_engine, std::move(result))); | |
| 33 | + return ScriptValue(new ScriptValueQtWrapper(_engine, std::move(result))); | |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | QStringList ScriptContextQtWrapper::backtrace() const { |
| 37 | 37 | return _context->backtrace(); |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | −ScriptValuePointer ScriptContextQtWrapper::callee() const { | |
| 40 | +ScriptValue ScriptContextQtWrapper::callee() const { | |
| 41 | 41 | QScriptValue result = _context->callee(); |
| 42 | − return ScriptValuePointer(new ScriptValueQtWrapper(_engine, std::move(result))); | |
| 42 | + return ScriptValue(new ScriptValueQtWrapper(_engine, std::move(result))); | |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | ScriptEnginePointer ScriptContextQtWrapper::engine() const { |
| @@ -55,23 +55,23 @@ ScriptContextPointer ScriptContextQtWrapper::parentContext() const { · 9 unmodified lines | ||
| 55 | 55 | return result ? ScriptContextPointer(new ScriptContextQtWrapper(_engine, result)) : ScriptContextPointer(); |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | −ScriptValuePointer ScriptContextQtWrapper::thisObject() const { | |
| 58 | +ScriptValue ScriptContextQtWrapper::thisObject() const { | |
| 59 | 59 | QScriptValue result = _context->thisObject(); |
| 60 | − return ScriptValuePointer(new ScriptValueQtWrapper(_engine, std::move(result))); | |
| 60 | + return ScriptValue(new ScriptValueQtWrapper(_engine, std::move(result))); | |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | −ScriptValuePointer ScriptContextQtWrapper::throwError(const QString& text) { | |
| 63 | +ScriptValue ScriptContextQtWrapper::throwError(const QString& text) { | |
| 64 | 64 | QScriptValue result = _context->throwError(text); |
| 65 | − return ScriptValuePointer(new ScriptValueQtWrapper(_engine, std::move(result))); | |
| 65 | + return ScriptValue(new ScriptValueQtWrapper(_engine, std::move(result))); | |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | −ScriptValuePointer ScriptContextQtWrapper::throwValue(const ScriptValuePointer& value) { | |
| 68 | +ScriptValue ScriptContextQtWrapper::throwValue(const ScriptValue& value) { | |
| 69 | 69 | ScriptValueQtWrapper* unwrapped = ScriptValueQtWrapper::unwrap(value); |
| 70 | 70 | if (!unwrapped) { |
| 71 | 71 | return _engine->undefinedValue(); |
| 72 | 72 | } |
| 73 | 73 | QScriptValue result = _context->throwValue(unwrapped->toQtValue()); |
| 74 | − return ScriptValuePointer(new ScriptValueQtWrapper(_engine, std::move(result))); | |
| 74 | + return ScriptValue(new ScriptValueQtWrapper(_engine, std::move(result))); | |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | |