From dc899d978eaf0ad2afc2768ab8b731974b791966 Mon Sep 17 00:00:00 2001 From: Tomasz Sterna Date: Fri, 17 Apr 2015 13:07:16 +0200 Subject: Better JSKit memory management Attach context objects as _engine children, so they get destroyed by parent when engine is deleted. --- daemon/jskitobjects.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'daemon/jskitobjects.cpp') diff --git a/daemon/jskitobjects.cpp b/daemon/jskitobjects.cpp index 9c09f27..01a7e20 100644 --- a/daemon/jskitobjects.cpp +++ b/daemon/jskitobjects.cpp @@ -10,8 +10,8 @@ static const char *token_salt = "0feeb7416d3c4546a19b04bccd8419b1"; -JSKitPebble::JSKitPebble(const AppInfo &info, JSKitManager *mgr) - : QObject(mgr), l(metaObject()->className()), _appInfo(info), _mgr(mgr) +JSKitPebble::JSKitPebble(const AppInfo &info, JSKitManager *mgr, QObject *parent) + : QObject(parent), l(metaObject()->className()), _appInfo(info), _mgr(mgr) { } @@ -167,8 +167,8 @@ void JSKitPebble::invokeCallbacks(const QString &type, const QJSValueList &args) } } -JSKitConsole::JSKitConsole(JSKitManager *mgr) - : QObject(mgr), l(metaObject()->className()) +JSKitConsole::JSKitConsole(QObject *parent) + : QObject(parent), l(metaObject()->className()) { } @@ -177,8 +177,8 @@ void JSKitConsole::log(const QString &msg) qCDebug(l) << msg; } -JSKitLocalStorage::JSKitLocalStorage(const QUuid &uuid, JSKitManager *mgr) - : QObject(mgr), _storage(new QSettings(getStorageFileFor(uuid), QSettings::IniFormat, this)) +JSKitLocalStorage::JSKitLocalStorage(const QUuid &uuid, QObject *parent) + : QObject(parent), _storage(new QSettings(getStorageFileFor(uuid), QSettings::IniFormat, this)) { _len = _storage->allKeys().size(); } @@ -517,8 +517,8 @@ void JSKitXMLHttpRequest::handleAuthenticationRequired(QNetworkReply *reply, QAu } } -JSKitGeolocation::JSKitGeolocation(JSKitManager *mgr) - : QObject(mgr), l(metaObject()->className()), +JSKitGeolocation::JSKitGeolocation(JSKitManager *mgr, QObject *parent) + : QObject(parent), l(metaObject()->className()), _mgr(mgr), _source(0), _lastWatchId(0) { } -- cgit v1.2.3