Renamed the C++ to QML import

5 files changed, 26 insertions, 46 deletions

diff --git a/main.cxx b/main.cxx
index 479d302..c9e8691 100644
--- a/main.cxx
+++ b/main.cxx
@@ -2,24 +2,28 @@
 #include <QQmlApplicationEngine>
 #include <QtQml>
 #include "user.hxx"
-#include "controller.hxx"
 #include "tasklist.hxx"
+#include "controller.hxx"
 
 int main(int argc, char* argv[])
 {
 	QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
 	QGuiApplication app(argc, argv);
 	QQmlApplicationEngine engine;
-	User::typeId = qmlRegisterSingletonType<User>("id.co.darapsa.kelakon.user"
-			, 0, 1, "User"
-			, [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QObject* {
+
+	User::typeId = qmlRegisterSingletonType<User>("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};
+
 	TaskList taskList;
 	engine.rootContext()->setContextProperty("taskList", &taskList);
+
+	engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
+	Controller controller{&engine};
+
 	return app.exec();
 }
diff --git a/pages/ConfirmPassword.qml b/pages/ConfirmPassword.qml
index b7fdc3a..1f2dd2f 100644
--- a/pages/ConfirmPassword.qml
+++ b/pages/ConfirmPassword.qml
@@ -1,16 +1,10 @@
 import QtQuick 2.12
-import id.co.darapsa.kelakon.user 0.1
+import KelakonUser 0.1
 
 PasswordForm {
 	width: stackView.width
 	height: stackView.height
-
-	backButton {
-		onClicked: {
-			stackView.pop()
-		}
-	}
-
+	backButton.onClicked: stackView.pop()
 	userEmail.y: 292
 	instructionLabel.text: qsTr("Re-Enter password")
 	emailAddressLabel.text: User.emailAddress
diff --git a/pages/Email.qml b/pages/Email.qml
index d2a1df3..3f7a237 100644
--- a/pages/Email.qml
+++ b/pages/Email.qml
@@ -1,20 +1,13 @@
 import QtQuick 2.12
-import id.co.darapsa.kelakon.user 0.1
+import KelakonUser 0.1
 
 EmailForm {
 	width: stackView.width
 	height: stackView.height
+	backButton.onClicked: stackView.pop()
 
-	backButton {
-		onClicked: {
-			stackView.pop()
-		}
-	}
-
-	loginButton {
-		onClicked: {
-			User.emailAddress = emailTextField.text
-			stackView.push("qrc:/pages/Password.qml")
-		}
+	loginButton.onClicked: {
+		User.emailAddress = emailTextField.text
+		stackView.push("qrc:/pages/Password.qml")
 	}
 }
diff --git a/pages/ExistingLogin.qml b/pages/ExistingLogin.qml
index 6833c6a..8e78a09 100644
--- a/pages/ExistingLogin.qml
+++ b/pages/ExistingLogin.qml
@@ -1,12 +1,8 @@
 import QtQuick 2.12
-import id.co.darapsa.kelakon.user 0.1
+import KelakonUser 0.1
 
 ExistingLoginForm {
-    width: stackView.width
-    height: stackView.height
-    backButton {
-        onClicked: {
-            stackView.pop()
-        }
-    }
+	width: stackView.width
+	height: stackView.height
+	backButton.onClicked: stackView.pop()
 }
diff --git a/pages/Password.qml b/pages/Password.qml
index 4a1ae59..241f299 100644
--- a/pages/Password.qml
+++ b/pages/Password.qml
@@ -1,21 +1,14 @@
 import QtQuick 2.12
-import id.co.darapsa.kelakon.user 0.1
+import KelakonUser 0.1
 
 PasswordForm {
 	width: stackView.width
 	height: stackView.height
-	backButton {
-		onClicked: {
-			stackView.pop()
-		}
-	}
-
+	backButton.onClicked: stackView.pop()
 	emailAddressLabel.text: User.emailAddress
 
-	createPassButton {
-		onClicked: {
-			User.password = passTextField.text
-			stackView.push("qrc:/pages/ConfirmPassword.qml")
-		}
+	createPassButton.onClicked: {
+		User.password = passTextField.text
+		stackView.push("qrc:/pages/ConfirmPassword.qml")
 	}
 }