History

- remove webSockets from List after disconnect. - leave it up to the QtScript to delete the WebSocket / WebSocketServer objects

Thijs Wenker committed 11 years ago

Commit 9edba451 parent f5122053 files · +8 −7Browse files

Showing the changes to libraries/script-engine/src/WebSocketClass.cpp (1 of 3 files). Show all

Unified · Split

libraries/script-engine/src/WebSocketClass.cpp+2−4
@@ -42,9 +42,7 @@ QScriptValue WebSocketClass::constructor(QScriptContext* context, QScriptEngine* · 41 unmodified lines
42 if (context->argumentCount() > 0) {42 if (context->argumentCount() > 0) {
43 url = context->argument(0).toString();43 url = context->argument(0).toString();
44 }44 }
45 auto webSocketClass = new WebSocketClass(engine, url);45 return engine->newQObject(new WebSocketClass(engine, url), QScriptEngine::ScriptOwnership);
46 connect(static_cast<ScriptEngine*>(engine), &ScriptEngine::finished, webSocketClass, &QObject::deleteLater);
47 return engine->newQObject(webSocketClass);
48}46}
49 47
50WebSocketClass::~WebSocketClass() {48WebSocketClass::~WebSocketClass() {
@@ -111,7 +109,7 @@ void qWSCloseCodeFromScriptValue(const QScriptValue &object, QWebSocketProtocol: · 60 unmodified lines
111}109}
112 110
113QScriptValue webSocketToScriptValue(QScriptEngine* engine, WebSocketClass* const &in) {111QScriptValue webSocketToScriptValue(QScriptEngine* engine, WebSocketClass* const &in) {
114 return engine->newQObject(in);112 return engine->newQObject(in, QScriptEngine::ScriptOwnership);
115}113}
116 114
117void webSocketFromScriptValue(const QScriptValue &object, WebSocketClass* &out) {115void webSocketFromScriptValue(const QScriptValue &object, WebSocketClass* &out) {