From edf7edbfc93071e90b001f36b730e31cb027a54f 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: Wed, 25 Sep 2019 16:25:02 +0800 Subject: Ticket ID class member --- librtclient | 2 +- qrtclient/ticket.hxx | 11 +++++++++-- ticket.cxx | 6 ++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/librtclient b/librtclient index a266783..e39fa22 160000 --- a/librtclient +++ b/librtclient @@ -1 +1 @@ -Subproject commit a2667831d91ca18b9b8d41ad1d52a721103f8750 +Subproject commit e39fa22f6896b7b7200229ffba95c56074a17535 diff --git a/qrtclient/ticket.hxx b/qrtclient/ticket.hxx index 2ad8008..26e5643 100644 --- a/qrtclient/ticket.hxx +++ b/qrtclient/ticket.hxx @@ -2,6 +2,7 @@ #define QRTCLIENT_TICKET_HXX #include +#include struct rtclient_ticketlist; @@ -10,10 +11,15 @@ namespace RTClient { class Ticket { public: - Ticket(QString subject) : m_subject{subject} {} + Ticket(rtclient_ticket* ticket) + : m_id{ticket->id} + , m_subject{ticket->subject} + {} + unsigned int id() const { return m_id; } QString const& subject() const { return m_subject; } private: + unsigned int m_id; QString m_subject; }; @@ -24,7 +30,8 @@ namespace RTClient { public: enum TicketRoles { - SubjectRole = Qt::UserRole + 1, + IdRole = Qt::UserRole + 1, + SubjectRole }; explicit TicketList(QObject* parent = nullptr) diff --git a/ticket.cxx b/ticket.cxx index cd984c5..9518c74 100644 --- a/ticket.cxx +++ b/ticket.cxx @@ -1,5 +1,4 @@ #include -#include #include "qrtclient/ticket.hxx" namespace RTClient { @@ -18,6 +17,8 @@ namespace RTClient { auto ticket = tickets[row]; switch (role) { + case IdRole: + return ticket.id(); case SubjectRole: return ticket.subject(); default: @@ -28,7 +29,8 @@ namespace RTClient { QHash TicketList::roleNames() const { return QHash{ - {SubjectRole, "subject"} + {IdRole, "subject"} + , {SubjectRole, "subject"} }; } -- cgit v1.2.3