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/ScriptEngineQtScript.cpp (1 of 49 files). Show all

Unified · Split

libraries/script-engine/src/qtscript/ScriptEngineQtScript.cpp+2−2

@@ -777,7 +777,7 @@ ScriptValue ScriptEngineQtScript::newObject() { · 776 unmodified lines
777	777
778	778	ScriptProgramPointer ScriptEngineQtScript::newProgram(const QString& sourceCode, const QString& fileName) {
779	779	QScriptProgram result(sourceCode, fileName);
780		− return ScriptProgramPointer(new ScriptProgramQtWrapper(this, result));
	780	+ return std::make_shared<ScriptProgramQtWrapper>(this, result);
781	781	}
782	782
783	783	ScriptValue ScriptEngineQtScript::newQObject(QObject* object,
@@ -857,7 +857,7 @@ ScriptContext* ScriptEngineQtScript::currentContext() const { · 73 unmodified lines
857	857	return nullptr;
858	858	}
859	859	if (!_currContext \|\| _currContext->toQtValue() != localCtx) {
860		− _currContext = ScriptContextQtPointer(new ScriptContextQtWrapper(const_cast<ScriptEngineQtScript*>(this), localCtx));
	860	+ _currContext = std::make_shared<ScriptContextQtWrapper>(const_cast<ScriptEngineQtScript*>(this), localCtx);
861	861	}
862	862	return _currContext.get();
863	863	}