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 --- client.cxx | 5 +++-- librtclient | 2 +- qrtclient/client.hxx | 4 ++-- qrtclient/ticket.hxx | 5 +++-- ticket.cxx | 4 ++-- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/client.cxx b/client.cxx index 16b1a09..e972126 100644 --- a/client.cxx +++ b/client.cxx @@ -1,6 +1,7 @@ #include #include #include +#include #include "qrtclient/client.hxx" namespace RTClient { @@ -115,8 +116,8 @@ namespace RTClient { void Client::ticketSearch(QString const& owner) { QString query{"Owner='" % owner % "'"}; - rtclient_ticket_list* ticketList = nullptr; - rtclient_ticket_search(&ticketList, query.toLatin1().constData()); + rtclient_search_ticket_list* ticketList = nullptr; + rtclient_search_ticket(&ticketList, query.toLatin1().constData()); emit ticketSearched(ticketList); } diff --git a/librtclient b/librtclient index 806ee61..0588263 160000 --- a/librtclient +++ b/librtclient @@ -1 +1 @@ -Subproject commit 806ee6152735a38da0dbde949a5f7947d8931db5 +Subproject commit 0588263c5283c85cd4751c2251f3eb7881d7f87f 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; diff --git a/ticket.cxx b/ticket.cxx index 3d00b71..4693225 100644 --- a/ticket.cxx +++ b/ticket.cxx @@ -42,12 +42,12 @@ namespace RTClient { emit rowCountChanged(); } - void TicketList::update(rtclient_ticket_list* ticketList) + void TicketList::update(rtclient_search_ticket_list* ticketList) { if (ticketList) { for (size_t i = 0; i < ticketList->length; i++) addTicket(Ticket{ticketList->tickets[i]}); - rtclient_ticket_freelist(ticketList); + rtclient_search_ticket_free(ticketList); } emit updated(); } -- cgit v1.2.3