Showing the changes to libraries/script-engine/src/qtscript/ScriptEngineQtScript.h (1 of 49 files). Show all
Unified · Split
| @@ -16,12 +16,12 @@ · 15 unmodified lines | ||
| 16 | 16 | #ifndef hifi_ScriptEngineQtScript_h |
| 17 | 17 | #define hifi_ScriptEngineQtScript_h |
| 18 | 18 | |
| 19 | +#include <memory> | |
| 20 | + | |
| 19 | 21 | #include <QtCore/QByteArray> |
| 20 | −#include <QtCore/QEnableSharedFromThis> | |
| 21 | 22 | #include <QtCore/QMetaEnum> |
| 22 | 23 | #include <QtCore/QObject> |
| 23 | 24 | #include <QtCore/QPointer> |
| 24 | −#include <QtCore/QSharedPointer> | |
| 25 | 25 | #include <QtCore/QString> |
| 26 | 26 | |
| 27 | 27 | #include <QtScript/QScriptEngine> |
| @@ -35,15 +35,15 @@ class ScriptContextQtWrapper; · 7 unmodified lines | ||
| 35 | 35 | class ScriptContextQtAgent; |
| 36 | 36 | class ScriptEngineQtScript; |
| 37 | 37 | class ScriptManager; |
| 38 | −using ScriptEngineQtScriptPointer = QSharedPointer<ScriptEngineQtScript>; | |
| 39 | −using ScriptContextQtPointer = QSharedPointer<ScriptContextQtWrapper>; | |
| 38 | +using ScriptEngineQtScriptPointer = std::shared_ptr<ScriptEngineQtScript>; | |
| 39 | +using ScriptContextQtPointer = std::shared_ptr<ScriptContextQtWrapper>; | |
| 40 | 40 | |
| 41 | 41 | Q_DECLARE_METATYPE(ScriptEngineQtScriptPointer); |
| 42 | 42 | |
| 43 | 43 | /// [QtScript] Implements ScriptEngine for QtScript and translates calls for QScriptEngine |
| 44 | 44 | class ScriptEngineQtScript final : public QScriptEngine, |
| 45 | 45 | public ScriptEngine, |
| 46 | − public QEnableSharedFromThis<ScriptEngineQtScript> { | |
| 46 | + public std::enable_shared_from_this<ScriptEngineQtScript> { | |
| 47 | 47 | Q_OBJECT |
| 48 | 48 | |
| 49 | 49 | public: // construction |