History

cleanup constructors

ZappoMan committed 12 years ago

Commit cfa618d1 parent 4fbb4b210 files · +47 −50Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+14−9
@@ -44,22 +44,28 @@ static QScriptValue soundConstructor(QScriptContext* context, QScriptEngine* eng · 43 unmodified lines
44 44
45ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems, const QString& fileNameString,45ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems, const QString& fileNameString,
46 AbstractControllerScriptingInterface* controllerScriptingInterface) :46 AbstractControllerScriptingInterface* controllerScriptingInterface) :
47
48 _scriptContents(scriptContents),
49 _isFinished(false),
50 _isRunning(false),
51 _isInitialized(false),
52 _engine(),
47 _isAvatar(false),53 _isAvatar(false),
48 _avatarIdentityTimer(NULL),54 _avatarIdentityTimer(NULL),
49 _avatarBillboardTimer(NULL),55 _avatarBillboardTimer(NULL),
50 _avatarData(NULL)56 _timerFunctionMap(),
57 _controllerScriptingInterface(controllerScriptingInterface),
58 _avatarData(NULL),
59 _wantMenuItems(wantMenuItems),
60 _scriptMenuName(),
61 _fileNameString(fileNameString),
62 _quatLibrary(),
63 _vec3Library()
51{64{
52 _scriptContents = scriptContents;
53 _isFinished = false;
54 _isRunning = false;
55 _isInitialized = false;
56 _fileNameString = fileNameString;
57
58 QByteArray fileNameAscii = fileNameString.toLocal8Bit();65 QByteArray fileNameAscii = fileNameString.toLocal8Bit();
59 const char* scriptMenuName = fileNameAscii.data();66 const char* scriptMenuName = fileNameAscii.data();
60 67
61 // some clients will use these menu features68 // some clients will use these menu features
62 _wantMenuItems = wantMenuItems;
63 if (!fileNameString.isEmpty()) {69 if (!fileNameString.isEmpty()) {
64 _scriptMenuName = "Stop ";70 _scriptMenuName = "Stop ";
65 _scriptMenuName.append(scriptMenuName);71 _scriptMenuName.append(scriptMenuName);
@@ -69,7 +75,6 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems, co · 3 unmodified lines
69 _scriptMenuName.append(_scriptNumber);75 _scriptMenuName.append(_scriptNumber);
70 }76 }
71 _scriptNumber++;77 _scriptNumber++;
72 _controllerScriptingInterface = controllerScriptingInterface;
73}78}
74 79
75ScriptEngine::~ScriptEngine() {80ScriptEngine::~ScriptEngine() {