diff options
| -rw-r--r-- | client.cxx | 28 | ||||
| -rw-r--r-- | qicclient.hxx | 25 |
2 files changed, 26 insertions, 27 deletions
@@ -6,12 +6,12 @@ static QICClient::Client* client; -static void handleResults(icclient_response* response) +static void responseHandler(icclient_response* response) { - client->emitResults(response); + client->emitResponse(response); } -static void callback(icclient_catalog* catalog) +static void catalogCallback(icclient_catalog* catalog) { client->emitCatalog(catalog); icclient_free_catalog(catalog); @@ -32,27 +32,27 @@ namespace QICClient { void Client::results(QString const& prodGroup) { - icclient_results(prodGroup.toLatin1().constData(), handleResults, nullptr); + icclient_results(prodGroup.toLatin1().constData(), responseHandler, nullptr); } -/* - void Client::results(QString const& prodGroup, void (*handler)(icclient_response*)) + + void Client::allProducts() { - icclient_results(prodGroup.toLatin1().constData(), handler, callback); + icclient_allproducts(responseHandler, nullptr); } -*/ - void Client::allProducts() + + void Client::strapResults(QString const& prodGroup) { - icclient_allproducts(handleResults, nullptr); + icclient_results(prodGroup.toLatin1().constData(), nullptr, catalogCallback); } - void Client::allproducts(void (*handler)(icclient_response* response)) + void Client::strapAllProducts() { - icclient_allproducts(handler, callback); + icclient_allproducts(nullptr, catalogCallback); } - void Client::emitResults(icclient_response* response) + void Client::emitResponse(icclient_response* response) { - emit gotResults(response); + emit gotResponse(response); } void Client::emitCatalog(icclient_catalog* catalog) diff --git a/qicclient.hxx b/qicclient.hxx index 2acaf5b..d44b1a4 100644 --- a/qicclient.hxx +++ b/qicclient.hxx @@ -23,18 +23,7 @@ namespace QICClient { */ Client(char const* sampleURL, char const* image_Dir, char const* certificate = nullptr); ~Client(); - /*! - * \brief For fetching products that belong a specific group. - * \param prodGroup The name of the product group. - * \param handler A C style pointer to function for custom handling. - */ - //void results(QString const& prodGroup, void (*handler)(icclient_response*)); - /*! - * \brief For fetching data about all active products. - * \param handler A C style pointer to function for custom handling. - */ - void allproducts(void (*handler)(icclient_response*) = nullptr); - void emitResults(icclient_response* response); + void emitResponse(icclient_response* response); void emitCatalog(icclient_catalog* catalog); /*! * \brief For fetching data about a specific product. @@ -60,9 +49,19 @@ namespace QICClient { * \brief For fetching data about all active products. */ void allProducts(); + /*! + * \brief For fetching products that belong a specific group. + * \param prodGroup The name of the product group. + * \param handler A C style pointer to function for custom handling. + */ + void strapResults(QString const& prodGroup); + /*! + * \brief For fetching data about all active products. + */ + void strapAllProducts(); signals: - void gotResults(icclient_response* response); + void gotResponse(icclient_response* response); void gotCatalog(Catalog* catalog); void gotFlyPage(shared_ptr<Product> product); }; |