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 --- client.cxx | 2 +- librtclient | 2 +- qrtclient/client.hxx | 7 ++++--- qrtclient/ticket.hxx | 4 ++-- ticket.cxx | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/client.cxx b/client.cxx index fab3195..33c4226 100644 --- a/client.cxx +++ b/client.cxx @@ -115,7 +115,7 @@ namespace RTClient { void Client::ticketSearch(QString const& owner) { QString query{"Owner='" % owner % "'"}; - rtclient_ticketlist* ticketList = nullptr; + rtclient_ticket_list* ticketList = nullptr; rtclient_ticket_search(&ticketList, query.toLatin1().constData()); emit ticketSearched(ticketList); } diff --git a/librtclient b/librtclient index 739bcbb..3ba5669 160000 --- a/librtclient +++ b/librtclient @@ -1 +1 @@ -Subproject commit 739bcbbd83115cb8cf3f5b60fd7e73056a0c7293 +Subproject commit 3ba566924ebb019b084b3d0714ee51250828c4ce 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; diff --git a/ticket.cxx b/ticket.cxx index 93eb066..3d00b71 100644 --- a/ticket.cxx +++ b/ticket.cxx @@ -42,7 +42,7 @@ namespace RTClient { emit rowCountChanged(); } - void TicketList::update(rtclient_ticketlist* ticketList) + void TicketList::update(rtclient_ticket_list* ticketList) { if (ticketList) { for (size_t i = 0; i < ticketList->length; i++) -- cgit v1.2.3