From 0a925784b13004d7b62513ec9c4d473c8abbcfba 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: Tue, 17 Sep 2019 21:53:10 +0800 Subject: librtclient user_new parameters have been reordered too --- client.cxx | 24 ++++++++++++------------ librtclient | 2 +- qrtclient/client.hxx | 5 +++-- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/client.cxx b/client.cxx index f462475..522acbc 100644 --- a/client.cxx +++ b/client.cxx @@ -36,24 +36,16 @@ namespace RTClient { , QString const& comments , QString const& signature , QString const& gecos - , int lang - , int timeZone + , enum rt_lang lang + , enum rt_timezone timeZone , bool disabled , bool privileged) { rtclient_user_new(name.toLatin1().constData() + , password.toLatin1().constData() , emailAddress.toLatin1().constData() , realName.toLatin1().constData() , nickName.toLatin1().constData() - , gecos.toLatin1().constData() - , static_cast(lang) - , static_cast(timeZone) - , contactInfo.toLatin1().constData() - , disabled - , privileged - , password.toLatin1().constData() - , comments.toLatin1().constData() - , signature.toLatin1().constData() , organization.toLatin1().constData() , address1.toLatin1().constData() , address2.toLatin1().constData() @@ -64,7 +56,15 @@ namespace RTClient { , homePhone.toLatin1().constData() , workPhone.toLatin1().constData() , mobilePhone.toLatin1().constData() - , pagerPhone.toLatin1().constData()); + , pagerPhone.toLatin1().constData() + , contactInfo.toLatin1().constData() + , comments.toLatin1().constData() + , signature.toLatin1().constData() + , gecos.toLatin1().constData() + , lang + , timeZone + , disabled + , privileged); } void Client::search(QString const& owner) diff --git a/librtclient b/librtclient index a6be983..8120fab 160000 --- a/librtclient +++ b/librtclient @@ -1 +1 @@ -Subproject commit a6be983c30fcf229c54b627e87491ea73c0c96f7 +Subproject commit 8120fabe27f9b35d4a2e84e6a3f3e0fa8270798f diff --git a/qrtclient/client.hxx b/qrtclient/client.hxx index 23c0ae9..0b96294 100644 --- a/qrtclient/client.hxx +++ b/qrtclient/client.hxx @@ -2,6 +2,7 @@ #define QRTCLIENT_HXX #include +#include struct rt_user; struct rt_ticketlist; @@ -38,8 +39,8 @@ namespace RTClient { , QString const& comments = nullptr , QString const& signature = nullptr , QString const& gecos = nullptr - , int lang = 0 - , int timeZone = 0 + , enum rt_lang lang = RT_LANG_NONE + , enum rt_timezone timeZone = RT_TIMEZONE_NONE , bool disabled = false , bool privileged = false); void search(QString const& owner); -- cgit v1.2.3