1 files changed, 10 insertions, 12 deletions
diff --git a/subprojects/battleNetApi/src/hearthstoneApi.cpp b/subprojects/battleNetApi/src/hearthstoneApi.cpp
index 903e987..9fda88c 100644
--- a/subprojects/battleNetApi/src/hearthstoneApi.cpp
+++ b/subprojects/battleNetApi/src/hearthstoneApi.cpp
@@ -11,15 +11,15 @@ std::uint64_t HearthstoneApi::numberOfCards() {
 
 std::string HearthstoneApi::authorizationHeader() { return std::format("Authorization: Bearer {}", mToken.toString()); }
 
-const std::string HearthstoneApi::getUrl(const std::string &iParameters) {
+const std::string HearthstoneApi::apiUrl(const std::string &iParameters) const {
     return std::format("https://eu.api.blizzard.com/hearthstone/{}", iParameters);
 }
 
-std::string HearthstoneApi::makeApiRequest(const char *iUrl) {
+std::string HearthstoneApi::makeApiRequest(const std::string &iUrl) const {
     CURL *curl = curl_easy_init();
     std::string request_output;
     if (curl) {
-        curl_easy_setopt(curl, CURLOPT_URL, iUrl);
+        curl_easy_setopt(curl, CURLOPT_URL, iUrl.c_str());
         curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
         curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
         curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curlCallbackStringOutput);
@@ -33,23 +33,21 @@ std::string HearthstoneApi::makeApiRequest(const char *iUrl) {
     return request_output;
 }
 
-const std::string HearthstoneApi::getSetOfCardsUrl(const std::string &iCardParameters) {
-    return getUrl(std::format("cards{}", iCardParameters));
+const std::string HearthstoneApi::setOfCardsUrl(const std::string &iCardParameters) {
+    return apiUrl(std::format("cards{}", iCardParameters));
 }
 
 size_t HearthstoneApi::curlCallbackStringOutput(void *iContent, size_t iSize, size_t iNmemb, std::string *iS) {
-    size_t newLength = iSize * iNmemb;
+    const size_t kNewLength = iSize * iNmemb;
     try {
-        iS->append(static_cast<char *>(iContent), newLength);
+        iS->append(static_cast<char *>(iContent), kNewLength);
     } catch (std::bad_alloc &e) {
         // handle memory problem
         return 0;
     }
-    return newLength;
+    return kNewLength;
 }
 
-std::string HearthstoneApi::makeApiRequest(const std::string &iUrl) { return makeApiRequest(iUrl.c_str()); }
-
-std::string HearthstoneApi::getCards(const std::string &iCardParameters) {
-    return makeApiRequest(getSetOfCardsUrl(iCardParameters));
+std::string HearthstoneApi::cards(const std::string &iCardParameters) {
+    return makeApiRequest(setOfCardsUrl(iCardParameters));
 }