Merge branch 'master' into cmake

8 files changed, 33 insertions, 33 deletions

diff --git a/.gitignore b/.gitignore
index 03c1779..9eafb49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,10 @@
-*.a
-*.pro.user
-*.o
-*.qmake.stash
-*.so*
-*.swp
-Makefile
-moc_*
 CMakeCache.txt
 CMakeFiles
-CMakeLists.txt.user
 cmake_install.cmake
-*_autogen
+CMakeLists.txt.user
+libqrtclient.a
+Makefile
+moc_*
+*.o
+qrtclient_autogen
+*.swp
diff --git a/client.cxx b/client.cxx
index 1e34666..fab3195 100644
--- a/client.cxx
+++ b/client.cxx
@@ -120,6 +120,11 @@ namespace RTClient {
 		emit ticketSearched(ticketList);
 	}
 
+	void Client::ticketHistory(int id)
+	{
+		rtclient_ticket_history(id);
+	}
+
 	Client::~Client()
 	{
 		rtclient_cleanup();
diff --git a/librtclient b/librtclient
-Subproject a2667831d91ca18b9b8d41ad1d52a721103f875
+Subproject 0aff874caec82d8188057d9566e1292678d7a78
diff --git a/qrtclient.pro b/qrtclient.pro
index 67047cb..1e53e4f 100644
--- a/qrtclient.pro
+++ b/qrtclient.pro
@@ -12,18 +12,6 @@ SOURCES += \
 	client.cxx
 
 INCLUDEPATH += $$PWD/librtclient
-LIBS += \
-	$$PWD/librtclient/librtclient.a \
-	-lcurl
-
-contains(ANDROID_TARGET_ARCH,arm64-v8a) {
-	QMAKE_CFLAGS += -I/usr/local/aarch64-linux-android/sysroot/usr/include
-	LIBS += -L/usr/local/aarch64-linux-android/sysroot/usr/lib
-}
-
-contains(ANDROID_TARGET_ARCH,armeabi-v7a) {
-	QMAKE_CFLAGS += -I/usr/local/arm-linux-androideabi/sysroot/usr/include
-	LIBS += -L/usr/local/arm-linux-androideabi/sysroot/usr/lib
-}
+LIBS += $$PWD/librtclient/librtclient.a
 
 debug: DEFINES += DEBUG
diff --git a/qrtclient/client.hxx b/qrtclient/client.hxx
index 75477d7..cf7cba9 100644
--- a/qrtclient/client.hxx
+++ b/qrtclient/client.hxx
@@ -60,6 +60,7 @@ namespace RTClient {
 					, QString const& due = nullptr
 					, QString const& text = nullptr);
 			void ticketSearch(QString const& owner);
+			void ticketHistory(int id);
 
 		signals:
 			void loggedIn(QString const& name);
diff --git a/qrtclient/ticket.hxx b/qrtclient/ticket.hxx
index 2ad8008..25c067f 100644
--- a/qrtclient/ticket.hxx
+++ b/qrtclient/ticket.hxx
@@ -2,6 +2,7 @@
 #define QRTCLIENT_TICKET_HXX
 
 #include <QAbstractListModel>
+#include <rtclient/ticket.h>
 
 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)
@@ -36,6 +43,9 @@ namespace RTClient {
 					, int role = Qt::DisplayRole
 					) const Q_DECL_OVERRIDE;
 
+		public slots:
+			void update(rtclient_ticketlist* ticketList);
+
 		protected:
 			QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
 
@@ -43,9 +53,6 @@ namespace RTClient {
 			void updated();
 			void rowCountChanged();
 
-		private slots:
-			void update(rtclient_ticketlist* ticketList);
-
 		private:
 			QList<Ticket> tickets;
 			void addTicket(Ticket const& ticket);
diff --git a/qrtclient/user.hxx b/qrtclient/user.hxx
index 0d2b6ac..5b692a6 100644
--- a/qrtclient/user.hxx
+++ b/qrtclient/user.hxx
@@ -120,6 +120,9 @@ namespace RTClient {
 			void setPrivileged(bool privileged);
 			void setDisabled(bool disabled);
 
+		public slots:
+			void update(rtclient_user* user);
+
 		signals:
 			void idChanged();
 			void nameChanged();
@@ -147,9 +150,6 @@ namespace RTClient {
 			void privilegedChanged();
 			void disabledChanged();
 
-		private slots:
-			void update(rtclient_user* user);
-
 		private:
 			unsigned int m_id;
 			QString m_name;
diff --git a/ticket.cxx b/ticket.cxx
index cd984c5..93eb066 100644
--- a/ticket.cxx
+++ b/ticket.cxx
@@ -1,5 +1,4 @@
 #include <cstddef>
-#include <rtclient/ticket.h>
 #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<int, QByteArray> TicketList::roleNames() const
 	{
 		return QHash<int, QByteArray>{
-			{SubjectRole, "subject"}
+			{IdRole, "id"}
+			, {SubjectRole, "subject"}
 		};
 	}