Merge branch 'master' into cmake

# Conflicts:
#	qicclient.pro

1 files changed, 40 insertions, 0 deletions

diff --git a/qicclient/product.hxx b/qicclient/product.hxx
new file mode 100644
index 0000000..7271fe9
--- /dev/null
+++ b/qicclient/product.hxx
@@ -0,0 +1,40 @@
+#ifndef QICCLIENT_PRODUCT_HXX
+#define QICCLIENT_PRODUCT_HXX
+
+#include <icclient/product.h>
+
+namespace ICClient {
+
+	struct Product
+	{
+		enum ProductRoles {
+			SkuRole = Qt::UserRole + 1,
+			DescriptionRole,
+			CommentRole,
+			ImageRole,
+			PriceRole
+		};
+
+		Product(icclient_product* product)
+			: sku{product->sku}
+			, price{product->price}
+		{
+			if (product->description)
+				description
+					= QString{product->description};
+			if (product->comment)
+				comment = QString{product->comment};
+			if (product->image)
+				image = QString{product->image};
+		}
+
+		QString sku;
+		QString description;
+		QString comment;
+		QString image;
+		double price;
+	};
+
+}
+
+#endif // QICCLIENT_PRODUCT_HXX