From 5811ed952f1d4e0887c619d6fafeadd11a11821f 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: Mon, 30 Sep 2019 11:03:22 +0800 Subject: ticketlist is renamed to ticket_list --- qrtclient/client.hxx | 7 ++++--- qrtclient/ticket.hxx | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'qrtclient') diff --git a/qrtclient/client.hxx b/qrtclient/client.hxx index cf7cba9..8876f4c 100644 --- a/qrtclient/client.hxx +++ b/qrtclient/client.hxx @@ -5,7 +5,7 @@ #include struct rtclient_user; -struct rtclient_ticketlist; +struct rtclient_ticket_list; namespace RTClient { @@ -40,7 +40,8 @@ namespace RTClient { , QString const& signature = nullptr , QString const& gecos = nullptr , rtclient_lang lang = RTCLIENT_LANG_NONE - , rtclient_timezone timeZone = RTCLIENT_TIMEZONE_NONE + , rtclient_timezone timeZone + = RTCLIENT_TIMEZONE_NONE , bool disabled = false , bool privileged = false); void userShow(unsigned int id); @@ -65,7 +66,7 @@ namespace RTClient { signals: void loggedIn(QString const& name); void userShown(rtclient_user* user); - void ticketSearched(rtclient_ticketlist* list); + void ticketSearched(rtclient_ticket_list* list); }; } diff --git a/qrtclient/ticket.hxx b/qrtclient/ticket.hxx index 25c067f..5af995a 100644 --- a/qrtclient/ticket.hxx +++ b/qrtclient/ticket.hxx @@ -4,7 +4,7 @@ #include #include -struct rtclient_ticketlist; +struct rtclient_ticket_list; namespace RTClient { @@ -44,7 +44,7 @@ namespace RTClient { ) const Q_DECL_OVERRIDE; public slots: - void update(rtclient_ticketlist* ticketList); + void update(rtclient_ticket_list* ticketList); protected: QHash roleNames() const Q_DECL_OVERRIDE; -- cgit v1.2.3 From 52c4146d5f228347ddbafdcd977166c89551112a 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: Mon, 30 Sep 2019 11:41:49 +0800 Subject: Make ticket new parameter names more consistent --- qrtclient/client.hxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'qrtclient') diff --git a/qrtclient/client.hxx b/qrtclient/client.hxx index 8876f4c..1f6b3fe 100644 --- a/qrtclient/client.hxx +++ b/qrtclient/client.hxx @@ -50,13 +50,13 @@ namespace RTClient { , QString const& requestor = nullptr , QString const& subject = nullptr , QString const& cc = nullptr - , QString const& admincc = nullptr + , QString const& adminCc = nullptr , QString const& owner = nullptr , QString const& status = nullptr , QString const& priority = nullptr - , QString const& initialpriority = nullptr - , QString const& finalpriority = nullptr - , QString const& timeestimated = nullptr + , QString const& initialPriority = nullptr + , QString const& finalPriority = nullptr + , QString const& timeEstimated = nullptr , QString const& starts = nullptr , QString const& due = nullptr , QString const& text = nullptr); -- cgit v1.2.3 From 8df77978203d33015c3a01fec1f4725add079919 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: Mon, 30 Sep 2019 11:55:19 +0800 Subject: User namespace is given to lang and timezone --- qrtclient/client.hxx | 7 ++++--- qrtclient/user.hxx | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 13 deletions(-) (limited to 'qrtclient') 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; }; -- cgit v1.2.3 From eba11889c757985b164c82da4d4b9b1a850c4c92 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: Mon, 30 Sep 2019 11:59:42 +0800 Subject: Rename timeZone to timezone --- qrtclient/client.hxx | 2 +- qrtclient/user.hxx | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'qrtclient') diff --git a/qrtclient/client.hxx b/qrtclient/client.hxx index 408e174..e29d273 100644 --- a/qrtclient/client.hxx +++ b/qrtclient/client.hxx @@ -41,7 +41,7 @@ namespace RTClient { , QString const& gecos = nullptr , rtclient_user_lang lang = RTCLIENT_USER_LANG_NONE - , rtclient_user_timezone timeZone + , rtclient_user_timezone timezone = RTCLIENT_USER_TIMEZONE_NONE , bool disabled = false , bool privileged = false); diff --git a/qrtclient/user.hxx b/qrtclient/user.hxx index 39287a1..e4a1c45 100644 --- a/qrtclient/user.hxx +++ b/qrtclient/user.hxx @@ -33,7 +33,7 @@ namespace RTClient { Q_PROPERTY(QString signature READ signature WRITE setSignature NOTIFY signatureChanged) Q_PROPERTY(QString gecos READ gecos WRITE setGecos NOTIFY gecosChanged) 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(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) @@ -62,7 +62,7 @@ namespace RTClient { , m_signature{""} , m_gecos{""} , m_lang{RTCLIENT_USER_LANG_NONE} - , m_timeZone{RTCLIENT_USER_TIMEZONE_NONE} + , m_timezone{RTCLIENT_USER_TIMEZONE_NONE} , m_privileged{false} , m_disabled{true} {} @@ -90,7 +90,7 @@ namespace RTClient { QString const& signature() const { return m_signature; } QString const& gecos() const { return m_gecos; } rtclient_user_lang lang() const { return m_lang; } - rtclient_user_timezone timeZone() const { return m_timeZone; } + rtclient_user_timezone timezone() const { return m_timezone; } bool privileged() const { return m_privileged; } bool disabled() const { return m_disabled; } @@ -116,7 +116,7 @@ namespace RTClient { void setSignature(QString const& signature); void setGecos(QString const& gecos); void setLang(rtclient_user_lang lang); - void setTimeZone(rtclient_user_timezone timeZone); + void setTimeZone(rtclient_user_timezone timezone); void setPrivileged(bool privileged); void setDisabled(bool disabled); @@ -146,7 +146,7 @@ namespace RTClient { void signatureChanged(); void gecosChanged(); void langChanged(); - void timeZoneChanged(); + void timezoneChanged(); void privilegedChanged(); void disabledChanged(); @@ -173,7 +173,7 @@ namespace RTClient { QString m_signature; QString m_gecos; rtclient_user_lang m_lang; - rtclient_user_timezone m_timeZone; + rtclient_user_timezone m_timezone; bool m_privileged; bool m_disabled; }; -- cgit v1.2.3 From 36acad91cc9d9ba4eb00b6361b68cdbae2f5d932 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: Mon, 30 Sep 2019 12:32:11 +0800 Subject: ticket_search is changed to search_ticket --- qrtclient/client.hxx | 4 ++-- qrtclient/ticket.hxx | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'qrtclient') diff --git a/qrtclient/client.hxx b/qrtclient/client.hxx index e29d273..99ded5e 100644 --- a/qrtclient/client.hxx +++ b/qrtclient/client.hxx @@ -5,7 +5,7 @@ #include struct rtclient_user; -struct rtclient_ticket_list; +struct rtclient_search_ticket_list; namespace RTClient { @@ -67,7 +67,7 @@ namespace RTClient { signals: void loggedIn(QString const& name); void userShown(rtclient_user* user); - void ticketSearched(rtclient_ticket_list* list); + void ticketSearched(rtclient_search_ticket_list* list); }; } diff --git a/qrtclient/ticket.hxx b/qrtclient/ticket.hxx index 5af995a..d02954b 100644 --- a/qrtclient/ticket.hxx +++ b/qrtclient/ticket.hxx @@ -3,8 +3,9 @@ #include #include +#include -struct rtclient_ticket_list; +struct rtclient_search_ticket_list; namespace RTClient { @@ -44,7 +45,7 @@ namespace RTClient { ) const Q_DECL_OVERRIDE; public slots: - void update(rtclient_ticket_list* ticketList); + void update(rtclient_search_ticket_list* ticketList); protected: QHash roleNames() const Q_DECL_OVERRIDE; -- cgit v1.2.3 From 3046c72a604df00cf54982a0985b3a70bdd6d994 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: Mon, 30 Sep 2019 18:03:18 +0800 Subject: Adjust search ticket term --- qrtclient/client.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qrtclient') diff --git a/qrtclient/client.hxx b/qrtclient/client.hxx index 99ded5e..809a508 100644 --- a/qrtclient/client.hxx +++ b/qrtclient/client.hxx @@ -61,13 +61,13 @@ namespace RTClient { , QString const& starts = nullptr , QString const& due = nullptr , QString const& text = nullptr); - void ticketSearch(QString const& owner); + void searchTicket(QString const& owner); void ticketHistory(int id); signals: void loggedIn(QString const& name); void userShown(rtclient_user* user); - void ticketSearched(rtclient_search_ticket_list* list); + void searchedTicket(rtclient_search_ticket_list* list); }; } -- cgit v1.2.3 From bd0e74d11e666126c97c34c5b508dbe811b128c3 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: Mon, 30 Sep 2019 19:16:09 +0800 Subject: gotTicketHistory signal --- qrtclient/client.hxx | 2 ++ 1 file changed, 2 insertions(+) (limited to 'qrtclient') diff --git a/qrtclient/client.hxx b/qrtclient/client.hxx index 809a508..b672620 100644 --- a/qrtclient/client.hxx +++ b/qrtclient/client.hxx @@ -6,6 +6,7 @@ struct rtclient_user; struct rtclient_search_ticket_list; +struct rtclient_ticket_history_list; namespace RTClient { @@ -68,6 +69,7 @@ namespace RTClient { void loggedIn(QString const& name); void userShown(rtclient_user* user); void searchedTicket(rtclient_search_ticket_list* list); + void gotTicketHistory(rtclient_ticket_history_list* list); }; } -- cgit v1.2.3