Merge branch 'master' into cmake

1 files changed, 19 insertions, 5 deletions

diff --git a/client.cxx b/client.cxx
index 7ffe780..8484387 100644
--- a/client.cxx
+++ b/client.cxx
@@ -1,5 +1,6 @@
 #include <cstddef>
 #include <icclient/client.h>
+#include <icclient/member.h>
 #include "qicclient/client.hxx"
 
 namespace ICClient {
@@ -21,12 +22,25 @@ namespace ICClient {
 		emit gotAllProducts(catalog);
 	}
 
-	void Client::logIn(QString const& username, QString const& password)
+	void Client::order(icclient_ord_order** orderPtr, QString const& sku
+			, icclient_catalog* catalog)
 	{
-		icclient_login(username.toLatin1().constData()
-				, password.toLatin1().constData(), nullptr, nullptr
-				, nullptr);
-		emit loggedIn(username);
+		icclient_order(orderPtr, sku.toLatin1().constData(), catalog);
+		icclient_ord_order* order = *orderPtr;
+		emit ordered(order);
+	}
+
+	void Client::logIn(size_t (*handler)(void*, size_t, size_t, void*)
+			, icclient_user* user, QString const& username
+			, QString const& password, QString const& successPage
+			, QString const& nextPage, QString const& failPage)
+	{
+		icclient_login(handler, user, username.toLatin1().constData()
+				, password.toLatin1().constData()
+				, successPage.toLatin1().constData()
+				, nextPage.toLatin1().constData()
+				, failPage.toLatin1().constData());
+		emit loggedIn(user);
 	}
 
 	void Client::logOut()