Showing the changes to libraries/script-engine/src/WebSocketClass.cpp (1 of 170 files). Show all
Unified · Split
| @@ -16,6 +16,7 @@ · 15 unmodified lines | ||
| 16 | 16 | |
| 17 | 17 | #include "ScriptContext.h" |
| 18 | 18 | #include "ScriptEngine.h" |
| 19 | +#include "ScriptEngineCast.h" | |
| 19 | 20 | #include "ScriptEngineLogging.h" |
| 20 | 21 | #include "ScriptValue.h" |
| 21 | 22 | |
| @@ -44,10 +45,10 @@ void WebSocketClass::initialize() { · 22 unmodified lines | ||
| 44 | 45 | _binaryType = QStringLiteral("arraybuffer"); |
| 45 | 46 | } |
| 46 | 47 | |
| 47 | −ScriptValuePointer WebSocketClass::constructor(ScriptContext* context, ScriptEngine* engine) { | |
| 48 | +ScriptValue WebSocketClass::constructor(ScriptContext* context, ScriptEngine* engine) { | |
| 48 | 49 | QString url; |
| 49 | 50 | if (context->argumentCount() > 0) { |
| 50 | − url = context->argument(0)->toString(); | |
| 51 | + url = context->argument(0).toString(); | |
| 51 | 52 | } |
| 52 | 53 | return engine->newQObject(new WebSocketClass(engine, url), ScriptEngine::ScriptOwnership); |
| 53 | 54 | } |
| @@ -56,12 +57,12 @@ WebSocketClass::~WebSocketClass() { · 2 unmodified lines | ||
| 56 | 57 | _webSocket->deleteLater(); |
| 57 | 58 | } |
| 58 | 59 | |
| 59 | −void WebSocketClass::send(ScriptValuePointer message) { | |
| 60 | − if (message->isObject()) { | |
| 60 | +void WebSocketClass::send(const ScriptValue& message) { | |
| 61 | + if (message.isObject()) { | |
| 61 | 62 | QByteArray ba = scriptvalue_cast<QByteArray>(message); |
| 62 | 63 | _webSocket->sendBinaryMessage(ba); |
| 63 | 64 | } else { |
| 64 | − _webSocket->sendTextMessage(message->toString()); | |
| 65 | + _webSocket->sendTextMessage(message.toString()); | |
| 65 | 66 | } |
| 66 | 67 | } |
| 67 | 68 | |
| @@ -91,14 +92,14 @@ void WebSocketClass::close(QWebSocketProtocol::CloseCode closeCode, QString reas · 23 unmodified lines | ||
| 91 | 92 | */ |
| 92 | 93 | void WebSocketClass::handleOnClose() { |
| 93 | 94 | bool hasError = (_webSocket->error() != QAbstractSocket::UnknownSocketError); |
| 94 | − if (_onCloseEvent->isFunction()) { | |
| 95 | + if (_onCloseEvent.isFunction()) { | |
| 95 | 96 | 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); | |
| 100 | 101 | args << arg; |
| 101 | − _onCloseEvent->call(ScriptValuePointer(), args); | |
| 102 | + _onCloseEvent.call(ScriptValue(), args); | |
| 102 | 103 | } |
| 103 | 104 | } |
| 104 | 105 | |
| @@ -154,8 +155,8 @@ void WebSocketClass::handleOnClose() { · 49 unmodified lines | ||
| 154 | 155 | * @typedef {number} WebSocket.SocketError |
| 155 | 156 | */ |
| 156 | 157 | void WebSocketClass::handleOnError(QAbstractSocket::SocketError error) { |
| 157 | − if (_onErrorEvent->isFunction()) { | |
| 158 | − _onErrorEvent->call(); | |
| 158 | + if (_onErrorEvent.isFunction()) { | |
| 159 | + _onErrorEvent.call(); | |
| 159 | 160 | } |
| 160 | 161 | } |
| 161 | 162 | |
| @@ -170,26 +171,26 @@ void WebSocketClass::handleOnError(QAbstractSocket::SocketError error) { · 8 unmodified lines | ||
| 170 | 171 | * @property {string} data - The message content. |
| 171 | 172 | */ |
| 172 | 173 | void WebSocketClass::handleOnMessage(const QString& message) { |
| 173 | − if (_onMessageEvent->isFunction()) { | |
| 174 | + if (_onMessageEvent.isFunction()) { | |
| 174 | 175 | ScriptValueList args; |
| 175 | − ScriptValuePointer arg = _engine->newObject(); | |
| 176 | − arg->setProperty("data", message); | |
| 176 | + ScriptValue arg = _engine->newObject(); | |
| 177 | + arg.setProperty("data", message); | |
| 177 | 178 | args << arg; |
| 178 | − _onMessageEvent->call(ScriptValuePointer(), args); | |
| 179 | + _onMessageEvent.call(ScriptValue(), args); | |
| 179 | 180 | } |
| 180 | 181 | } |
| 181 | 182 | |
| 182 | 183 | void WebSocketClass::handleOnBinaryMessage(const QByteArray& message) { |
| 183 | − if (_onMessageEvent->isFunction()) { | |
| 184 | + if (_onMessageEvent.isFunction()) { | |
| 184 | 185 | 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()) { | |
| 188 | 189 | qCWarning(scriptengine) << "WebSocketClass::handleOnBinaryMessage !ArrayBuffer"; |
| 189 | 190 | } |
| 190 | − arg->setProperty("data", arrayBuffer); | |
| 191 | + arg.setProperty("data", arrayBuffer); | |
| 191 | 192 | args << arg; |
| 192 | − _onMessageEvent->call(ScriptValuePointer(), args); | |
| 193 | + _onMessageEvent.call(ScriptValue(), args); | |
| 193 | 194 | } |
| 194 | 195 | } |
| 195 | 196 | |
| @@ -198,31 +199,31 @@ void WebSocketClass::handleOnBinaryMessage(const QByteArray& message) { · 2 unmodified lines | ||
| 198 | 199 | * @callback WebSocket~onOpenCallback |
| 199 | 200 | */ |
| 200 | 201 | void WebSocketClass::handleOnOpen() { |
| 201 | − if (_onOpenEvent->isFunction()) { | |
| 202 | − _onOpenEvent->call(); | |
| 202 | + if (_onOpenEvent.isFunction()) { | |
| 203 | + _onOpenEvent.call(); | |
| 203 | 204 | } |
| 204 | 205 | } |
| 205 | 206 | |
| 206 | −ScriptValuePointer qWSCloseCodeToScriptValue(ScriptEngine* engine, const QWebSocketProtocol::CloseCode &closeCode) { | |
| 207 | +ScriptValue qWSCloseCodeToScriptValue(ScriptEngine* engine, const QWebSocketProtocol::CloseCode &closeCode) { | |
| 207 | 208 | return engine->newValue(closeCode); |
| 208 | 209 | } |
| 209 | 210 | |
| 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(); | |
| 212 | 213 | } |
| 213 | 214 | |
| 214 | −ScriptValuePointer webSocketToScriptValue(ScriptEngine* engine, WebSocketClass* const &in) { | |
| 215 | +ScriptValue webSocketToScriptValue(ScriptEngine* engine, WebSocketClass* const &in) { | |
| 215 | 216 | return engine->newQObject(in, ScriptEngine::ScriptOwnership); |
| 216 | 217 | } |
| 217 | 218 | |
| 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()); | |
| 220 | 221 | } |
| 221 | 222 | |
| 222 | −ScriptValuePointer wscReadyStateToScriptValue(ScriptEngine* engine, const WebSocketClass::ReadyState& readyState) { | |
| 223 | +ScriptValue wscReadyStateToScriptValue(ScriptEngine* engine, const WebSocketClass::ReadyState& readyState) { | |
| 223 | 224 | return engine->newValue(readyState); |
| 224 | 225 | } |
| 225 | 226 | |
| 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(); | |
| 228 | 229 | } |