diff options
| -rw-r--r-- | client.cxx | 5 | ||||
| m--------- | librtclient | 0 | ||||
| -rw-r--r-- | qrtclient/client.hxx | 4 | ||||
| -rw-r--r-- | qrtclient/ticket.hxx | 5 | ||||
| -rw-r--r-- | ticket.cxx | 4 |
5 files changed, 10 insertions, 8 deletions
@@ -1,6 +1,7 @@ #include <QStringBuilder> #include <rtclient/client.h> #include <rtclient/ticket.h> +#include <rtclient/search.h> #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 -Subproject 806ee6152735a38da0dbde949a5f7947d8931db +Subproject 0588263c5283c85cd4751c2251f3eb7881d7f87 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 <rtclient/user.h> 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 <QAbstractListModel> #include <rtclient/ticket.h> +#include <rtclient/search.h> -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<int, QByteArray> roleNames() const Q_DECL_OVERRIDE; @@ -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(); } |