switch to using QSharedPointer for _entitiesScriptEngine

Brad Hefta-Gaub committed 10 years ago

Commit 9db0fe01 parent a3221f34 files · +54 −23Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.h (1 of 4 files). Show all

Unified · Split

     ~ScriptEngine();
+    // Useful for QSharePointer<ScriptEngine>
+    static void doDeleteLater(ScriptEngine* obj) { obj->deleteLater(); }
     /// run the script in a dedicated thread. This will have the side effect of evalulating
     /// the current script contents and calling run(). Callers will likely want to register the script with external
     /// services before calling this.
     Q_INVOKABLE QUrl resolvePath(const QString& path) const;
     // Entity Script Related methods
-    Q_INVOKABLE void loadEntityScript(const EntityItemID& entityID, const QString& entityScript, bool forceRedownload = false); // will call the preload method once loaded
+    //Q_INVOKABLE void loadEntityScript(const EntityItemID& entityID, const QString& entityScript, bool forceRedownload = false); // will call the preload method once loaded
+    static void loadEntityScript(QWeakPointer<ScriptEngine> theEngine, const EntityItemID& entityID, const QString& entityScript, bool forceRedownload);
     Q_INVOKABLE void unloadEntityScript(const EntityItemID& entityID); // will call unload method
     Q_INVOKABLE void unloadAllEntityScripts();
     Q_INVOKABLE void callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName, const QStringList& params = QStringList());
     static std::atomic<bool> _stoppingAllScripts;
 };
+/*
+class ScriptEngine : public QObject {
+    Q_OBJECT
+};
+*/
 #endif // hifi_ScriptEngine_h