History

convert script engine variables from QSharedPointer to std::shared_ptr

Heather Anderson committed 5 years ago

Commit 70fbe761 parent 82535ca49 files · +194 −164Browse files

Showing the changes to libraries/script-engine/src/qtscript/ScriptContextQtWrapper.cpp (1 of 49 files). Show all

Unified · Split

libraries/script-engine/src/qtscript/ScriptContextQtWrapper.cpp+3−3
@@ -43,16 +43,16 @@ ScriptValue ScriptContextQtWrapper::callee() const { · 42 unmodified lines
4343 }
4444
4545 ScriptEnginePointer ScriptContextQtWrapper::engine() const {
46− return _engine->sharedFromThis();
46+ return _engine->shared_from_this();
4747 }
4848
4949 ScriptFunctionContextPointer ScriptContextQtWrapper::functionContext() const {
50− return ScriptFunctionContextPointer(new ScriptFunctionContextQtWrapper(_context));
50+ return std::make_shared<ScriptFunctionContextQtWrapper>(_context);
5151 }
5252
5353 ScriptContextPointer ScriptContextQtWrapper::parentContext() const {
5454 QScriptContext* result = _context->parentContext();
55− return result ? ScriptContextPointer(new ScriptContextQtWrapper(_engine, result)) : ScriptContextPointer();
55+ return result ? std::make_shared<ScriptContextQtWrapper>(_engine, result) : ScriptContextPointer();
5656 }
5757
5858 ScriptValue ScriptContextQtWrapper::thisObject() const {