From f3d5e7754d0be9bd0f076ad26a57dd7c93e0d064 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?= <erik@darapsa.co.id>
Date: Mon, 30 Sep 2019 12:09:59 +0800
Subject: Make user member names more consistent

---
 librtclient |  2 +-
 user.cxx    | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/librtclient b/librtclient
index 0d42b38..806ee61 160000
--- a/librtclient
+++ b/librtclient
@@ -1 +1 @@
-Subproject commit 0d42b3819bd7830061a9f0a3d2ac9cc473811f6f
+Subproject commit 806ee6152735a38da0dbde949a5f7947d8931db5
diff --git a/user.cxx b/user.cxx
index 906a36d..2f031e8 100644
--- a/user.cxx
+++ b/user.cxx
@@ -211,16 +211,16 @@ namespace RTClient {
 				m_id = user->id;
 				emit idChanged();
 			}
-			if (user->emailaddress) {
-				m_emailAddress = user->emailaddress;
+			if (user->email_address) {
+				m_emailAddress = user->email_address;
 				emit emailAddressChanged();
 			}
-			if (user->realname) {
-				m_realName = user->realname;
+			if (user->real_name) {
+				m_realName = user->real_name;
 				emit realNameChanged();
 			}
-			if (user->nickname) {
-				m_nickName = user->nickname;
+			if (user->nick_name) {
+				m_nickName = user->nick_name;
 				emit nickNameChanged();
 			}
 			if (user->organization) {
@@ -251,20 +251,20 @@ namespace RTClient {
 				m_country = user->country;
 				emit countryChanged();
 			}
-			if (user->homephone) {
-				m_homePhone = user->homephone;
+			if (user->home_phone) {
+				m_homePhone = user->home_phone;
 				emit homePhoneChanged();
 			}
-			if (user->workphone) {
-				m_workPhone = user->workphone;
+			if (user->work_phone) {
+				m_workPhone = user->work_phone;
 				emit workPhoneChanged();
 			}
-			if (user->mobilephone) {
-				m_mobilePhone = user->mobilephone;
+			if (user->mobile_phone) {
+				m_mobilePhone = user->mobile_phone;
 				emit mobilePhoneChanged();
 			}
-			if (user->pagerphone) {
-				m_pagerPhone = user->pagerphone;
+			if (user->pager_phone) {
+				m_pagerPhone = user->pager_phone;
 				emit pagerPhoneChanged();
 			}
 			if (user->gecos) {
-- 
cgit v1.2.3