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

* 'development' of ssh://darapsa.co.id/usr/local/git/kelakon:
  Renamed the rtclient project to librtclient
  Managed to post login credentials to the RT server
  Made user name editable
  User password member
  Affirming the previous commit
  Revert "Made the user class members more straightforward"
  Made the user class members more straightforward

1 files changed, 6 insertions, 5 deletions

diff --git a/user.hxx b/user.hxx
index 1cac5fe..18dd176 100644
--- a/user.hxx
+++ b/user.hxx
@@ -3,12 +3,11 @@
 
 #include <QObject>
 
-struct rt_user;
-
 class User : public QObject
 {
 	Q_OBJECT
-	Q_PROPERTY(QString name READ name)
+	Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
+	Q_PROPERTY(QString password READ password WRITE setPassword NOTIFY passwordChanged)
 	Q_PROPERTY(QString emailAddress READ emailAddress WRITE setEmailAddress NOTIFY emailAddressChanged)
 	Q_PROPERTY(QString organization READ organization WRITE setOrganization NOTIFY organizationChanged)
 	Q_PROPERTY(QString realName READ realName WRITE setRealName NOTIFY realNameChanged)
@@ -34,9 +33,8 @@ class User : public QObject
 		{}
 		~User() {}
 
-		Q_INVOKABLE void update(rt_user* user);
-
 		QString const& name() const { return m_name; }
+		QString const& password() const { return m_password; }
 		QString const& emailAddress() const { return m_emailAddress; }
 		QString const& organization() const { return m_organization; }
 		QString const& realName() const { return m_realName; }
@@ -56,6 +54,7 @@ class User : public QObject
 		bool isLoggedIn() const { return m_isLoggedIn; }
 
 		void setName(QString const& name);
+		void setPassword(QString const& password);
 		void setEmailAddress(QString const& emailAddress);
 		void setOrganization(QString const& organization);
 		void setRealName(QString const& realName);
@@ -76,6 +75,7 @@ class User : public QObject
 
 	signals:
 		void nameChanged();
+		void passwordChanged();
 		void emailAddressChanged();
 		void organizationChanged();
 		void realNameChanged();
@@ -96,6 +96,7 @@ class User : public QObject
 
 	private:
 		QString m_name;
+		QString m_password;
 		QString m_emailAddress;
 		QString m_organization;
 		QString m_realName;