Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup

Brad Hefta-Gaub committed 11 years ago

Commit 54a45f32 parents 94b273a 096a6cb158 files · +3655 −2709Browse files

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

Unified · Split

@@ -162,10 +162,7 @@ protected: · 161 unmodified lines
162	QHash<QTimer*, QScriptValue> _timerFunctionMap;	162	QHash<QTimer*, QScriptValue> _timerFunctionMap;
163	QSet<QUrl> _includedURLs;	163	QSet<QUrl> _includedURLs;
164	bool _wantSignals = true;	164	bool _wantSignals = true;
165
166	QHash<EntityItemID, EntityScriptDetails> _entityScripts;	165	QHash<EntityItemID, EntityScriptDetails> _entityScripts;
167
168
169	private:	166	private:
170	void init();	167	void init();
171	QString getFilename() const;	168	QString getFilename() const;

Keyboard shortcuts