diff options
| -rw-r--r-- | controller.cxx | 3 | ||||
| -rw-r--r-- | controller.hxx | 1 | ||||
| -rw-r--r-- | main.cxx | 8 |
3 files changed, 3 insertions, 9 deletions
diff --git a/controller.cxx b/controller.cxx index 42b1ece..6be4f40 100644 --- a/controller.cxx +++ b/controller.cxx @@ -24,7 +24,7 @@ Controller::Controller(QObject* parent) : QObject{parent} auto user = engine->singletonInstance<User*>(User::typeId); connect(worker, SIGNAL(logged(rt_user*)), user, SLOT(update(rt_user*))); - auto taskList = engine->singletonInstance<TaskList*>(TaskList::typeId); + taskList = new TaskList; engine->rootContext()->setContextProperty("taskList", taskList); connect(worker, SIGNAL(foundTasks(rt_ticketlist*)) , taskList, SLOT(addTasks(rt_ticketlist*))); @@ -36,4 +36,5 @@ Controller::~Controller() { thread.quit(); thread.wait(); + delete taskList; } diff --git a/controller.hxx b/controller.hxx index d98a735..5d4ef89 100644 --- a/controller.hxx +++ b/controller.hxx @@ -13,6 +13,7 @@ class Controller : public QObject private: QThread thread; + class TaskList* taskList; }; #endif // CONTROLLER_HXX @@ -18,14 +18,6 @@ int main(int argc, char* argv[]) return new User; }); - TaskList::typeId = qmlRegisterSingletonType<User>("KelakonUser", 0, 1, "TaskList" - , [](QQmlEngine *engine, - QJSEngine *scriptEngine) -> QObject* { - Q_UNUSED(engine) - Q_UNUSED(scriptEngine) - return new TaskList; - }); - engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); Controller controller{&engine}; |