From c45c7b8eae9ade41b6c9bfa02a4b7d6ff329e860 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?= Date: Fri, 20 Sep 2019 10:40:47 +0800 Subject: User ID type is changed to unsigned integer --- librtclient | 2 +- qrtclient/user.hxx | 10 +++++----- user.cxx | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/librtclient b/librtclient index 0898723..33c3880 160000 --- a/librtclient +++ b/librtclient @@ -1 +1 @@ -Subproject commit 0898723a7387f8e5d3086dd9511d88561ccc2593 +Subproject commit 33c38800f850bb673bbe1555e007a2e462e682c7 diff --git a/qrtclient/user.hxx b/qrtclient/user.hxx index 8b8f911..0d2b6ac 100644 --- a/qrtclient/user.hxx +++ b/qrtclient/user.hxx @@ -11,7 +11,7 @@ namespace RTClient { class User : public QObject { Q_OBJECT - Q_PROPERTY(QString id READ id WRITE setId NOTIFY idChanged) + Q_PROPERTY(unsigned int id READ id WRITE setId NOTIFY idChanged) 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) @@ -40,7 +40,7 @@ namespace RTClient { public: explicit User(QObject* parent = nullptr) : QObject{parent} - , m_id{""} + , m_id{0} , m_name{""} , m_password{""} , m_emailAddress{""} @@ -68,7 +68,7 @@ namespace RTClient { {} ~User() {} - QString const& id() const { return m_id; } + unsigned int id() const { return m_id; } QString const& name() const { return m_name; } QString const& password() const { return m_password; } QString const& emailAddress() const { return m_emailAddress; } @@ -94,7 +94,7 @@ namespace RTClient { bool privileged() const { return m_privileged; } bool disabled() const { return m_disabled; } - void setId(QString const& id); + void setId(unsigned int id); void setName(QString const& name); void setPassword(QString const& password); void setEmailAddress(QString const& emailAddress); @@ -151,7 +151,7 @@ namespace RTClient { void update(rtclient_user* user); private: - QString m_id; + unsigned int m_id; QString m_name; QString m_password; QString m_emailAddress; diff --git a/user.cxx b/user.cxx index ee2d2d0..1a50046 100644 --- a/user.cxx +++ b/user.cxx @@ -4,7 +4,7 @@ namespace RTClient { - void User::setId(QString const& id) + void User::setId(unsigned int id) { if (m_id != id) { m_id = id; @@ -289,7 +289,7 @@ namespace RTClient { } rtclient_user_free(user); } else { - m_id = ""; + m_id = 0; m_name = ""; m_password = ""; m_emailAddress = ""; -- cgit v1.2.3