Merge branch 'development' of ssh://darapsa.co.id/usr/local/git/kelakon into development

* 'development' of ssh://darapsa.co.id/usr/local/git/kelakon:
  Set up a way for the thread to quit
  Renamed NetworkWorker to just Worker

1 files changed, 2 insertions, 7 deletions

diff --git a/main.cxx b/main.cxx
index cacf2cd..0b52736 100644
--- a/main.cxx
+++ b/main.cxx
@@ -1,8 +1,7 @@
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
-#include <QThread>
 #include "user.hxx"
-#include "networkworker.hxx"
+#include "controller.hxx"
 
 int main(int argc, char* argv[])
 {
@@ -10,10 +9,6 @@ int main(int argc, char* argv[])
 	QGuiApplication app(argc, argv);
 	QQmlApplicationEngine engine;
 
-	NetworkWorker worker{};
-	QThread thread;
-	worker.moveToThread(&thread);
-
 	qmlRegisterSingletonType<User>("id.co.darapsa.kelakon.user", 0, 1, "User", [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QObject* {
 		Q_UNUSED(engine)
 		Q_UNUSED(scriptEngine)
@@ -23,7 +18,7 @@ int main(int argc, char* argv[])
 	});
 	engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
 
-	thread.start();
+	Controller controller{};
 
 	return app.exec();
 }