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 libraries/script-engine/src/WebSocketClass.cpp (1 of 170 files). Show all

Unified · Split

libraries/script-engine/src/WebSocketClass.cpp+35−34
@@ -16,6 +16,7 @@ · 15 unmodified lines
1616
1717 #include "ScriptContext.h"
1818 #include "ScriptEngine.h"
19+#include "ScriptEngineCast.h"
1920 #include "ScriptEngineLogging.h"
2021 #include "ScriptValue.h"
2122
@@ -44,10 +45,10 @@ void WebSocketClass::initialize() { · 22 unmodified lines
4445 _binaryType = QStringLiteral("arraybuffer");
4546 }
4647
47−ScriptValuePointer WebSocketClass::constructor(ScriptContext* context, ScriptEngine* engine) {
48+ScriptValue WebSocketClass::constructor(ScriptContext* context, ScriptEngine* engine) {
4849 QString url;
4950 if (context->argumentCount() > 0) {
50− url = context->argument(0)->toString();
51+ url = context->argument(0).toString();
5152 }
5253 return engine->newQObject(new WebSocketClass(engine, url), ScriptEngine::ScriptOwnership);
5354 }
@@ -56,12 +57,12 @@ WebSocketClass::~WebSocketClass() { · 2 unmodified lines
5657 _webSocket->deleteLater();
5758 }
5859
59−void WebSocketClass::send(ScriptValuePointer message) {
60− if (message->isObject()) {
60+void WebSocketClass::send(const ScriptValue& message) {
61+ if (message.isObject()) {
6162 QByteArray ba = scriptvalue_cast<QByteArray>(message);
6263 _webSocket->sendBinaryMessage(ba);
6364 } else {
64− _webSocket->sendTextMessage(message->toString());
65+ _webSocket->sendTextMessage(message.toString());
6566 }
6667 }
6768
@@ -91,14 +92,14 @@ void WebSocketClass::close(QWebSocketProtocol::CloseCode closeCode, QString reas · 23 unmodified lines
9192 */
9293 void WebSocketClass::handleOnClose() {
9394 bool hasError = (_webSocket->error() != QAbstractSocket::UnknownSocketError);
94− if (_onCloseEvent->isFunction()) {
95+ if (_onCloseEvent.isFunction()) {
9596 ScriptValueList args;
96− ScriptValuePointer arg = _engine->newObject();
97− arg->setProperty("code", hasError ? QWebSocketProtocol::CloseCodeAbnormalDisconnection : _webSocket->closeCode());
98− arg->setProperty("reason", _webSocket->closeReason());
99− arg->setProperty("wasClean", !hasError);
97+ ScriptValue arg = _engine->newObject();
98+ arg.setProperty("code", hasError ? QWebSocketProtocol::CloseCodeAbnormalDisconnection : _webSocket->closeCode());
99+ arg.setProperty("reason", _webSocket->closeReason());
100+ arg.setProperty("wasClean", !hasError);
100101 args << arg;
101− _onCloseEvent->call(ScriptValuePointer(), args);
102+ _onCloseEvent.call(ScriptValue(), args);
102103 }
103104 }
104105
@@ -154,8 +155,8 @@ void WebSocketClass::handleOnClose() { · 49 unmodified lines
154155 * @typedef {number} WebSocket.SocketError
155156 */
156157 void WebSocketClass::handleOnError(QAbstractSocket::SocketError error) {
157− if (_onErrorEvent->isFunction()) {
158− _onErrorEvent->call();
158+ if (_onErrorEvent.isFunction()) {
159+ _onErrorEvent.call();
159160 }
160161 }
161162
@@ -170,26 +171,26 @@ void WebSocketClass::handleOnError(QAbstractSocket::SocketError error) { · 8 unmodified lines
170171 * @property {string} data - The message content.
171172 */
172173 void WebSocketClass::handleOnMessage(const QString& message) {
173− if (_onMessageEvent->isFunction()) {
174+ if (_onMessageEvent.isFunction()) {
174175 ScriptValueList args;
175− ScriptValuePointer arg = _engine->newObject();
176− arg->setProperty("data", message);
176+ ScriptValue arg = _engine->newObject();
177+ arg.setProperty("data", message);
177178 args << arg;
178− _onMessageEvent->call(ScriptValuePointer(), args);
179+ _onMessageEvent.call(ScriptValue(), args);
179180 }
180181 }
181182
182183 void WebSocketClass::handleOnBinaryMessage(const QByteArray& message) {
183− if (_onMessageEvent->isFunction()) {
184+ if (_onMessageEvent.isFunction()) {
184185 ScriptValueList args;
185− ScriptValuePointer arg = _engine->newObject();
186− ScriptValuePointer arrayBuffer = _engine->newArrayBuffer(message);
187− if (arrayBuffer->isUndefined()) {
186+ ScriptValue arg = _engine->newObject();
187+ ScriptValue arrayBuffer = _engine->newArrayBuffer(message);
188+ if (arrayBuffer.isUndefined()) {
188189 qCWarning(scriptengine) << "WebSocketClass::handleOnBinaryMessage !ArrayBuffer";
189190 }
190− arg->setProperty("data", arrayBuffer);
191+ arg.setProperty("data", arrayBuffer);
191192 args << arg;
192− _onMessageEvent->call(ScriptValuePointer(), args);
193+ _onMessageEvent.call(ScriptValue(), args);
193194 }
194195 }
195196
@@ -198,31 +199,31 @@ void WebSocketClass::handleOnBinaryMessage(const QByteArray& message) { · 2 unmodified lines
198199 * @callback WebSocket~onOpenCallback
199200 */
200201 void WebSocketClass::handleOnOpen() {
201− if (_onOpenEvent->isFunction()) {
202− _onOpenEvent->call();
202+ if (_onOpenEvent.isFunction()) {
203+ _onOpenEvent.call();
203204 }
204205 }
205206
206−ScriptValuePointer qWSCloseCodeToScriptValue(ScriptEngine* engine, const QWebSocketProtocol::CloseCode &closeCode) {
207+ScriptValue qWSCloseCodeToScriptValue(ScriptEngine* engine, const QWebSocketProtocol::CloseCode &closeCode) {
207208 return engine->newValue(closeCode);
208209 }
209210
210−void qWSCloseCodeFromScriptValue(const ScriptValuePointer &object, QWebSocketProtocol::CloseCode &closeCode) {
211− closeCode = (QWebSocketProtocol::CloseCode)object->toUInt16();
211+void qWSCloseCodeFromScriptValue(const ScriptValue &object, QWebSocketProtocol::CloseCode &closeCode) {
212+ closeCode = (QWebSocketProtocol::CloseCode)object.toUInt16();
212213 }
213214
214−ScriptValuePointer webSocketToScriptValue(ScriptEngine* engine, WebSocketClass* const &in) {
215+ScriptValue webSocketToScriptValue(ScriptEngine* engine, WebSocketClass* const &in) {
215216 return engine->newQObject(in, ScriptEngine::ScriptOwnership);
216217 }
217218
218−void webSocketFromScriptValue(const ScriptValuePointer &object, WebSocketClass* &out) {
219− out = qobject_cast<WebSocketClass*>(object->toQObject());
219+void webSocketFromScriptValue(const ScriptValue &object, WebSocketClass* &out) {
220+ out = qobject_cast<WebSocketClass*>(object.toQObject());
220221 }
221222
222−ScriptValuePointer wscReadyStateToScriptValue(ScriptEngine* engine, const WebSocketClass::ReadyState& readyState) {
223+ScriptValue wscReadyStateToScriptValue(ScriptEngine* engine, const WebSocketClass::ReadyState& readyState) {
223224 return engine->newValue(readyState);
224225 }
225226
226−void wscReadyStateFromScriptValue(const ScriptValuePointer& object, WebSocketClass::ReadyState& readyState) {
227− readyState = (WebSocketClass::ReadyState)object->toUInt16();
227+void wscReadyStateFromScriptValue(const ScriptValue& object, WebSocketClass::ReadyState& readyState) {
228+ readyState = (WebSocketClass::ReadyState)object.toUInt16();
228229 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t