Showing the changes to libraries/script-engine/src/WebSocketServerClass.cpp (1 of 260 files). Show all
Unified · Split
| @@ -13,9 +13,11 @@ · 12 unmodified lines | ||
| 13 | 13 | |
| 14 | 14 | #include "WebSocketServerClass.h" |
| 15 | 15 | |
| 16 | +#include "ScriptContext.h" | |
| 16 | 17 | #include "ScriptEngine.h" |
| 18 | +#include "ScriptValue.h" | |
| 17 | 19 | |
| 18 | −WebSocketServerClass::WebSocketServerClass(QScriptEngine* engine, const QString& serverName, const quint16 port) : | |
| 20 | +WebSocketServerClass::WebSocketServerClass(ScriptEngine* engine, const QString& serverName, const quint16 port) : | |
| 19 | 21 | _webSocketServer(serverName, QWebSocketServer::SslMode::NonSecureMode), |
| 20 | 22 | _engine(engine) |
| 21 | 23 | { |
| @@ -24,24 +26,24 @@ WebSocketServerClass::WebSocketServerClass(QScriptEngine* engine, const QString& · 2 unmodified lines | ||
| 24 | 26 | } |
| 25 | 27 | } |
| 26 | 28 | |
| 27 | −QScriptValue WebSocketServerClass::constructor(QScriptContext* context, QScriptEngine* engine) { | |
| 29 | +ScriptValuePointer WebSocketServerClass::constructor(ScriptContext* context, ScriptEngine* engine) { | |
| 28 | 30 | // the serverName is used in handshakes |
| 29 | 31 | QString serverName = QStringLiteral("HighFidelity - Scripted WebSocket Listener"); |
| 30 | 32 | // port 0 will auto-assign a free port |
| 31 | 33 | quint16 port = 0; |
| 32 | − QScriptValue callee = context->callee(); | |
| 34 | + ScriptValuePointer callee = context->callee(); | |
| 33 | 35 | if (context->argumentCount() > 0) { |
| 34 | − QScriptValue options = context->argument(0); | |
| 35 | − QScriptValue portOption = options.property(QStringLiteral("port")); | |
| 36 | − if (portOption.isValid() && portOption.isNumber()) { | |
| 37 | − port = portOption.toNumber(); | |
| 36 | + ScriptValuePointer options = context->argument(0); | |
| 37 | + ScriptValuePointer portOption = options->property(QStringLiteral("port")); | |
| 38 | + if (portOption->isValid() && portOption->isNumber()) { | |
| 39 | + port = portOption->toNumber(); | |
| 38 | 40 | } |
| 39 | − QScriptValue serverNameOption = options.property(QStringLiteral("serverName")); | |
| 40 | − if (serverNameOption.isValid() && serverNameOption.isString()) { | |
| 41 | − serverName = serverNameOption.toString(); | |
| 41 | + ScriptValuePointer serverNameOption = options->property(QStringLiteral("serverName")); | |
| 42 | + if (serverNameOption->isValid() && serverNameOption->isString()) { | |
| 43 | + serverName = serverNameOption->toString(); | |
| 42 | 44 | } |
| 43 | 45 | } |
| 44 | − return engine->newQObject(new WebSocketServerClass(engine, serverName, port), QScriptEngine::ScriptOwnership); | |
| 46 | + return engine->newQObject(new WebSocketServerClass(engine, serverName, port), ScriptEngine::ScriptOwnership); | |
| 45 | 47 | } |
| 46 | 48 | |
| 47 | 49 | WebSocketServerClass::~WebSocketServerClass() { |