History

resolve conflicts in merge with upstream/master

Stephen Birarda committed 12 years ago

Commit f13aa322 parents 417aa7a f4f8fe230 files · +695 −172Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.h+3−2
@@ -34,7 +34,7 @@ class ScriptEngine : public QObject { · 33 unmodified lines
34 Q_PROPERTY(bool isAvatar READ isAvatar WRITE setIsAvatar)34 Q_PROPERTY(bool isAvatar READ isAvatar WRITE setIsAvatar)
35public:35public:
36 ScriptEngine(const QString& scriptContents = NO_SCRIPT, bool wantMenuItems = false,36 ScriptEngine(const QString& scriptContents = NO_SCRIPT, bool wantMenuItems = false,
37 const char* scriptMenuName = NULL, AbstractMenuInterface* menu = NULL,37 const QString& scriptMenuName = QString(""), AbstractMenuInterface* menu = NULL,
38 AbstractControllerScriptingInterface* controllerScriptingInterface = NULL);38 AbstractControllerScriptingInterface* controllerScriptingInterface = NULL);
39 39
40 ~ScriptEngine();40 ~ScriptEngine();
@@ -71,7 +71,7 @@ signals: · 30 unmodified lines
71 void willSendAudioDataCallback();71 void willSendAudioDataCallback();
72 void willSendVisualDataCallback();72 void willSendVisualDataCallback();
73 void scriptEnding();73 void scriptEnding();
74 void finished();74 void finished(const QString& fileNameString);
75 75
76protected:76protected:
77 void preEvaluateReset();77 void preEvaluateReset();
@@ -92,6 +92,7 @@ private: · 14 unmodified lines
92 AvatarData* _avatarData;92 AvatarData* _avatarData;
93 bool _wantMenuItems;93 bool _wantMenuItems;
94 QString _scriptMenuName;94 QString _scriptMenuName;
95 QString _fileNameString;
95 AbstractMenuInterface* _menu;96 AbstractMenuInterface* _menu;
96 static int _scriptNumber;97 static int _scriptNumber;
97};98};