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

Unified · Split

 #ifndef hifi_ScriptEngineQtScript_h
 #define hifi_ScriptEngineQtScript_h
+#include <memory>
 #include <QtCore/QByteArray>
-#include <QtCore/QEnableSharedFromThis>
 #include <QtCore/QMetaEnum>
 #include <QtCore/QObject>
 #include <QtCore/QPointer>
-#include <QtCore/QSharedPointer>
 #include <QtCore/QString>
 #include <QtScript/QScriptEngine>
 class ScriptContextQtAgent;
 class ScriptEngineQtScript;
 class ScriptManager;
-using ScriptEngineQtScriptPointer = QSharedPointer<ScriptEngineQtScript>;
+using ScriptEngineQtScriptPointer = std::shared_ptr<ScriptEngineQtScript>;
-using ScriptContextQtPointer = QSharedPointer<ScriptContextQtWrapper>;
+using ScriptContextQtPointer = std::shared_ptr<ScriptContextQtWrapper>;
 Q_DECLARE_METATYPE(ScriptEngineQtScriptPointer);
 /// [QtScript] Implements ScriptEngine for QtScript and translates calls for QScriptEngine
 class ScriptEngineQtScript final : public QScriptEngine,
                                    public ScriptEngine,
-                                   public QEnableSharedFromThis<ScriptEngineQtScript> {
+                                   public std::enable_shared_from_this<ScriptEngineQtScript> {
     Q_OBJECT
 public:  // construction

Keyboard shortcuts