fix: httplib http backend: don't use namespace in cpp

Author: Totto16

src/lobby/httplib_client.cpp

@@ -5,45 +5,44 @@
 #define TRANSFORM_RESULT(result) std::make_unique<ActualResult>((result))
 
 
-namespace oopetris::http::implementation {
+oopetris::http::implementation::ActualResult::ActualResult(httplib::Result&& result) : m_result{ std::move(result) } { }
 
+oopetris::http::implementation::ActualResult::~ActualResult() = default;
 
-    ActualResult::ActualResult(httplib::Result&& result) : m_result{ std::move(result) } { }
-
-    ActualResult::~ActualResult() = default;
-
-    [[nodiscard]] std::optional<std::string> ActualResult::get_header(const std::string& key) const {
-        if (m_result->has_header(key)) {
-            return std::nullopt;
-        }
-
-        return m_result->get_header_value(key);
+[[nodiscard]] std::optional<std::string> oopetris::http::implementation::ActualResult::get_header(const std::string& key
+) const {
+    if (m_result->has_header(key)) {
+        return std::nullopt;
     }
 
-    [[nodiscard]] std::string ActualResult::body() const {
-        return m_result->body;
-    }
+    return m_result->get_header_value(key);
+}
 
-    [[nodiscard]] int ActualResult::status() const {
-        return m_result->status;
-    }
+[[nodiscard]] std::string oopetris::http::implementation::ActualResult::body() const {
+    return m_result->body;
+}
 
-    [[nodiscard]] std::optional<std::string> ActualResult::get_error() const {
+[[nodiscard]] int oopetris::http::implementation::ActualResult::status() const {
+    return m_result->status;
+}
 
-        if (not m_result) {
-            return httplib::to_string(m_result.error());
-        }
+[[nodiscard]] std::optional<std::string> oopetris::http::implementation::ActualResult::get_error() const {
 
-        return std::nullopt;
+    if (not m_result) {
+        return httplib::to_string(m_result.error());
     }
 
+    return std::nullopt;
+}
+
 
-    ActualClient::ActualClient(ActualClient&& other) noexcept : m_client{ std::move(other.m_client) } { }
+oopetris::http::implementation::ActualClient::ActualClient(ActualClient&& other) noexcept
+    : m_client{ std::move(other.m_client) } { }
 
-    ActualClient::~ActualClient() = default;
+oopetris::http::implementation::ActualClient::~ActualClient() = default;
 
-    ActualClient::ActualClient(const std::string& api_url) : m_client{ api_url } {
-        // clang-format off
+oopetris::http::implementation::ActualClient::ActualClient(const std::string& api_url) : m_client{ api_url } {
+    // clang-format off
             m_client.set_default_headers({
 #if defined(CPPHTTPLIB_ZLIB_SUPPORT) || defined(CPPHTTPLIB_BROTLI_SUPPORT)
                     { "Accept-Encoding",
@@ -59,49 +58,52 @@ namespace oopetris::http::implementation {
 #endif
                         },
 #endif
-                // clang-format on
-                { "Accept", ::http::constants::json_content_type } });
+            // clang-format on
+            { "Accept", ::http::constants::json_content_type } });
 
 #if defined(CPPHTTPLIB_ZLIB_SUPPORT) || defined(CPPHTTPLIB_BROTLI_SUPPORT)
-        m_client.set_compress(true);
-        m_client.set_decompress(true);
+    m_client.set_compress(true);
+    m_client.set_decompress(true);
 #endif
-    }
-
-    [[nodiscard]] std::unique_ptr<Result> ActualClient::Get(const std::string& url) {
-        return TRANSFORM_RESULT(m_client.Get(url));
-    }
-
-    [[nodiscard]] std::unique_ptr<Result> ActualClient::Delete(const std::string& url) {
-        return TRANSFORM_RESULT(m_client.Delete(url));
-    }
+}
 
-    [[nodiscard]] std::unique_ptr<Result>
-    ActualClient::Post(const std::string& url, const std::optional<std::pair<std::string, std::string>>& payload) {
+[[nodiscard]] std::unique_ptr<oopetris::http::Result> oopetris::http::implementation::ActualClient::Get(const std::string& url) {
+    return TRANSFORM_RESULT(m_client.Get(url));
+}
 
-        if (not payload.has_value()) {
-            return TRANSFORM_RESULT(m_client.Post(url));
-        }
+[[nodiscard]] std::unique_ptr<oopetris::http::Result> oopetris::http::implementation::ActualClient::Delete(const std::string& url) {
+    return TRANSFORM_RESULT(m_client.Delete(url));
+}
 
-        auto [content, content_type] = payload.value();
+[[nodiscard]] std::unique_ptr<oopetris::http::Result> oopetris::http::implementation::ActualClient::Post(
+        const std::string& url,
+        const std::optional<std::pair<std::string, std::string>>& payload
+) {
 
-        return TRANSFORM_RESULT(m_client.Post(url, content, content_type));
+    if (not payload.has_value()) {
+        return TRANSFORM_RESULT(m_client.Post(url));
     }
 
-    [[nodiscard]] std::unique_ptr<Result>
-    ActualClient::Put(const std::string& url, const std::optional<std::pair<std::string, std::string>>& payload) {
+    auto [content, content_type] = payload.value();
 
-        if (not payload.has_value()) {
-            return TRANSFORM_RESULT(m_client.Put(url));
-        }
+    return TRANSFORM_RESULT(m_client.Post(url, content, content_type));
+}
 
-        auto [content, content_type] = payload.value();
+[[nodiscard]] std::unique_ptr<oopetris::http::Result> oopetris::http::implementation::ActualClient::Put(
+        const std::string& url,
+        const std::optional<std::pair<std::string, std::string>>& payload
+) {
 
-        return TRANSFORM_RESULT(m_client.Put(url, content, content_type));
+    if (not payload.has_value()) {
+        return TRANSFORM_RESULT(m_client.Put(url));
     }
 
-    void ActualClient::SetBearerAuth(const std::string& token) {
+    auto [content, content_type] = payload.value();
 
-        m_client.set_bearer_token_auth(token);
-    }
-} // namespace oopetris::http::implementation
+    return TRANSFORM_RESULT(m_client.Put(url, content, content_type));
+}
+
+void oopetris::http::implementation::ActualClient::SetBearerAuth(const std::string& token) {
+
+    m_client.set_bearer_token_auth(token);
+}