History

rework ScriptValue to act like a stack variable rather than a pointer

Heather Anderson committed 5 years ago

Commit 85810221 parent f209c51170 files · +2837 −2594Browse files

Showing the changes to interface/src/scripting/WindowScriptingInterface.cpp (1 of 170 files). Show all

Unified · Split

interface/src/scripting/WindowScriptingInterface.cpp+15−15
@@ -76,7 +76,7 @@ WindowScriptingInterface::~WindowScriptingInterface() { · 75 unmodified lines
7676 _messageBoxes.clear();
7777 }
7878
79−ScriptValuePointer WindowScriptingInterface::hasFocus() {
79+ScriptValue WindowScriptingInterface::hasFocus() {
8080 return engine()->newValue(qApp->hasFocus());
8181 }
8282
@@ -96,26 +96,26 @@ void WindowScriptingInterface::raise() { · 13 unmodified lines
9696
9797 /// Display an alert box
9898 /// \param const QString& message message to display
99−/// \return ScriptValuePointer::UndefinedValue
99+/// \return ScriptValue::UndefinedValue
100100 void WindowScriptingInterface::alert(const QString& message) {
101101 OffscreenUi::asyncWarning("", message, QMessageBox::Ok, QMessageBox::Ok);
102102 }
103103
104104 /// Display a confirmation box with the options 'Yes' and 'No'
105105 /// \param const QString& message message to display
106−/// \return ScriptValuePointer `true` if 'Yes' was clicked, `false` otherwise
107−ScriptValuePointer WindowScriptingInterface::confirm(const QString& message) {
106+/// \return ScriptValue `true` if 'Yes' was clicked, `false` otherwise
107+ScriptValue WindowScriptingInterface::confirm(const QString& message) {
108108 return engine()->newValue((QMessageBox::Yes == OffscreenUi::question("", message, QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes)));
109109 }
110110
111111 /// Display a prompt with a text box
112112 /// \param const QString& message message to display
113113 /// \param const QString& defaultText default text in the text box
114−/// \return ScriptValuePointer string text value in text box if the dialog was accepted, `null` otherwise.
115−ScriptValuePointer WindowScriptingInterface::prompt(const QString& message, const QString& defaultText) {
114+/// \return ScriptValue string text value in text box if the dialog was accepted, `null` otherwise.
115+ScriptValue WindowScriptingInterface::prompt(const QString& message, const QString& defaultText) {
116116 QString result = OffscreenUi::getText(nullptr, "", message, QLineEdit::Normal, defaultText);
117117 auto sResult = engine()->newValue(result);
118− if (sResult->equals(engine()->newValue(""))) {
118+ if (sResult.equals(engine()->newValue(""))) {
119119 return engine()->nullValue();
120120 }
121121 return sResult;
@@ -218,8 +218,8 @@ void WindowScriptingInterface::ensureReticleVisible() const { · 96 unmodified lines
218218 /// working directory.
219219 /// \param const QString& title title of the window
220220 /// \param const QString& directory directory to start the directory browser at
221−/// \return ScriptValuePointer file path as a string if one was selected, otherwise `ScriptValuePointer::NullValue`
222−ScriptValuePointer WindowScriptingInterface::browseDir(const QString& title, const QString& directory) {
221+/// \return ScriptValue file path as a string if one was selected, otherwise `ScriptValue::NullValue`
222+ScriptValue WindowScriptingInterface::browseDir(const QString& title, const QString& directory) {
223223 ensureReticleVisible();
224224 QString path = directory;
225225 if (path.isEmpty()) {
@@ -262,8 +262,8 @@ void WindowScriptingInterface::browseDirAsync(const QString& title, const QStrin · 36 unmodified lines
262262 /// \param const QString& title title of the window
263263 /// \param const QString& directory directory to start the file browser at
264264 /// \param const QString& nameFilter filter to filter filenames by - see `QFileDialog`
265−/// \return ScriptValuePointer file path as a string if one was selected, otherwise `ScriptValuePointer::NullValue`
266−ScriptValuePointer WindowScriptingInterface::browse(const QString& title, const QString& directory, const QString& nameFilter) {
265+/// \return ScriptValue file path as a string if one was selected, otherwise `ScriptValue::NullValue`
266+ScriptValue WindowScriptingInterface::browse(const QString& title, const QString& directory, const QString& nameFilter) {
267267 ensureReticleVisible();
268268 QString path = directory;
269269 if (path.isEmpty()) {
@@ -309,8 +309,8 @@ void WindowScriptingInterface::browseAsync(const QString& title, const QString& · 39 unmodified lines
309309 /// \param const QString& title title of the window
310310 /// \param const QString& directory directory to start the file browser at
311311 /// \param const QString& nameFilter filter to filter filenames by - see `QFileDialog`
312−/// \return ScriptValuePointer file path as a string if one was selected, otherwise `ScriptValuePointer::NullValue`
313−ScriptValuePointer WindowScriptingInterface::save(const QString& title, const QString& directory, const QString& nameFilter) {
312+/// \return ScriptValue file path as a string if one was selected, otherwise `ScriptValue::NullValue`
313+ScriptValue WindowScriptingInterface::save(const QString& title, const QString& directory, const QString& nameFilter) {
314314 ensureReticleVisible();
315315 QString path = directory;
316316 if (path.isEmpty()) {
@@ -356,8 +356,8 @@ void WindowScriptingInterface::saveAsync(const QString& title, const QString& di · 39 unmodified lines
356356 /// \param const QString& title title of the window
357357 /// \param const QString& directory directory to start the asset browser at
358358 /// \param const QString& nameFilter filter to filter asset names by - see `QFileDialog`
359−/// \return ScriptValuePointer asset path as a string if one was selected, otherwise `ScriptValuePointer::NullValue`
360−ScriptValuePointer WindowScriptingInterface::browseAssets(const QString& title, const QString& directory, const QString& nameFilter) {
359+/// \return ScriptValue asset path as a string if one was selected, otherwise `ScriptValue::NullValue`
360+ScriptValue WindowScriptingInterface::browseAssets(const QString& title, const QString& directory, const QString& nameFilter) {
361361 ensureReticleVisible();
362362 QString path = directory;
363363 if (path.isEmpty()) {