From 64f9c512dafc496949b1d471de4ea7b84fbe67e7 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@charleskerr.com>
Date: Thu, 25 Dec 2025 14:53:51 -0600
Subject: [PATCH] refactor: remove `tr_quark_convert()` (#8009)

* refactor: remove tr_quark_convert() call from makeState()

* refactor: remove tr_quark_convert() call from tr_variant::merge()

* refactor: remove tr_quark_convert()
---
 libtransmission/api-compat.cc | 15 ++++-----------
 libtransmission/api-compat.h  |  7 -------
 libtransmission/variant.cc    |  2 +-
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/libtransmission/api-compat.cc b/libtransmission/api-compat.cc
index 770437f7f..ff72b5ef8 100644
--- a/libtransmission/api-compat.cc
+++ b/libtransmission/api-compat.cc
@@ -486,8 +486,10 @@ struct State
 
     if (auto const method = top.value_if<std::string_view>(TR_KEY_method))
     {
-        auto const key = tr_quark_convert(tr_quark_new(*method));
-        state.is_torrent = key == TR_KEY_torrent_get || key == TR_KEY_torrent_set;
+        auto const key = tr_quark_lookup(*method);
+        state.is_torrent = key &&
+            (*key == TR_KEY_torrent_get || *key == TR_KEY_torrent_get_kebab || *key == TR_KEY_torrent_set ||
+             *key == TR_KEY_torrent_set_kebab_APICOMPAT);
     }
 
     if (state.is_response)
@@ -922,12 +924,3 @@ void convert_incoming_data(tr_variant& var)
     convert(var, Style::Tr5);
 }
 } // namespace libtransmission::api_compat
-
-tr_quark tr_quark_convert(tr_quark const quark)
-{
-    using namespace libtransmission::api_compat;
-
-    auto state = State{};
-    state.style = Style::Tr5;
-    return convert_key(state, quark);
-}
diff --git a/libtransmission/api-compat.h b/libtransmission/api-compat.h
index 47123d373..664ce4af3 100644
--- a/libtransmission/api-compat.h
+++ b/libtransmission/api-compat.h
@@ -26,10 +26,3 @@ void convert_incoming_data(tr_variant& var);
 void convert_outgoing_data(tr_variant& var);
 
 } // namespace libtransmission::api_compat
-
-/**
- * Get the replacement quark from old deprecated quarks.
- *
- * Note: Temporary shim just for the transition period to snake_case.
- */
-[[nodiscard]] tr_quark tr_quark_convert(tr_quark quark);
diff --git a/libtransmission/variant.cc b/libtransmission/variant.cc
index ac366a404..ba003d54b 100644
--- a/libtransmission/variant.cc
+++ b/libtransmission/variant.cc
@@ -222,7 +222,7 @@ tr_variant& tr_variant::merge(tr_variant const& that)
                     dest->reserve(std::size(*dest) + std::size(value));
                     for (auto const& [key, child] : value)
                     {
-                        (*dest)[tr_quark_convert(key)].merge(child);
+                        (*dest)[key].merge(child);
                     }
                 }
             }