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
3434 Q_PROPERTY(bool isAvatar READ isAvatar WRITE setIsAvatar)
3535 public:
3636 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,
3838 AbstractControllerScriptingInterface* controllerScriptingInterface = NULL);
3939
4040 ~ScriptEngine();
@@ -71,7 +71,7 @@ signals: · 30 unmodified lines
7171 void willSendAudioDataCallback();
7272 void willSendVisualDataCallback();
7373 void scriptEnding();
74− void finished();
74+ void finished(const QString& fileNameString);
7575
7676 protected:
7777 void preEvaluateReset();
@@ -92,6 +92,7 @@ private: · 14 unmodified lines
9292 AvatarData* _avatarData;
9393 bool _wantMenuItems;
9494 QString _scriptMenuName;
95+ QString _fileNameString;
9596 AbstractMenuInterface* _menu;
9697 static int _scriptNumber;
9798 };