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 --- main.cxx | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'main.cxx') diff --git a/main.cxx b/main.cxx index 1ae0467..23f9e4d 100644 --- a/main.cxx +++ b/main.cxx @@ -1,6 +1,5 @@ #include #include -#include "user.hxx" #include "controller.hxx" int main(int argc, char* argv[]) @@ -8,17 +7,7 @@ int main(int argc, char* argv[]) QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); QQmlApplicationEngine engine; - - User::typeId = qmlRegisterSingletonType("KelakonUser", 0, 1, "User" - , [](QQmlEngine *engine, - QJSEngine *scriptEngine) -> QObject* { - Q_UNUSED(engine) - Q_UNUSED(scriptEngine) - return new User; - }); - engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); Controller controller{&engine}; - return app.exec(); } -- cgit v1.2.3