order function moved to ord namespace

4 files changed, 6 insertions, 7 deletions

diff --git a/basket.cxx b/basket.cxx
index ed8d78f..ffbecf4 100644
--- a/basket.cxx
+++ b/basket.cxx
@@ -61,7 +61,7 @@ namespace QICClient {
 		emit rowCountChanged();
 	}
 
-	void Basket::setData(icclient_ord_order* order)
+	void Basket::setData(struct icclient_ord_order* order)
 	{
 		if (order) {
 			this->m_data = order;
diff --git a/client.cxx b/client.cxx
index 1279818..3b406ad 100644
--- a/client.cxx
+++ b/client.cxx
@@ -45,7 +45,8 @@ namespace QICClient {
 	void Client::order(QString const& sku, Catalog const& catalog, Basket& order)
 	{
 		auto c_order = order.data();
-		icclient_order(sku.toLatin1().constData(), catalog.constData(), &c_order);
+		icclient_ord_order(sku.toLatin1().constData(), catalog.constData(),
+				&c_order);
 		order.setData(c_order);
 	}
 
diff --git a/libicclient b/libicclient
-Subproject 1a1f3c047d36dd59958d3dba6e4fa690d2178fe
+Subproject c0fba9db9290fb30884b9c4f8d847212164e3b5
diff --git a/qicclient/basket.hxx b/qicclient/basket.hxx
index 9e0d4f1..8930821 100644
--- a/qicclient/basket.hxx
+++ b/qicclient/basket.hxx
@@ -5,8 +5,6 @@
 #include <icclient/ord.h>
 #include "product.hxx"
 
-struct icclient_ord_order;
-
 namespace QICClient {
 
 	struct Item
@@ -52,8 +50,8 @@ namespace QICClient {
 					int role = Qt::DisplayRole
 				     ) const Q_DECL_OVERRIDE;
 
-			icclient_ord_order* data() { return m_data; }
-			void setData(icclient_ord_order* order);
+			struct icclient_ord_order* data() { return m_data; }
+			void setData(struct icclient_ord_order* order);
 			double subtotal() const { return m_subtotal; }
 			double shipping() const { return m_shipping; }
 			double totalCost() const { return m_totalCost; }
@@ -70,7 +68,7 @@ namespace QICClient {
 		private:
 			void addItem(Item const& item);
 			QList<Item> items;
-			icclient_ord_order* m_data;
+			struct icclient_ord_order* m_data;
 			double m_subtotal;
 			double m_shipping;
 			double m_totalCost;