Merge branch 'master' into cmake

1 files changed, 35 insertions, 8 deletions

diff --git a/qicclient/client.hxx b/qicclient/client.hxx
index 27ba2af..bccd665 100644
--- a/qicclient/client.hxx
+++ b/qicclient/client.hxx
@@ -1,10 +1,11 @@
-#ifndef QRTCLIENT_CLIENT_HXX
-#define QRTCLIENT_CLIENT_HXX
+#ifndef QICCLIENT_CLIENT_HXX
+#define QICCLIENT_CLIENT_HXX
 
 #include <QObject>
 #include <icclient/product.h>
 
 struct icclient_catalog;
+struct icclient_order;
 
 namespace ICClient {
 
@@ -16,21 +17,47 @@ namespace ICClient {
 			Client(char const* url, char const* certificate = nullptr);
 			~Client();
 
-			void productAll(icclient_catalog** catalogptr
-					, size_t (*callback)(void* contents
+			void allProducts(size_t (*handler)(void* contents
 						, size_t size, size_t nmemb
 						, void* userdata));
 
 		public slots:
-			void logIn(QString const& username, QString const& password);
+			/*
+			void order(QString const& sku);
+			void remove(unsigned int const& indices);
+			void checkout();
+			*/
+			void logIn(QString const& username
+					, QString const& password);
+		/*
+			void account(QString const& firstName
+					, QString const& lastName
+					, QString const& address1
+					, QString const& address2
+					, QString const& city
+					, QString const& state
+					, QString const& zip
+					, QString const& email
+					, QString const& phoneDay);
+			void changePassword(QString const& passwordOld
+					, QString const& password
+					, QString const& verify);
+					*/
 			void logOut();
+			/*
+			void newItem(QString const& description
+					, QString const& comment,
+					QString const& price
+					, QString const& imagePath);
+					*/
 
 		signals:
-			void gotProductAll(icclient_catalog* catalog);
-			void loggedIn(QString const& username);
+			void gotAllProducts(icclient_catalog* catalog);
+			void ordered(icclient_order* order);
+			void loggedIn(QString const& userName);
 			void loggedOut();
 	};
 
 }
 
-#endif // QRTCLIENT_CLIENT_HXX
+#endif // QICCLIENT_CLIENT_HXX