diff options
| -rw-r--r-- | client.cxx | 4 | ||||
| m--------- | librtclient | 0 | ||||
| -rw-r--r-- | qrtclient/client.hxx | 7 | ||||
| -rw-r--r-- | qrtclient/user.hxx | 20 | ||||
| -rw-r--r-- | user.cxx | 8 |
5 files changed, 20 insertions, 19 deletions
@@ -36,8 +36,8 @@ namespace RTClient { , QString const& comments , QString const& signature , QString const& gecos - , rtclient_lang lang - , rtclient_timezone timeZone + , rtclient_user_lang lang + , rtclient_user_timezone timeZone , bool disabled , bool privileged) { diff --git a/librtclient b/librtclient -Subproject dfa12d6b50e7af934095448daee8b99e2855afd +Subproject 0d42b3819bd7830061a9f0a3d2ac9cc473811f6 diff --git a/qrtclient/client.hxx b/qrtclient/client.hxx index 1f6b3fe..408e174 100644 --- a/qrtclient/client.hxx +++ b/qrtclient/client.hxx @@ -39,9 +39,10 @@ namespace RTClient { , QString const& comments = nullptr , QString const& signature = nullptr , QString const& gecos = nullptr - , rtclient_lang lang = RTCLIENT_LANG_NONE - , rtclient_timezone timeZone - = RTCLIENT_TIMEZONE_NONE + , rtclient_user_lang lang + = RTCLIENT_USER_LANG_NONE + , rtclient_user_timezone timeZone + = RTCLIENT_USER_TIMEZONE_NONE , bool disabled = false , bool privileged = false); void userShow(unsigned int id); diff --git a/qrtclient/user.hxx b/qrtclient/user.hxx index 5b692a6..39287a1 100644 --- a/qrtclient/user.hxx +++ b/qrtclient/user.hxx @@ -32,8 +32,8 @@ namespace RTClient { Q_PROPERTY(QString comments READ comments WRITE setComments NOTIFY commentsChanged) Q_PROPERTY(QString signature READ signature WRITE setSignature NOTIFY signatureChanged) Q_PROPERTY(QString gecos READ gecos WRITE setGecos NOTIFY gecosChanged) - Q_PROPERTY(rtclient_lang lang READ lang WRITE setLang NOTIFY langChanged) - Q_PROPERTY(rtclient_timezone timeZone READ timeZone WRITE setTimeZone NOTIFY timeZoneChanged) + Q_PROPERTY(rtclient_user_lang lang READ lang WRITE setLang NOTIFY langChanged) + Q_PROPERTY(rtclient_user_timezone timeZone READ timeZone WRITE setTimeZone NOTIFY timeZoneChanged) Q_PROPERTY(bool privileged READ privileged WRITE setPrivileged NOTIFY privilegedChanged) Q_PROPERTY(bool disabled READ disabled WRITE setDisabled NOTIFY disabledChanged) @@ -61,8 +61,8 @@ namespace RTClient { , m_comments{""} , m_signature{""} , m_gecos{""} - , m_lang{RTCLIENT_LANG_NONE} - , m_timeZone{RTCLIENT_TIMEZONE_NONE} + , m_lang{RTCLIENT_USER_LANG_NONE} + , m_timeZone{RTCLIENT_USER_TIMEZONE_NONE} , m_privileged{false} , m_disabled{true} {} @@ -89,8 +89,8 @@ namespace RTClient { QString const& comments() const { return m_comments; } QString const& signature() const { return m_signature; } QString const& gecos() const { return m_gecos; } - rtclient_lang lang() const { return m_lang; } - rtclient_timezone timeZone() const { return m_timeZone; } + rtclient_user_lang lang() const { return m_lang; } + rtclient_user_timezone timeZone() const { return m_timeZone; } bool privileged() const { return m_privileged; } bool disabled() const { return m_disabled; } @@ -115,8 +115,8 @@ namespace RTClient { void setComments(QString const& comments); void setSignature(QString const& signature); void setGecos(QString const& gecos); - void setLang(rtclient_lang lang); - void setTimeZone(rtclient_timezone timeZone); + void setLang(rtclient_user_lang lang); + void setTimeZone(rtclient_user_timezone timeZone); void setPrivileged(bool privileged); void setDisabled(bool disabled); @@ -172,8 +172,8 @@ namespace RTClient { QString m_comments; QString m_signature; QString m_gecos; - rtclient_lang m_lang; - rtclient_timezone m_timeZone; + rtclient_user_lang m_lang; + rtclient_user_timezone m_timeZone; bool m_privileged; bool m_disabled; }; @@ -172,7 +172,7 @@ namespace RTClient { } } - void User::setLang(rtclient_lang lang) + void User::setLang(rtclient_user_lang lang) { if (m_lang != lang) { m_lang = lang; @@ -180,7 +180,7 @@ namespace RTClient { } } - void User::setTimeZone(rtclient_timezone timeZone) + void User::setTimeZone(rtclient_user_timezone timeZone) { if (m_timeZone != timeZone) { m_timeZone = timeZone; @@ -310,8 +310,8 @@ namespace RTClient { m_comments = ""; m_signature = ""; m_gecos = ""; - m_lang = RTCLIENT_LANG_NONE; - m_timeZone = RTCLIENT_TIMEZONE_NONE; + m_lang = RTCLIENT_USER_LANG_NONE; + m_timeZone = RTCLIENT_USER_TIMEZONE_NONE; m_privileged = false; m_disabled = true; } |