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

Unified · Split

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