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

Unified · Split

libraries/script-engine/src/ScriptEngine.h+4−3
@@ -16,9 +16,10 @@ · 15 unmodified lines
16#ifndef hifi_ScriptEngine_h16#ifndef hifi_ScriptEngine_h
17#define hifi_ScriptEngine_h17#define hifi_ScriptEngine_h
18 18
19#include <memory>
20
19#include <QtCore/QFlags>21#include <QtCore/QFlags>
20#include <QtCore/QObject>22#include <QtCore/QObject>
21#include <QtCore/QSharedPointer>
22 23
23#include "ScriptValue.h"24#include "ScriptValue.h"
24 25
@@ -31,8 +32,8 @@ class ScriptContext; · 6 unmodified lines
31class ScriptEngine;32class ScriptEngine;
32class ScriptManager;33class ScriptManager;
33class ScriptProgram;34class ScriptProgram;
34using ScriptEnginePointer = QSharedPointer<ScriptEngine>;35using ScriptEnginePointer = std::shared_ptr<ScriptEngine>;
35using ScriptProgramPointer = QSharedPointer<ScriptProgram>;36using ScriptProgramPointer = std::shared_ptr<ScriptProgram>;
36 37
37Q_DECLARE_METATYPE(ScriptEnginePointer);38Q_DECLARE_METATYPE(ScriptEnginePointer);
38 39