isolate calls to the QtScript libraries to an interface we control

Heather Anderson committed 5 years ago

Commit 1e018db1 parent 713b29e260 files · +6904 −5064Browse files

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

Unified · Split

interface/src/scripting/WindowScriptingInterface.cpp+25−24

 #include <QClipboard>
 #include <QtCore/QDir>
 #include <QMessageBox>
-#include <QtScript/QScriptValue>
+#include <ScriptValue.h>
 #include <QtGui/QDesktopServices>
 #include <shared/QtHelpers.h>
 #include <SettingHandle.h>
     _messageBoxes.clear();
 }
-QScriptValue WindowScriptingInterface::hasFocus() {
+ScriptValuePointer WindowScriptingInterface::hasFocus() {
-    return qApp->hasFocus();
+    return engine()->newValue(qApp->hasFocus());
 }
 void WindowScriptingInterface::setFocus() {
 /// Display an alert box
 /// \param const QString& message message to display
-/// \return QScriptValue::UndefinedValue
+/// \return ScriptValuePointer::UndefinedValue
 void WindowScriptingInterface::alert(const QString& message) {
     OffscreenUi::asyncWarning("", message, QMessageBox::Ok, QMessageBox::Ok);
 }
 /// Display a confirmation box with the options 'Yes' and 'No'
 /// \param const QString& message message to display
-/// \return QScriptValue `true` if 'Yes' was clicked, `false` otherwise
+/// \return ScriptValuePointer `true` if 'Yes' was clicked, `false` otherwise
-QScriptValue WindowScriptingInterface::confirm(const QString& message) {
+ScriptValuePointer WindowScriptingInterface::confirm(const QString& message) {
-    return QScriptValue((QMessageBox::Yes == OffscreenUi::question("", message, QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes)));
+    return engine()->newValue((QMessageBox::Yes == OffscreenUi::question("", message, QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes)));
 }
 /// Display a prompt with a text box
 /// \param const QString& message message to display
 /// \param const QString& defaultText default text in the text box
-/// \return QScriptValue string text value in text box if the dialog was accepted, `null` otherwise.
+/// \return ScriptValuePointer string text value in text box if the dialog was accepted, `null` otherwise.
-QScriptValue WindowScriptingInterface::prompt(const QString& message, const QString& defaultText) {
+ScriptValuePointer WindowScriptingInterface::prompt(const QString& message, const QString& defaultText) {
     QString result = OffscreenUi::getText(nullptr, "", message, QLineEdit::Normal, defaultText);
-    if (QScriptValue(result).equals("")) {
+    auto sResult = engine()->newValue(result);
-        return QScriptValue::NullValue;
+    if (sResult->equals(engine()->newValue(""))) {
+        return engine()->nullValue();
     }
-    return QScriptValue(result);
+    return sResult;
 }
 /// Display a prompt with a text box
 /// working directory.
 /// \param const QString& title title of the window
 /// \param const QString& directory directory to start the directory browser at
-/// \return QScriptValue file path as a string if one was selected, otherwise `QScriptValue::NullValue`
+/// \return ScriptValuePointer file path as a string if one was selected, otherwise `ScriptValuePointer::NullValue`
-QScriptValue WindowScriptingInterface::browseDir(const QString& title, const QString& directory) {
+ScriptValuePointer WindowScriptingInterface::browseDir(const QString& title, const QString& directory) {
     ensureReticleVisible();
     QString path = directory;
     if (path.isEmpty()) {
     if (!result.isEmpty()) {
         setPreviousBrowseLocation(QFileInfo(result).absolutePath());
     }
-    return result.isEmpty() ? QScriptValue::NullValue : QScriptValue(result);
+    return result.isEmpty() ? engine()->nullValue() : engine()->newValue(result);
 }
 /// Display a "browse to directory" dialog.  If `directory` is an invalid file or directory the browser will start at the current
 /// \param const QString& title title of the window
 /// \param const QString& directory directory to start the file browser at
 /// \param const QString& nameFilter filter to filter filenames by - see `QFileDialog`
-/// \return QScriptValue file path as a string if one was selected, otherwise `QScriptValue::NullValue`
+/// \return ScriptValuePointer file path as a string if one was selected, otherwise `ScriptValuePointer::NullValue`
-QScriptValue WindowScriptingInterface::browse(const QString& title, const QString& directory, const QString& nameFilter) {
+ScriptValuePointer WindowScriptingInterface::browse(const QString& title, const QString& directory, const QString& nameFilter) {
     ensureReticleVisible();
     QString path = directory;
     if (path.isEmpty()) {
     if (!result.isEmpty()) {
         setPreviousBrowseLocation(QFileInfo(result).absolutePath());
     }
-    return result.isEmpty() ? QScriptValue::NullValue : QScriptValue(result);
+    return result.isEmpty() ? engine()->nullValue() : engine()->newValue(result);
 }
 /// Display an open file dialog.  If `directory` is an invalid file or directory the browser will start at the current
 /// \param const QString& title title of the window
 /// \param const QString& directory directory to start the file browser at
 /// \param const QString& nameFilter filter to filter filenames by - see `QFileDialog`
-/// \return QScriptValue file path as a string if one was selected, otherwise `QScriptValue::NullValue`
+/// \return ScriptValuePointer file path as a string if one was selected, otherwise `ScriptValuePointer::NullValue`
-QScriptValue WindowScriptingInterface::save(const QString& title, const QString& directory, const QString& nameFilter) {
+ScriptValuePointer WindowScriptingInterface::save(const QString& title, const QString& directory, const QString& nameFilter) {
     ensureReticleVisible();
     QString path = directory;
     if (path.isEmpty()) {
     if (!result.isEmpty()) {
         setPreviousBrowseLocation(QFileInfo(result).absolutePath());
     }
-    return result.isEmpty() ? QScriptValue::NullValue : QScriptValue(result);
+    return result.isEmpty() ? engine()->nullValue() : engine()->newValue(result);
 }
 /// Display a save file dialog.  If `directory` is an invalid file or directory the browser will start at the current
 /// \param const QString& title title of the window
 /// \param const QString& directory directory to start the asset browser at
 /// \param const QString& nameFilter filter to filter asset names by - see `QFileDialog`
-/// \return QScriptValue asset path as a string if one was selected, otherwise `QScriptValue::NullValue`
+/// \return ScriptValuePointer asset path as a string if one was selected, otherwise `ScriptValuePointer::NullValue`
-QScriptValue WindowScriptingInterface::browseAssets(const QString& title, const QString& directory, const QString& nameFilter) {
+ScriptValuePointer WindowScriptingInterface::browseAssets(const QString& title, const QString& directory, const QString& nameFilter) {
     ensureReticleVisible();
     QString path = directory;
     if (path.isEmpty()) {
     if (!result.isEmpty()) {
         setPreviousBrowseAssetLocation(QFileInfo(result).absolutePath());
     }
-    return result.isEmpty() ? QScriptValue::NullValue : QScriptValue(result);
+    return result.isEmpty() ? engine()->nullValue() : engine()->newValue(result);
 }
 /// Display a select asset dialog that lets the user select an asset from the Asset Server.  If `directory` is an invalid