Showing the changes to libraries/script-engine/src/ScriptManager.h (1 of 49 files). Show all
Unified · Split
| @@ -16,10 +16,10 @@ · 15 unmodified lines | ||
| 16 | 16 | #include <atomic> |
| 17 | 17 | #include <chrono> |
| 18 | 18 | #include <functional> |
| 19 | +#include <memory> | |
| 19 | 20 | #include <unordered_map> |
| 20 | 21 | #include <mutex> |
| 21 | 22 | |
| 22 | −#include <QtCore/QEnableSharedFromThis> | |
| 23 | 23 | #include <QtCore/QFuture> |
| 24 | 24 | #include <QtCore/QHash> |
| 25 | 25 | #include <QtCore/QObject> |
| @@ -54,8 +54,8 @@ static const int DEFAULT_ENTITY_PPS_PER_SCRIPT = 900; · 28 unmodified lines | ||
| 54 | 54 | class ScriptEngine; |
| 55 | 55 | class ScriptEngines; |
| 56 | 56 | class ScriptManager; |
| 57 | −using ScriptEnginePointer = QSharedPointer<ScriptEngine>; | |
| 58 | −using ScriptManagerPointer = QSharedPointer<ScriptManager>; | |
| 57 | +using ScriptEnginePointer = std::shared_ptr<ScriptEngine>; | |
| 58 | +using ScriptManagerPointer = std::shared_ptr<ScriptManager>; | |
| 59 | 59 | using ScriptValueList = QList<ScriptValue>; |
| 60 | 60 | |
| 61 | 61 | Q_DECLARE_METATYPE(ScriptManagerPointer) |
| @@ -137,7 +137,7 @@ public: · 75 unmodified lines | ||
| 137 | 137 | * <em>Read-only.</em> |
| 138 | 138 | * @property {Script.ResourceBuckets} ExternalPaths - External resource buckets. |
| 139 | 139 | */ |
| 140 | −class ScriptManager : public QObject, public EntitiesScriptEngineProvider, public QEnableSharedFromThis<ScriptManager> { | |
| 140 | +class ScriptManager : public QObject, public EntitiesScriptEngineProvider, public std::enable_shared_from_this<ScriptManager> { | |
| 141 | 141 | Q_OBJECT |
| 142 | 142 | Q_PROPERTY(QString context READ getContext) |
| 143 | 143 | Q_PROPERTY(QString type READ getTypeAsString) |