Merge pull request #1822 from birarda/cleanup

application destructor cleanup, spacing cleanup

ZappoMan committed 12 years ago

Commit ed3f7b92 parents 867b66e 40a963c6 files · +38 −37Browse files

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

Unified · Split

@@ -40,7 +40,8 @@ static QScriptValue soundConstructor(QScriptContext* context, QScriptEngine* eng · 39 unmodified lines
40	40	}
41	41
42	42
43		−ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems, const QString& fileNameString, AbstractMenuInterface* menu,
	43	+ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems, const QString& fileNameString,
	44	+ AbstractMenuInterface* menu,
44	45	AbstractControllerScriptingInterface* controllerScriptingInterface) :
45	46	_isAvatar(false),
46	47	_dataServerScriptingInterface(),