History

code review

Seth Alves committed 9 years ago

Commit 8a49edb1 parent cf2979d16 files · +54 −51Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.h+4−4
@@ -244,7 +244,7 @@ signals: · 243 unmodified lines
244 void errorLoadingScript(const QString& scriptFilename);244 void errorLoadingScript(const QString& scriptFilename);
245 void update(float deltaTime);245 void update(float deltaTime);
246 void scriptEnding();246 void scriptEnding();
247 void finished(const QString& fileNameString, QSharedPointer<ScriptEngine>);247 void finished(const QString& fileNameString, ScriptEnginePointer);
248 void cleanupMenuItem(const QString& menuItemString);248 void cleanupMenuItem(const QString& menuItemString);
249 void printedMessage(const QString& message, const QString& scriptName);249 void printedMessage(const QString& message, const QString& scriptName);
250 void errorMessage(const QString& message, const QString& scriptName);250 void errorMessage(const QString& message, const QString& scriptName);
@@ -334,8 +334,8 @@ protected: · 83 unmodified lines
334 QSharedPointer<ScriptEngines> _scriptEngines;334 QSharedPointer<ScriptEngines> _scriptEngines;
335};335};
336 336
337QSharedPointer<ScriptEngine> scriptEngineFactory(ScriptEngine::Context context,337ScriptEnginePointer scriptEngineFactory(ScriptEngine::Context context,
338 const QString& scriptContents,338 const QString& scriptContents,
339 const QString& fileNameString);339 const QString& fileNameString);
340 340
341#endif // hifi_ScriptEngine_h341#endif // hifi_ScriptEngine_h