History

cleanup

Brad Hefta-Gaub committed 10 years ago

Commit 05203631 parent d1f6b373 files · +2 −15Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.h+0−10
@@ -127,10 +127,7 @@ public: · 126 unmodified lines
127 Q_INVOKABLE QUrl resolvePath(const QString& path) const;127 Q_INVOKABLE QUrl resolvePath(const QString& path) const;
128 128
129 // Entity Script Related methods129 // Entity Script Related methods
130 //Q_INVOKABLE void loadEntityScript(const EntityItemID& entityID, const QString& entityScript, bool forceRedownload = false); // will call the preload method once loaded
131
132 static void loadEntityScript(QWeakPointer<ScriptEngine> theEngine, const EntityItemID& entityID, const QString& entityScript, bool forceRedownload);130 static void loadEntityScript(QWeakPointer<ScriptEngine> theEngine, const EntityItemID& entityID, const QString& entityScript, bool forceRedownload);
133
134 Q_INVOKABLE void unloadEntityScript(const EntityItemID& entityID); // will call unload method131 Q_INVOKABLE void unloadEntityScript(const EntityItemID& entityID); // will call unload method
135 Q_INVOKABLE void unloadAllEntityScripts();132 Q_INVOKABLE void unloadAllEntityScripts();
136 Q_INVOKABLE void callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName, const QStringList& params = QStringList());133 Q_INVOKABLE void callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName, const QStringList& params = QStringList());
@@ -230,11 +227,4 @@ protected: · 93 unmodified lines
230 static std::atomic<bool> _stoppingAllScripts;227 static std::atomic<bool> _stoppingAllScripts;
231};228};
232 229
233/*
234class ScriptEngine : public QObject {
235 Q_OBJECT
236};
237*/
238
239
240#endif // hifi_ScriptEngine_h230#endif // hifi_ScriptEngine_h