Showing the changes to libraries/script-engine/src/ScriptValue.h (1 of 49 files). Show all
Unified · Split
| @@ -15,10 +15,11 @@ · 14 unmodified lines | |||
| 15 | #ifndef hifi_ScriptValue_h | 15 | #ifndef hifi_ScriptValue_h |
| 16 | #define hifi_ScriptValue_h | 16 | #define hifi_ScriptValue_h |
| 17 | 17 | ||
| 18 | #include <memory> | ||
| 19 | |||
| 18 | #include <QtCore/QObject> | 20 | #include <QtCore/QObject> |
| 19 | #include <QtCore/QFlags> | 21 | #include <QtCore/QFlags> |
| 20 | #include <QtCore/QList> | 22 | #include <QtCore/QList> |
| 21 | #include <QtCore/QSharedPointer> | ||
| 22 | #include <QtCore/QString> | 23 | #include <QtCore/QString> |
| 23 | #include <QtCore/QVariant> | 24 | #include <QtCore/QVariant> |
| 24 | 25 | ||
| @@ -26,9 +27,9 @@ class ScriptEngine; · 1 unmodified line | |||
| 26 | class ScriptValue; | 27 | class ScriptValue; |
| 27 | class ScriptValueIterator; | 28 | class ScriptValueIterator; |
| 28 | class ScriptValueProxy; | 29 | class ScriptValueProxy; |
| 29 | using ScriptEnginePointer = QSharedPointer<ScriptEngine>; | 30 | using ScriptEnginePointer = std::shared_ptr<ScriptEngine>; |
| 30 | using ScriptValueList = QList<ScriptValue>; | 31 | using ScriptValueList = QList<ScriptValue>; |
| 31 | using ScriptValueIteratorPointer = QSharedPointer<ScriptValueIterator>; | 32 | using ScriptValueIteratorPointer = std::shared_ptr<ScriptValueIterator>; |
| 32 | 33 | ||
| 33 | /// [ScriptInterface] Provides an engine-independent interface for QScriptValue | 34 | /// [ScriptInterface] Provides an engine-independent interface for QScriptValue |
| 34 | class ScriptValue { | 35 | class ScriptValue { |