History

V8 fixes

ksuprynowicz committed 3 years ago

Commit 5cf32a91 parent f65e72c14 files · +140 −15Browse files

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

Unified · Split

interface/src/scripting/WindowScriptingInterface.cpp+7−0
@@ -77,6 +77,7 @@ WindowScriptingInterface::~WindowScriptingInterface() { · 76 unmodified lines
7777 }
7878
7979 ScriptValue WindowScriptingInterface::hasFocus() {
80+ Q_ASSERT(engine);
8081 return engine()->newValue(qApp->hasFocus());
8182 }
8283
@@ -105,6 +106,7 @@ void WindowScriptingInterface::alert(const QString& message) { · 22 unmodified lines
105106 /// \param const QString& message message to display
106107 /// \return ScriptValue `true` if 'Yes' was clicked, `false` otherwise
107108 ScriptValue WindowScriptingInterface::confirm(const QString& message) {
109+ Q_ASSERT(engine);
108110 return engine()->newValue((QMessageBox::Yes == OffscreenUi::question("", message, QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes)));
109111 }
110112
@@ -114,6 +116,7 @@ ScriptValue WindowScriptingInterface::confirm(const QString& message) { · 3 unmodified lines
114116 /// \return ScriptValue string text value in text box if the dialog was accepted, `null` otherwise.
115117 ScriptValue WindowScriptingInterface::prompt(const QString& message, const QString& defaultText) {
116118 QString result = OffscreenUi::getText(nullptr, "", message, QLineEdit::Normal, defaultText);
119+ Q_ASSERT(engine);
117120 auto sResult = engine()->newValue(result);
118121 if (sResult.equals(engine()->newValue(""))) {
119122 return engine()->nullValue();
@@ -232,6 +235,7 @@ ScriptValue WindowScriptingInterface::browseDir(const QString& title, const QStr · 112 unmodified lines
232235 if (!result.isEmpty()) {
233236 setPreviousBrowseLocation(QFileInfo(result).absolutePath());
234237 }
238+ Q_ASSERT(engine);
235239 return result.isEmpty() ? engine()->nullValue() : engine()->newValue(result);
236240 }
237241
@@ -276,6 +280,7 @@ ScriptValue WindowScriptingInterface::browse(const QString& title, const QString · 38 unmodified lines
276280 if (!result.isEmpty()) {
277281 setPreviousBrowseLocation(QFileInfo(result).absolutePath());
278282 }
283+ Q_ASSERT(engine);
279284 return result.isEmpty() ? engine()->nullValue() : engine()->newValue(result);
280285 }
281286
@@ -323,6 +328,7 @@ ScriptValue WindowScriptingInterface::save(const QString& title, const QString& · 41 unmodified lines
323328 if (!result.isEmpty()) {
324329 setPreviousBrowseLocation(QFileInfo(result).absolutePath());
325330 }
331+ Q_ASSERT(engine);
326332 return result.isEmpty() ? engine()->nullValue() : engine()->newValue(result);
327333 }
328334
@@ -373,6 +379,7 @@ ScriptValue WindowScriptingInterface::browseAssets(const QString& title, const Q · 44 unmodified lines
373379 if (!result.isEmpty()) {
374380 setPreviousBrowseAssetLocation(QFileInfo(result).absolutePath());
375381 }
382+ Q_ASSERT(engine);
376383 return result.isEmpty() ? engine()->nullValue() : engine()->newValue(result);
377384 }
378385