From db6374681a2bc35671fa0c25fc740888a869ccd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Sat, 14 Sep 2019 07:02:48 +0800 Subject: User singleton instantiation can be moved to Controller like the rest --- controller.cxx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'controller.cxx') diff --git a/controller.cxx b/controller.cxx index 6be4f40..2e562bf 100644 --- a/controller.cxx +++ b/controller.cxx @@ -21,7 +21,14 @@ Controller::Controller(QObject* parent) : QObject{parent} connect(worker, SIGNAL(logged(rt_user*)), loginView, SLOT(pushProfile())); connect(loginView, SIGNAL(search(QString)), worker, SLOT(search(QString))); - auto user = engine->singletonInstance(User::typeId); + auto typeId = qmlRegisterSingletonType("KelakonUser", 0, 1, "User" + , [](QQmlEngine *engine, + QJSEngine *scriptEngine) -> QObject* { + Q_UNUSED(engine) + Q_UNUSED(scriptEngine) + return new User; + }); + auto user = engine->singletonInstance(typeId); connect(worker, SIGNAL(logged(rt_user*)), user, SLOT(update(rt_user*))); taskList = new TaskList; -- cgit v1.2.3