diff --git a/cli/cli.cc b/cli/cli.cc index 36f6d4b53..1e63ac5a8 100644 --- a/cli/cli.cc +++ b/cli/cli.cc @@ -26,7 +26,7 @@ #include // tr_sessionFetch() using namespace std::chrono_literals; -using namespace libtransmission::Values; +using namespace tr::Values; #define SPEED_K_STR "kB/s" diff --git a/daemon/daemon.cc b/daemon/daemon.cc index e68cd9557..272675ead 100644 --- a/daemon/daemon.cc +++ b/daemon/daemon.cc @@ -65,7 +65,7 @@ struct tr_torrent; #endif using namespace std::literals; -using libtransmission::Watchdir; +using tr::Watchdir; namespace { @@ -922,7 +922,7 @@ int tr_daemon::start([[maybe_unused]] bool foreground) return onFileAdded(session, dirname, basename); }; - auto timer_maker = libtransmission::EvTimerMaker{ ev_base_ }; + auto timer_maker = tr::EvTimerMaker{ ev_base_ }; watchdir = force_generic ? Watchdir::create_generic(dir, handler, timer_maker) : Watchdir::create(dir, handler, timer_maker, ev_base_); } diff --git a/gtk/DetailsDialog.cc b/gtk/DetailsDialog.cc index 59165a55f..d8249ddb0 100644 --- a/gtk/DetailsDialog.cc +++ b/gtk/DetailsDialog.cc @@ -75,7 +75,7 @@ using namespace std::literals; -using namespace libtransmission::Values; +using namespace tr::Values; class DetailsDialog::Impl { diff --git a/gtk/FaviconCache.cc b/gtk/FaviconCache.cc index e54a9706d..491556ce4 100644 --- a/gtk/FaviconCache.cc +++ b/gtk/FaviconCache.cc @@ -11,7 +11,7 @@ #include #include -using namespace transmission::app; +using namespace tr::app; using Icon = Glib::RefPtr; template<> diff --git a/gtk/FilterBar.cc b/gtk/FilterBar.cc index ecdb5faae..40ef05c42 100644 --- a/gtk/FilterBar.cc +++ b/gtk/FilterBar.cc @@ -48,7 +48,7 @@ #include #include -using namespace transmission::app; +using namespace tr::app; namespace { diff --git a/gtk/MainWindow.cc b/gtk/MainWindow.cc index f5d9a70e9..70da544cb 100644 --- a/gtk/MainWindow.cc +++ b/gtk/MainWindow.cc @@ -61,7 +61,7 @@ using namespace std::string_literals; using namespace std::string_view_literals; -using namespace libtransmission::Values; +using namespace tr::Values; using VariantInt = Glib::Variant; using VariantDouble = Glib::Variant; diff --git a/gtk/MakeDialog.cc b/gtk/MakeDialog.cc index da48903bc..18e57a5c5 100644 --- a/gtk/MakeDialog.cc +++ b/gtk/MakeDialog.cc @@ -51,7 +51,7 @@ #include using namespace std::literals; -using namespace libtransmission::Values; +using namespace tr::Values; #if GTKMM_CHECK_VERSION(4, 0, 0) using FileListValue = Glib::Value; diff --git a/gtk/Prefs.cc b/gtk/Prefs.cc index 127625c8a..82b2b86d7 100644 --- a/gtk/Prefs.cc +++ b/gtk/Prefs.cc @@ -20,8 +20,8 @@ #include using namespace std::literals; -using namespace transmission::app; -using libtransmission::serializer::to_variant; +using namespace tr::app; +using tr::serializer::to_variant; std::string gl_confdir; diff --git a/gtk/Prefs.h b/gtk/Prefs.h index cdcbf3fad..506906f9f 100644 --- a/gtk/Prefs.h +++ b/gtk/Prefs.h @@ -19,7 +19,7 @@ template [[nodiscard]] std::optional gtr_pref_get(tr_quark const key) { - using namespace libtransmission::serializer; + using namespace tr::serializer; auto const& map = gtr_pref_get_map(); auto const iter = map.find(key); return iter != std::end(map) ? to_value(iter->second) : std::nullopt; diff --git a/gtk/PrefsDialog.cc b/gtk/PrefsDialog.cc index 5dddadb4e..07d75d777 100644 --- a/gtk/PrefsDialog.cc +++ b/gtk/PrefsDialog.cc @@ -51,7 +51,7 @@ #include #include -using namespace libtransmission::Values; +using namespace tr::Values; /** *** diff --git a/gtk/Session.cc b/gtk/Session.cc index 917857170..ccdead162 100644 --- a/gtk/Session.cc +++ b/gtk/Session.cc @@ -58,7 +58,7 @@ #include using namespace std::literals; -using namespace transmission::app; +using namespace tr::app; class Session::Impl { diff --git a/gtk/Session.h b/gtk/Session.h index dc3a69b55..86bde3066 100644 --- a/gtk/Session.h +++ b/gtk/Session.h @@ -75,7 +75,7 @@ public: // TODO(c++20) std::span [[nodiscard]] std::vector find_torrents(std::vector const& ids) const; - transmission::app::FaviconCache>& favicon_cache() const; + tr::app::FaviconCache>& favicon_cache() const; /****** ******* diff --git a/gtk/SystemTrayIcon.cc b/gtk/SystemTrayIcon.cc index a3c41b3ea..e8fdc01f4 100644 --- a/gtk/SystemTrayIcon.cc +++ b/gtk/SystemTrayIcon.cc @@ -49,7 +49,7 @@ #endif using namespace std::literals; -using namespace libtransmission::Values; +using namespace tr::Values; namespace { diff --git a/gtk/Torrent.cc b/gtk/Torrent.cc index 84358f105..5bcbb6cde 100644 --- a/gtk/Torrent.cc +++ b/gtk/Torrent.cc @@ -26,7 +26,7 @@ using namespace std::string_view_literals; -using namespace libtransmission::Values; +using namespace tr::Values; namespace { diff --git a/gtk/Torrent.h b/gtk/Torrent.h index 87fe27353..da3d52b18 100644 --- a/gtk/Torrent.h +++ b/gtk/Torrent.h @@ -74,8 +74,8 @@ public: using ChangeFlags = Flags; public: - using Speed = libtransmission::Values::Speed; - using Storage = libtransmission::Values::Storage; + using Speed = tr::Values::Speed; + using Storage = tr::Values::Storage; int get_active_peer_count() const; int get_active_peers_down() const; diff --git a/gtk/TorrentFilter.h b/gtk/TorrentFilter.h index 5679b75c7..e39d8306c 100644 --- a/gtk/TorrentFilter.h +++ b/gtk/TorrentFilter.h @@ -18,7 +18,7 @@ class TorrentFilter : public FilterBase { public: - using ShowMode = transmission::app::ShowMode; + using ShowMode = tr::app::ShowMode; enum class Tracker : int8_t { @@ -51,7 +51,7 @@ private: TorrentFilter(); private: - ShowMode show_mode_ = transmission::app::DefaultShowMode; + ShowMode show_mode_ = tr::app::DefaultShowMode; Tracker tracker_type_ = Tracker::ALL; Glib::ustring tracker_host_; Glib::ustring text_; diff --git a/gtk/TorrentSorter.cc b/gtk/TorrentSorter.cc index 1af111507..08a13960f 100644 --- a/gtk/TorrentSorter.cc +++ b/gtk/TorrentSorter.cc @@ -23,7 +23,7 @@ #include using namespace std::string_view_literals; -using namespace transmission::app; +using namespace tr::app; namespace { diff --git a/gtk/TorrentSorter.h b/gtk/TorrentSorter.h index 68e9c5f64..eca8ebd43 100644 --- a/gtk/TorrentSorter.h +++ b/gtk/TorrentSorter.h @@ -12,7 +12,7 @@ #include -using SortMode = transmission::app::SortMode; +using SortMode = tr::app::SortMode; class TorrentSorter : public SorterBase { diff --git a/gtk/Utils.cc b/gtk/Utils.cc index e4606d75a..0a7fb07ef 100644 --- a/gtk/Utils.cc +++ b/gtk/Utils.cc @@ -62,7 +62,7 @@ using namespace std::literals; -using namespace libtransmission::Values; +using namespace tr::Values; /*** **** @@ -116,7 +116,7 @@ Glib::ustring tr_strlratio(double ratio) return tr_strratio(ratio, Q_("None"), gtr_get_unicode_string(GtrUnicode::Inf).c_str()); } -Glib::ustring tr_strlsize(libtransmission::Values::Storage const& storage) +Glib::ustring tr_strlsize(tr::Values::Storage const& storage) { return storage.is_zero() ? Q_("None") : storage.to_string(); } diff --git a/gtk/Utils.h b/gtk/Utils.h index afa98d910..ee7aba933 100644 --- a/gtk/Utils.h +++ b/gtk/Utils.h @@ -65,7 +65,7 @@ Glib::ustring gtr_get_unicode_string(GtrUnicode uni); /* return a human-readable string for the size given in bytes. */ Glib::ustring tr_strlsize(guint64 size_in_bytes); -Glib::ustring tr_strlsize(libtransmission::Values::Storage const& storage); +Glib::ustring tr_strlsize(tr::Values::Storage const& storage); /* return a human-readable string for the given ratio. */ Glib::ustring tr_strlratio(double ratio); diff --git a/gtk/main.cc b/gtk/main.cc index 29409f073..4761cb006 100644 --- a/gtk/main.cc +++ b/gtk/main.cc @@ -50,7 +50,7 @@ Glib::OptionEntry create_option_entry(Glib::ustring const& long_name, gchar shor int main(int argc, char** argv) { - transmission::app::init(); + tr::app::init(); /* init i18n */ bindtextdomain(AppTranslationDomainName, TRANSMISSIONLOCALEDIR); @@ -116,7 +116,7 @@ int main(int argc, char** argv) } // init the unit formatters - using Config = libtransmission::Values::Config; + using Config = tr::Values::Config; Config::speed = { Config::Base::Kilo, _("B/s"), _("kB/s"), _("MB/s"), _("GB/s"), _("TB/s") }; Config::memory = { Config::Base::Kibi, _("B"), _("KiB"), _("MiB"), _("GiB"), _("TiB") }; Config::storage = { Config::Base::Kilo, _("B"), _("kB"), _("MB"), _("GB"), _("TB") }; diff --git a/libtransmission-app/app.cc b/libtransmission-app/app.cc index e358afae8..bae8449f2 100644 --- a/libtransmission-app/app.cc +++ b/libtransmission-app/app.cc @@ -8,7 +8,7 @@ #include "libtransmission-app/app.h" #include "libtransmission-app/converters.h" -namespace transmission::app +namespace tr::app { void init() { @@ -16,4 +16,4 @@ void init() tr_locale_set_global(""); detail::register_app_converters(); } -} // namespace transmission::app +} // namespace tr::app diff --git a/libtransmission-app/app.h b/libtransmission-app/app.h index 3d1a5c867..ac0fbe53e 100644 --- a/libtransmission-app/app.h +++ b/libtransmission-app/app.h @@ -5,10 +5,10 @@ #pragma once -namespace transmission::app +namespace tr::app { // should be called once when starting the app void init(); -} // namespace transmission::app +} // namespace tr::app diff --git a/libtransmission-app/converters.cc b/libtransmission-app/converters.cc index 2b7230133..2ac6a8917 100644 --- a/libtransmission-app/converters.cc +++ b/libtransmission-app/converters.cc @@ -14,7 +14,7 @@ #include "libtransmission-app/display-modes.h" #include "libtransmission-app/converters.h" -namespace transmission::app::detail +namespace tr::app::detail { namespace { @@ -125,10 +125,10 @@ void register_app_converters() once, [] { - using Converters = libtransmission::serializer::Converters; + using Converters = tr::serializer::Converters; Converters::add(to_show_mode, from_show_mode); Converters::add(to_sort_mode, from_sort_mode); }); } -} // namespace transmission::app::detail +} // namespace tr::app::detail diff --git a/libtransmission-app/converters.h b/libtransmission-app/converters.h index a3e39c463..65deb6d9f 100644 --- a/libtransmission-app/converters.h +++ b/libtransmission-app/converters.h @@ -5,9 +5,9 @@ #pragma once -namespace transmission::app::detail +namespace tr::app::detail { void register_app_converters(); -} // namespace transmission::app::detail +} // namespace tr::app::detail diff --git a/libtransmission-app/display-modes.h b/libtransmission-app/display-modes.h index 2f539e2ab..5449108ab 100644 --- a/libtransmission-app/display-modes.h +++ b/libtransmission-app/display-modes.h @@ -5,7 +5,7 @@ #pragma once -namespace transmission::app +namespace tr::app { enum class ShowMode { @@ -37,4 +37,4 @@ enum class SortMode inline auto constexpr SortModeCount = 10U; inline auto constexpr DefaultSortMode = SortMode::SortByName; -} // namespace transmission::app +} // namespace tr::app diff --git a/libtransmission-app/favicon-cache.h b/libtransmission-app/favicon-cache.h index 140035859..8649c8af8 100644 --- a/libtransmission-app/favicon-cache.h +++ b/libtransmission-app/favicon-cache.h @@ -25,7 +25,7 @@ #include #include -namespace transmission::app +namespace tr::app { template @@ -249,4 +249,4 @@ private: std::map> icons_; }; -} // namespace transmission::app +} // namespace tr::app diff --git a/libtransmission/announcer-http.cc b/libtransmission/announcer-http.cc index 7ca33fd4e..ae0509104 100644 --- a/libtransmission/announcer-http.cc +++ b/libtransmission/announcer-http.cc @@ -323,9 +323,9 @@ void tr_announcerParseHttpAnnounceResponse(tr_announce_response& response, std:: { verboseLog("Announce response:", tr_direction::Down, benc); - struct AnnounceHandler final : public transmission::benc::BasicHandler + struct AnnounceHandler final : public tr::benc::BasicHandler { - using BasicHandler = transmission::benc::BasicHandler; + using BasicHandler = tr::benc::BasicHandler; tr_announce_response& response_; std::string_view const log_name_; @@ -441,10 +441,10 @@ void tr_announcerParseHttpAnnounceResponse(tr_announce_response& response, std:: } }; - auto stack = transmission::benc::ParserStack{}; + auto stack = tr::benc::ParserStack{}; auto handler = AnnounceHandler{ response, log_name }; auto error = tr_error{}; - transmission::benc::parse(benc, stack, handler, nullptr, &error); + tr::benc::parse(benc, stack, handler, nullptr, &error); if (error) { tr_logAddWarn( @@ -564,9 +564,9 @@ void tr_announcerParseHttpScrapeResponse(tr_scrape_response& response, std::stri { verboseLog("Scrape response:", tr_direction::Down, benc); - struct ScrapeHandler final : public transmission::benc::BasicHandler + struct ScrapeHandler final : public tr::benc::BasicHandler { - using BasicHandler = transmission::benc::BasicHandler; + using BasicHandler = tr::benc::BasicHandler; tr_scrape_response& response_; std::string_view const log_name_; @@ -660,10 +660,10 @@ void tr_announcerParseHttpScrapeResponse(tr_scrape_response& response, std::stri } }; - auto stack = transmission::benc::ParserStack{}; + auto stack = tr::benc::ParserStack{}; auto handler = ScrapeHandler{ response, log_name }; auto error = tr_error{}; - transmission::benc::parse(benc, stack, handler, nullptr, &error); + tr::benc::parse(benc, stack, handler, nullptr, &error); if (error) { tr_logAddWarn( diff --git a/libtransmission/announcer-udp.cc b/libtransmission/announcer-udp.cc index 3e7354727..f10878f76 100644 --- a/libtransmission/announcer-udp.cc +++ b/libtransmission/announcer-udp.cc @@ -60,8 +60,8 @@ using namespace std::literals; using tau_connection_t = uint64_t; using tau_transaction_t = uint32_t; -using InBuf = libtransmission::BufferReader; -using PayloadBuffer = libtransmission::StackBuffer<4096, std::byte>; +using InBuf = tr::BufferReader; +using PayloadBuffer = tr::StackBuffer<4096, std::byte>; using ipp_t = std::underlying_type_t; diff --git a/libtransmission/announcer.cc b/libtransmission/announcer.cc index 3094b3962..5684dffeb 100644 --- a/libtransmission/announcer.cc +++ b/libtransmission/announcer.cc @@ -226,7 +226,7 @@ private: std::map scrape_info_; - std::unique_ptr const upkeep_timer_; + std::unique_ptr const upkeep_timer_; std::set stops_; diff --git a/libtransmission/api-compat.cc b/libtransmission/api-compat.cc index 185d3dbee..8251c91b8 100644 --- a/libtransmission/api-compat.cc +++ b/libtransmission/api-compat.cc @@ -20,7 +20,7 @@ #include "libtransmission/utils.h" #include "libtransmission/variant.h" -namespace libtransmission::api_compat +namespace tr::api_compat { namespace { @@ -1051,4 +1051,4 @@ void convert_incoming_data(tr_variant& var) { convert(var, Style::Tr5); } -} // namespace libtransmission::api_compat +} // namespace tr::api_compat diff --git a/libtransmission/api-compat.h b/libtransmission/api-compat.h index 8c5531efa..2cce587f5 100644 --- a/libtransmission/api-compat.h +++ b/libtransmission/api-compat.h @@ -9,7 +9,7 @@ struct tr_variant; -namespace libtransmission::api_compat +namespace tr::api_compat { enum class Style : uint8_t { @@ -24,4 +24,4 @@ void convert_outgoing_data(tr_variant& var); [[nodiscard]] Style default_style(); void set_default_style(Style style); -} // namespace libtransmission::api_compat +} // namespace tr::api_compat diff --git a/libtransmission/bandwidth.cc b/libtransmission/bandwidth.cc index 13de81bfa..0ec210414 100644 --- a/libtransmission/bandwidth.cc +++ b/libtransmission/bandwidth.cc @@ -26,7 +26,7 @@ #include "libtransmission/utils.h" // tr_time_msec() #include "libtransmission/values.h" -using namespace libtransmission::Values; +using namespace tr::Values; Speed tr_bandwidth::get_speed(RateControl& r, unsigned int interval_msec, uint64_t now) { diff --git a/libtransmission/bandwidth.h b/libtransmission/bandwidth.h index 1df3f5ab6..f07b9ee2e 100644 --- a/libtransmission/bandwidth.h +++ b/libtransmission/bandwidth.h @@ -30,8 +30,8 @@ class tr_peerIo; struct tr_bandwidth_limits { - libtransmission::Values::Speed up_limit; - libtransmission::Values::Speed down_limit; + tr::Values::Speed up_limit; + tr::Values::Speed down_limit; bool up_limited = false; bool down_limited = false; }; @@ -78,7 +78,7 @@ struct tr_bandwidth_limits struct tr_bandwidth { private: - using Speed = libtransmission::Values::Speed; + using Speed = tr::Values::Speed; static constexpr auto HistoryMSec = 2000U; static constexpr auto GranularityMSec = 250U; diff --git a/libtransmission/benc.h b/libtransmission/benc.h index 666bb4233..ed73c70c1 100644 --- a/libtransmission/benc.h +++ b/libtransmission/benc.h @@ -16,7 +16,7 @@ #include "libtransmission/error.h" -namespace transmission::benc +namespace tr::benc { namespace impl @@ -427,4 +427,4 @@ bool parse( return true; } -} // namespace transmission::benc +} // namespace tr::benc diff --git a/libtransmission/blocklist.cc b/libtransmission/blocklist.cc index 4629f25d3..319f61ee9 100644 --- a/libtransmission/blocklist.cc +++ b/libtransmission/blocklist.cc @@ -41,7 +41,7 @@ using namespace std::literals; -namespace libtransmission +namespace tr { namespace { @@ -595,4 +595,4 @@ size_t Blocklists::update_primary_blocklist(std::string_view const external_file return n_rules; } -} // namespace libtransmission +} // namespace tr diff --git a/libtransmission/blocklist.h b/libtransmission/blocklist.h index c50be155f..92a61fd1e 100644 --- a/libtransmission/blocklist.h +++ b/libtransmission/blocklist.h @@ -21,7 +21,7 @@ #include "libtransmission/net.h" // for tr_address #include "libtransmission/observable.h" -namespace libtransmission +namespace tr { class Blocklists @@ -112,8 +112,8 @@ private: std::string folder_; - libtransmission::SimpleObservable<> changed_; + tr::SimpleObservable<> changed_; [[nodiscard]] static std::vector load_folder(std::string_view folder, bool is_enabled); }; -} // namespace libtransmission +} // namespace tr diff --git a/libtransmission/cache.h b/libtransmission/cache.h index 571c87b2e..a2dbf386d 100644 --- a/libtransmission/cache.h +++ b/libtransmission/cache.h @@ -29,7 +29,7 @@ class Cache { public: using BlockData = small::max_size_vector; - using Memory = libtransmission::Values::Memory; + using Memory = tr::Values::Memory; Cache(tr_torrents const& torrents, Memory max_size); diff --git a/libtransmission/handshake.cc b/libtransmission/handshake.cc index 7296c2370..b8fbcf7e1 100644 --- a/libtransmission/handshake.cc +++ b/libtransmission/handshake.cc @@ -88,7 +88,7 @@ ReadState tr_handshake::read_yb(tr_peerIo* peer_io) * ENCRYPT(VC, crypto_provide, len(PadC), PadC, len(IA)), ENCRYPT(IA) */ static auto constexpr BufSize = (std::tuple_size_v * 2U) + std::size(VC) + sizeof(crypto_provide_) + sizeof(pad_c_len_) + sizeof(ia_len_) + HandshakeSize; - auto outbuf = libtransmission::StackBuffer{}; + auto outbuf = tr::StackBuffer{}; /* HASH('req1', S) */ outbuf.add(tr_sha1::digest("req1"sv, get_dh().secret())); @@ -527,7 +527,7 @@ ReadState tr_handshake::read_ia(tr_peerIo* peer_io) TR_ASSERT_MSG(info_hash != tr_sha1_digest_t{}, "read_ia requires an info_hash"); static auto constexpr BufSize = std::size(VC) + sizeof(crypto_select_) + sizeof(pad_d_len_) + HandshakeSize; - auto outbuf = libtransmission::StackBuffer{}; + auto outbuf = tr::StackBuffer{}; peer_io->encrypt_init(peer_io->is_incoming(), get_dh(), info_hash); // send VC @@ -704,7 +704,7 @@ void tr_handshake::on_error(tr_peerIo* io, tr_error const& error, void* vhandsha // --- -bool tr_handshake::build_handshake_message(tr_peerIo* io, libtransmission::BufferWriter& buf) const +bool tr_handshake::build_handshake_message(tr_peerIo* io, tr::BufferWriter& buf) const { auto const& info_hash = io->torrent_hash(); TR_ASSERT_MSG(info_hash != tr_sha1_digest_t{}, "build_handshake_message requires an info_hash"); @@ -734,7 +734,7 @@ bool tr_handshake::build_handshake_message(tr_peerIo* io, libtransmission::Buffe bool tr_handshake::send_handshake(tr_peerIo* io) { - auto msg = libtransmission::StackBuffer{}; + auto msg = tr::StackBuffer{}; if (!build_handshake_message(io, msg)) { return false; diff --git a/libtransmission/handshake.h b/libtransmission/handshake.h index f017ac829..0d30c5133 100644 --- a/libtransmission/handshake.h +++ b/libtransmission/handshake.h @@ -33,7 +33,7 @@ struct tr_error; struct tr_socket_address; -namespace libtransmission +namespace tr { template class BufferWriter; @@ -71,7 +71,7 @@ public: [[nodiscard]] virtual std::optional torrent(tr_sha1_digest_t const& info_hash) const = 0; [[nodiscard]] virtual std::optional torrent_from_obfuscated(tr_sha1_digest_t const& info_hash) const = 0; - [[nodiscard]] virtual libtransmission::TimerMaker& timer_maker() = 0; + [[nodiscard]] virtual tr::TimerMaker& timer_maker() = 0; [[nodiscard]] virtual bool allows_dht() const = 0; [[nodiscard]] virtual size_t pad(void* setme, size_t max_bytes) const = 0; [[nodiscard]] virtual DH::private_key_bigend_t private_key() const @@ -234,7 +234,7 @@ private: static void on_error(tr_peerIo* io, tr_error const& error, void* vhandshake); - bool build_handshake_message(tr_peerIo* io, libtransmission::BufferWriter& buf) const; + bool build_handshake_message(tr_peerIo* io, tr::BufferWriter& buf) const; bool send_handshake(tr_peerIo* io); @@ -325,7 +325,7 @@ private: std::shared_ptr peer_io_; - std::unique_ptr timeout_timer_; + std::unique_ptr timeout_timer_; Mediator* mediator_ = nullptr; diff --git a/libtransmission/ip-cache.h b/libtransmission/ip-cache.h index 02351a745..cdfe0cc23 100644 --- a/libtransmission/ip-cache.h +++ b/libtransmission/ip-cache.h @@ -50,7 +50,7 @@ public: return {}; } - [[nodiscard]] virtual libtransmission::TimerMaker& timer_maker() = 0; + [[nodiscard]] virtual tr::TimerMaker& timer_maker() = 0; }; static std::shared_ptr create(Mediator& mediator); @@ -136,7 +136,7 @@ private: // Keep the timer at the bottom of the class definition so that it will be destructed first // We don't want it to trigger after the IP addresses have been destroyed // (The destructor will acquire the IP address locks before proceeding, but still) - array_ip_t> upkeep_timers_; + array_ip_t> upkeep_timers_; // Whether this machine supports this IP protocol array_ip_t has_ip_protocol_ = { true, true }; diff --git a/libtransmission/observable.h b/libtransmission/observable.h index 03a3047c4..b0d85d9fa 100644 --- a/libtransmission/observable.h +++ b/libtransmission/observable.h @@ -17,7 +17,7 @@ #include "libtransmission/tr-assert.h" -namespace libtransmission +namespace tr { // An RAII-based subscription to an Observable. @@ -107,4 +107,4 @@ private: small::map observers_; }; -} // namespace libtransmission +} // namespace tr diff --git a/libtransmission/peer-common.h b/libtransmission/peer-common.h index 2de7a5999..612f4a26e 100644 --- a/libtransmission/peer-common.h +++ b/libtransmission/peer-common.h @@ -203,7 +203,7 @@ using tr_peer_callback_generic = void (*)(tr_peer* peer, tr_peer_event const& ev */ struct tr_peer { - using Speed = libtransmission::Values::Speed; + using Speed = tr::Values::Speed; explicit tr_peer(tr_torrent const& tor); virtual ~tr_peer() = default; diff --git a/libtransmission/peer-io.h b/libtransmission/peer-io.h index c0f39b60b..6beda68ad 100644 --- a/libtransmission/peer-io.h +++ b/libtransmission/peer-io.h @@ -34,10 +34,10 @@ struct tr_error; struct tr_session; struct tr_socket_address; -namespace libtransmission::test +namespace tr::test { class HandshakeTest; -} // namespace libtransmission::test +} // namespace tr::test enum class ReadState : uint8_t { @@ -152,7 +152,7 @@ public: // Write all the data from `buf`. // This is a destructive add: `buf` is empty after this call. template - void write(libtransmission::BufferReader& buf, bool is_piece_data) + void write(tr::BufferReader& buf, bool is_piece_data) { auto const n_bytes = std::size(buf); write_bytes(std::data(buf), n_bytes, is_piece_data); @@ -321,9 +321,9 @@ private: // The buffer size for incoming & outgoing peer messages. // Starts off with enough capacity to read a single BT Piece message, // but has a 5x GrowthFactor so that it can quickly to high volume. - using PeerBuffer = libtransmission::StackBuffer>; + using PeerBuffer = tr::StackBuffer>; - friend class libtransmission::test::HandshakeTest; + friend class tr::test::HandshakeTest; [[nodiscard]] constexpr auto client_is_seed() const noexcept { @@ -388,8 +388,8 @@ private: GotError got_error_ = nullptr; void* user_data_ = nullptr; - libtransmission::evhelpers::event_unique_ptr event_read_; - libtransmission::evhelpers::event_unique_ptr event_write_; + tr::evhelpers::event_unique_ptr event_read_; + tr::evhelpers::event_unique_ptr event_write_; short int pending_events_ = 0; diff --git a/libtransmission/peer-mgr-wishlist.cc b/libtransmission/peer-mgr-wishlist.cc index 47f623abe..8173b3f92 100644 --- a/libtransmission/peer-mgr-wishlist.cc +++ b/libtransmission/peer-mgr-wishlist.cc @@ -523,7 +523,7 @@ private: CandidateVec candidates_; - std::array const tags_; + std::array const tags_; Mediator& mediator_; }; diff --git a/libtransmission/peer-mgr-wishlist.h b/libtransmission/peer-mgr-wishlist.h index ae2f5fbf4..cf944837f 100644 --- a/libtransmission/peer-mgr-wishlist.h +++ b/libtransmission/peer-mgr-wishlist.h @@ -40,37 +40,35 @@ public: [[nodiscard]] virtual tr_piece_index_t piece_count() const = 0; [[nodiscard]] virtual tr_priority_t priority(tr_piece_index_t piece) const = 0; - [[nodiscard]] virtual libtransmission::ObserverTag observe_files_wanted_changed( - libtransmission::SimpleObservable::Observer) = 0; - [[nodiscard]] virtual libtransmission::ObserverTag observe_peer_disconnect( - libtransmission::SimpleObservable::Observer observer) = 0; - [[nodiscard]] virtual libtransmission::ObserverTag observe_got_bad_piece( - libtransmission::SimpleObservable::Observer observer) = 0; - [[nodiscard]] virtual libtransmission::ObserverTag observe_got_bitfield( - libtransmission::SimpleObservable::Observer observer) = 0; - [[nodiscard]] virtual libtransmission::ObserverTag observe_got_block( - libtransmission::SimpleObservable::Observer observer) = 0; - [[nodiscard]] virtual libtransmission::ObserverTag observe_got_choke( - libtransmission::SimpleObservable::Observer observer) = 0; - [[nodiscard]] virtual libtransmission::ObserverTag observe_got_have( - libtransmission::SimpleObservable::Observer observer) = 0; - [[nodiscard]] virtual libtransmission::ObserverTag observe_got_have_all( - libtransmission::SimpleObservable::Observer observer) = 0; - [[nodiscard]] virtual libtransmission::ObserverTag observe_got_reject( - libtransmission::SimpleObservable::Observer observer) = 0; - [[nodiscard]] virtual libtransmission::ObserverTag observe_piece_completed( - libtransmission::SimpleObservable::Observer observer) = 0; - [[nodiscard]] virtual libtransmission::ObserverTag observe_priority_changed( - libtransmission::SimpleObservable::Observer - observer) = 0; - [[nodiscard]] virtual libtransmission::ObserverTag observe_sent_cancel( - libtransmission::SimpleObservable::Observer observer) = 0; - [[nodiscard]] virtual libtransmission::ObserverTag observe_sent_request( - libtransmission::SimpleObservable::Observer observer) = 0; - [[nodiscard]] virtual libtransmission::ObserverTag observe_sequential_download_changed( - libtransmission::SimpleObservable::Observer observer) = 0; - [[nodiscard]] virtual libtransmission::ObserverTag observe_sequential_download_from_piece_changed( - libtransmission::SimpleObservable::Observer observer) = 0; + [[nodiscard]] virtual tr::ObserverTag observe_files_wanted_changed( + tr::SimpleObservable::Observer) = 0; + [[nodiscard]] virtual tr::ObserverTag observe_peer_disconnect( + tr::SimpleObservable::Observer observer) = 0; + [[nodiscard]] virtual tr::ObserverTag observe_got_bad_piece( + tr::SimpleObservable::Observer observer) = 0; + [[nodiscard]] virtual tr::ObserverTag observe_got_bitfield( + tr::SimpleObservable::Observer observer) = 0; + [[nodiscard]] virtual tr::ObserverTag observe_got_block( + tr::SimpleObservable::Observer observer) = 0; + [[nodiscard]] virtual tr::ObserverTag observe_got_choke( + tr::SimpleObservable::Observer observer) = 0; + [[nodiscard]] virtual tr::ObserverTag observe_got_have( + tr::SimpleObservable::Observer observer) = 0; + [[nodiscard]] virtual tr::ObserverTag observe_got_have_all(tr::SimpleObservable::Observer observer) = 0; + [[nodiscard]] virtual tr::ObserverTag observe_got_reject( + tr::SimpleObservable::Observer observer) = 0; + [[nodiscard]] virtual tr::ObserverTag observe_piece_completed( + tr::SimpleObservable::Observer observer) = 0; + [[nodiscard]] virtual tr::ObserverTag observe_priority_changed( + tr::SimpleObservable::Observer observer) = 0; + [[nodiscard]] virtual tr::ObserverTag observe_sent_cancel( + tr::SimpleObservable::Observer observer) = 0; + [[nodiscard]] virtual tr::ObserverTag observe_sent_request( + tr::SimpleObservable::Observer observer) = 0; + [[nodiscard]] virtual tr::ObserverTag observe_sequential_download_changed( + tr::SimpleObservable::Observer observer) = 0; + [[nodiscard]] virtual tr::ObserverTag observe_sequential_download_from_piece_changed( + tr::SimpleObservable::Observer observer) = 0; virtual ~Mediator() = default; }; diff --git a/libtransmission/peer-mgr.cc b/libtransmission/peer-mgr.cc index 2b17315e5..f0f4fc3f4 100644 --- a/libtransmission/peer-mgr.cc +++ b/libtransmission/peer-mgr.cc @@ -56,7 +56,7 @@ #include "libtransmission/webseed.h" using namespace std::literals; -using namespace libtransmission::Values; +using namespace tr::Values; static auto constexpr CancelHistorySec = 60; @@ -85,10 +85,7 @@ private: } public: - explicit HandshakeMediator( - tr_session const& session, - libtransmission::TimerMaker& timer_maker, - tr_torrents& torrents) noexcept + explicit HandshakeMediator(tr_session const& session, tr::TimerMaker& timer_maker, tr_torrents& torrents) noexcept : session_{ session } , timer_maker_{ timer_maker } , torrents_{ torrents } @@ -113,7 +110,7 @@ public: void set_utp_failed(tr_sha1_digest_t const& info_hash, tr_socket_address const& socket_address) override; - [[nodiscard]] libtransmission::TimerMaker& timer_maker() override + [[nodiscard]] tr::TimerMaker& timer_maker() override { return timer_maker_; } @@ -127,7 +124,7 @@ public: private: tr_session const& session_; - libtransmission::TimerMaker& timer_maker_; + tr::TimerMaker& timer_maker_; tr_torrents& torrents_; }; @@ -388,38 +385,36 @@ public: [[nodiscard]] tr_piece_index_t piece_count() const override; [[nodiscard]] tr_priority_t priority(tr_piece_index_t piece) const override; - [[nodiscard]] libtransmission::ObserverTag observe_files_wanted_changed( - libtransmission::SimpleObservable::Observer observer) + [[nodiscard]] tr::ObserverTag observe_files_wanted_changed( + tr::SimpleObservable::Observer observer) override; + [[nodiscard]] tr::ObserverTag observe_peer_disconnect( + tr::SimpleObservable::Observer observer) override; + [[nodiscard]] tr::ObserverTag observe_got_bad_piece( + tr::SimpleObservable::Observer observer) override; + [[nodiscard]] tr::ObserverTag observe_got_bitfield( + tr::SimpleObservable::Observer observer) override; + [[nodiscard]] tr::ObserverTag observe_got_block( + tr::SimpleObservable::Observer observer) override; + [[nodiscard]] tr::ObserverTag observe_got_choke( + tr::SimpleObservable::Observer observer) override; + [[nodiscard]] tr::ObserverTag observe_got_have( + tr::SimpleObservable::Observer observer) override; + [[nodiscard]] tr::ObserverTag observe_got_have_all(tr::SimpleObservable::Observer observer) override; + [[nodiscard]] tr::ObserverTag observe_got_reject( + tr::SimpleObservable::Observer observer) override; + [[nodiscard]] tr::ObserverTag observe_piece_completed( + tr::SimpleObservable::Observer observer) override; + [[nodiscard]] tr::ObserverTag observe_priority_changed( + tr::SimpleObservable::Observer observer) override; - [[nodiscard]] libtransmission::ObserverTag observe_peer_disconnect( - libtransmission::SimpleObservable::Observer observer) override; - [[nodiscard]] libtransmission::ObserverTag observe_got_bad_piece( - libtransmission::SimpleObservable::Observer observer) override; - [[nodiscard]] libtransmission::ObserverTag observe_got_bitfield( - libtransmission::SimpleObservable::Observer observer) override; - [[nodiscard]] libtransmission::ObserverTag observe_got_block( - libtransmission::SimpleObservable::Observer observer) override; - [[nodiscard]] libtransmission::ObserverTag observe_got_choke( - libtransmission::SimpleObservable::Observer observer) override; - [[nodiscard]] libtransmission::ObserverTag observe_got_have( - libtransmission::SimpleObservable::Observer observer) override; - [[nodiscard]] libtransmission::ObserverTag observe_got_have_all( - libtransmission::SimpleObservable::Observer observer) override; - [[nodiscard]] libtransmission::ObserverTag observe_got_reject( - libtransmission::SimpleObservable::Observer observer) override; - [[nodiscard]] libtransmission::ObserverTag observe_piece_completed( - libtransmission::SimpleObservable::Observer observer) override; - [[nodiscard]] libtransmission::ObserverTag observe_priority_changed( - libtransmission::SimpleObservable::Observer - observer) override; - [[nodiscard]] libtransmission::ObserverTag observe_sent_cancel( - libtransmission::SimpleObservable::Observer observer) override; - [[nodiscard]] libtransmission::ObserverTag observe_sent_request( - libtransmission::SimpleObservable::Observer observer) override; - [[nodiscard]] libtransmission::ObserverTag observe_sequential_download_changed( - libtransmission::SimpleObservable::Observer observer) override; - [[nodiscard]] libtransmission::ObserverTag observe_sequential_download_from_piece_changed( - libtransmission::SimpleObservable::Observer observer) override; + [[nodiscard]] tr::ObserverTag observe_sent_cancel( + tr::SimpleObservable::Observer observer) override; + [[nodiscard]] tr::ObserverTag observe_sent_request( + tr::SimpleObservable::Observer observer) override; + [[nodiscard]] tr::ObserverTag observe_sequential_download_changed( + tr::SimpleObservable::Observer observer) override; + [[nodiscard]] tr::ObserverTag observe_sequential_download_from_piece_changed( + tr::SimpleObservable::Observer observer) override; private: tr_torrent& tor_; @@ -664,16 +659,15 @@ public: } } - libtransmission::SimpleObservable - peer_disconnect; - libtransmission::SimpleObservable got_bitfield; - libtransmission::SimpleObservable got_block; - libtransmission::SimpleObservable got_choke; - libtransmission::SimpleObservable got_have; - libtransmission::SimpleObservable got_have_all; - libtransmission::SimpleObservable got_reject; - libtransmission::SimpleObservable sent_cancel; - libtransmission::SimpleObservable sent_request; + tr::SimpleObservable peer_disconnect; + tr::SimpleObservable got_bitfield; + tr::SimpleObservable got_block; + tr::SimpleObservable got_choke; + tr::SimpleObservable got_have; + tr::SimpleObservable got_have_all; + tr::SimpleObservable got_reject; + tr::SimpleObservable sent_cancel; + tr::SimpleObservable sent_request; mutable tr_swarm_stats stats = {}; @@ -995,7 +989,7 @@ EXIT: // number of bad pieces a peer is allowed to send before we ban them static auto constexpr MaxBadPiecesPerPeer = 5U; - std::array const tags_; + std::array const tags_; mutable std::optional pool_is_all_upload_only_; }; @@ -1050,92 +1044,91 @@ tr_priority_t tr_swarm::WishlistMediator::priority(tr_piece_index_t piece) const return tor_.piece_priority(piece); } -libtransmission::ObserverTag tr_swarm::WishlistMediator::observe_files_wanted_changed( - libtransmission::SimpleObservable::Observer observer) +tr::ObserverTag tr_swarm::WishlistMediator::observe_files_wanted_changed( + tr::SimpleObservable::Observer observer) { return tor_.files_wanted_changed_.observe(std::move(observer)); } -libtransmission::ObserverTag tr_swarm::WishlistMediator::observe_peer_disconnect( - libtransmission::SimpleObservable::Observer observer) +tr::ObserverTag tr_swarm::WishlistMediator::observe_peer_disconnect( + tr::SimpleObservable::Observer observer) { return swarm_.peer_disconnect.observe(std::move(observer)); } -libtransmission::ObserverTag tr_swarm::WishlistMediator::observe_got_bad_piece( - libtransmission::SimpleObservable::Observer observer) +tr::ObserverTag tr_swarm::WishlistMediator::observe_got_bad_piece( + tr::SimpleObservable::Observer observer) { return tor_.got_bad_piece_.observe(std::move(observer)); } -libtransmission::ObserverTag tr_swarm::WishlistMediator::observe_got_bitfield( - libtransmission::SimpleObservable::Observer observer) +tr::ObserverTag tr_swarm::WishlistMediator::observe_got_bitfield( + tr::SimpleObservable::Observer observer) { return swarm_.got_bitfield.observe(std::move(observer)); } -libtransmission::ObserverTag tr_swarm::WishlistMediator::observe_got_block( - libtransmission::SimpleObservable::Observer observer) +tr::ObserverTag tr_swarm::WishlistMediator::observe_got_block( + tr::SimpleObservable::Observer observer) { return swarm_.got_block.observe(std::move(observer)); } -libtransmission::ObserverTag tr_swarm::WishlistMediator::observe_got_choke( - libtransmission::SimpleObservable::Observer observer) +tr::ObserverTag tr_swarm::WishlistMediator::observe_got_choke( + tr::SimpleObservable::Observer observer) { return swarm_.got_choke.observe(std::move(observer)); } -libtransmission::ObserverTag tr_swarm::WishlistMediator::observe_got_have( - libtransmission::SimpleObservable::Observer observer) +tr::ObserverTag tr_swarm::WishlistMediator::observe_got_have( + tr::SimpleObservable::Observer observer) { return swarm_.got_have.observe(std::move(observer)); } -libtransmission::ObserverTag tr_swarm::WishlistMediator::observe_got_have_all( - libtransmission::SimpleObservable::Observer observer) +tr::ObserverTag tr_swarm::WishlistMediator::observe_got_have_all(tr::SimpleObservable::Observer observer) { return swarm_.got_have_all.observe(std::move(observer)); } -libtransmission::ObserverTag tr_swarm::WishlistMediator::observe_got_reject( - libtransmission::SimpleObservable::Observer observer) +tr::ObserverTag tr_swarm::WishlistMediator::observe_got_reject( + tr::SimpleObservable::Observer observer) { return swarm_.got_reject.observe(std::move(observer)); } -libtransmission::ObserverTag tr_swarm::WishlistMediator::observe_piece_completed( - libtransmission::SimpleObservable::Observer observer) +tr::ObserverTag tr_swarm::WishlistMediator::observe_piece_completed( + tr::SimpleObservable::Observer observer) { return tor_.piece_completed_.observe(std::move(observer)); } -libtransmission::ObserverTag tr_swarm::WishlistMediator::observe_priority_changed( - libtransmission::SimpleObservable::Observer observer) +tr::ObserverTag tr_swarm::WishlistMediator::observe_priority_changed( + tr::SimpleObservable::Observer observer) { return tor_.priority_changed_.observe(std::move(observer)); } -libtransmission::ObserverTag tr_swarm::WishlistMediator::observe_sent_cancel( - libtransmission::SimpleObservable::Observer observer) +tr::ObserverTag tr_swarm::WishlistMediator::observe_sent_cancel( + tr::SimpleObservable::Observer observer) { return swarm_.sent_cancel.observe(std::move(observer)); } -libtransmission::ObserverTag tr_swarm::WishlistMediator::observe_sent_request( - libtransmission::SimpleObservable::Observer observer) +tr::ObserverTag tr_swarm::WishlistMediator::observe_sent_request( + tr::SimpleObservable::Observer observer) { return swarm_.sent_request.observe(std::move(observer)); } -libtransmission::ObserverTag tr_swarm::WishlistMediator::observe_sequential_download_changed( - libtransmission::SimpleObservable::Observer observer) +tr::ObserverTag tr_swarm::WishlistMediator::observe_sequential_download_changed( + tr::SimpleObservable::Observer observer) { return tor_.sequential_download_changed_.observe(std::move(observer)); } -libtransmission::ObserverTag tr_swarm::WishlistMediator::observe_sequential_download_from_piece_changed( - libtransmission::SimpleObservable::Observer observer) +tr::ObserverTag tr_swarm::WishlistMediator::observe_sequential_download_from_piece_changed( + tr::SimpleObservable::Observer observer) { return tor_.sequential_download_from_piece_changed_.observe(std::move(observer)); } @@ -1170,11 +1163,7 @@ public: using OutboundCandidates = small:: max_size_vector, OutboundCandidateListCapacity>; - explicit tr_peerMgr( - tr_session* session_in, - libtransmission::TimerMaker& timer_maker, - tr_torrents& torrents, - libtransmission::Blocklists& blocklist) + explicit tr_peerMgr(tr_session* session_in, tr::TimerMaker& timer_maker, tr_torrents& torrents, tr::Blocklists& blocklist) : session{ session_in } , torrents_{ torrents } , blocklists_{ blocklist } @@ -1218,7 +1207,7 @@ public: tr_session* const session; tr_torrents& torrents_; - libtransmission::Blocklists const& blocklists_; + tr::Blocklists const& blocklists_; Handshakes incoming_handshakes; HandshakeMediator handshake_mediator_; @@ -1261,11 +1250,11 @@ private: OutboundCandidates outbound_candidates_; - std::unique_ptr const bandwidth_timer_; - std::unique_ptr const peer_info_timer_; - std::unique_ptr const rechoke_timer_; + std::unique_ptr const bandwidth_timer_; + std::unique_ptr const peer_info_timer_; + std::unique_ptr const rechoke_timer_; - libtransmission::ObserverTag const blocklists_tag_; + tr::ObserverTag const blocklists_tag_; }; // --- tr_peer virtual functions diff --git a/libtransmission/peer-mgr.h b/libtransmission/peer-mgr.h index 7803b46d7..cc5126d60 100644 --- a/libtransmission/peer-mgr.h +++ b/libtransmission/peer-mgr.h @@ -301,7 +301,7 @@ public: // --- - [[nodiscard]] bool is_blocklisted(libtransmission::Blocklists const& blocklist) const + [[nodiscard]] bool is_blocklisted(tr::Blocklists const& blocklist) const { if (!blocklisted_.has_value()) { diff --git a/libtransmission/peer-msgs.cc b/libtransmission/peer-msgs.cc index 27cc999f7..c6d86c974 100644 --- a/libtransmission/peer-msgs.cc +++ b/libtransmission/peer-msgs.cc @@ -64,9 +64,9 @@ using namespace std::literals; namespace { // initial capacity is big enough to hold a BtPeerMsgs::Piece message -using MessageBuffer = libtransmission::StackBuffer>; -using MessageReader = libtransmission::BufferReader; -using MessageWriter = libtransmission::BufferWriter; +using MessageBuffer = tr::StackBuffer>; +using MessageReader = tr::BufferReader; +using MessageWriter = tr::BufferWriter; // these values are hardcoded by various BEPs as noted namespace BtPeerMsgs @@ -741,7 +741,7 @@ private: // supplied a reqq argument, it's stored here. std::optional peer_reqq_; - std::unique_ptr pex_timer_; + std::unique_ptr pex_timer_; tr_bitfield have_; diff --git a/libtransmission/peer-socket.h b/libtransmission/peer-socket.h index b0bd9cae6..f552f83c9 100644 --- a/libtransmission/peer-socket.h +++ b/libtransmission/peer-socket.h @@ -23,8 +23,8 @@ struct tr_session; class tr_peer_socket { public: - using InBuf = libtransmission::BufferWriter; - using OutBuf = libtransmission::BufferReader; + using InBuf = tr::BufferWriter; + using OutBuf = tr::BufferReader; tr_peer_socket() = default; tr_peer_socket(tr_session const* session, tr_socket_address const& socket_address, tr_socket_t sock); diff --git a/libtransmission/port-forwarding.cc b/libtransmission/port-forwarding.cc index 74fca4768..655ebb030 100644 --- a/libtransmission/port-forwarding.cc +++ b/libtransmission/port-forwarding.cc @@ -234,7 +234,7 @@ private: tr_upnp* upnp_ = nullptr; std::unique_ptr natpmp_; - std::unique_ptr timer_; + std::unique_ptr timer_; }; std::unique_ptr tr_port_forwarding::create(Mediator& mediator) diff --git a/libtransmission/port-forwarding.h b/libtransmission/port-forwarding.h index 32e797224..f65d84bc5 100644 --- a/libtransmission/port-forwarding.h +++ b/libtransmission/port-forwarding.h @@ -15,7 +15,7 @@ #include "libtransmission/net.h" -namespace libtransmission +namespace tr { class TimerMaker; } @@ -31,7 +31,7 @@ public: [[nodiscard]] virtual tr_port advertised_peer_port() const = 0; [[nodiscard]] virtual tr_port local_peer_port() const = 0; [[nodiscard]] virtual tr_address incoming_peer_address() const = 0; - [[nodiscard]] virtual libtransmission::TimerMaker& timer_maker() = 0; + [[nodiscard]] virtual tr::TimerMaker& timer_maker() = 0; virtual void on_port_forwarded(tr_port advertised_port) = 0; }; diff --git a/libtransmission/resume.cc b/libtransmission/resume.cc index 786b83842..b324fb546 100644 --- a/libtransmission/resume.cc +++ b/libtransmission/resume.cc @@ -34,7 +34,7 @@ #include "libtransmission/variant.h" using namespace std::literals; -using namespace libtransmission::Values; +using namespace tr::Values; namespace tr_resume { @@ -635,7 +635,7 @@ tr_resume::fields_t load_from_file(tr_torrent* tor, tr_torrent::ResumeHelper& he return {}; } - libtransmission::api_compat::convert_incoming_data(*otop); + tr::api_compat::convert_incoming_data(*otop); auto const* const p_map = otop->get_if(); if (p_map == nullptr) { @@ -984,7 +984,7 @@ void save(tr_torrent* const tor, tr_torrent::ResumeHelper const& helper) save_group(map, tor); auto out = tr_variant{ std::move(map) }; - libtransmission::api_compat::convert_outgoing_data(out); + tr::api_compat::convert_outgoing_data(out); auto serde = tr_variant_serde::benc(); if (!serde.to_file(out, tor->resume_file())) { diff --git a/libtransmission/rpc-server.h b/libtransmission/rpc-server.h index 121c75a10..b86d67af0 100644 --- a/libtransmission/rpc-server.h +++ b/libtransmission/rpc-server.h @@ -28,7 +28,7 @@ struct tr_session; struct tr_variant; struct libdeflate_compressor; -namespace libtransmission +namespace tr { class Timer; } @@ -48,12 +48,12 @@ public: void load(tr_variant const& src) { - libtransmission::serializer::load(*this, Fields, src); + tr::serializer::load(*this, Fields, src); } [[nodiscard]] tr_variant::Map save() const { - return libtransmission::serializer::save(*this, Fields); + return tr::serializer::save(*this, Fields); } // NB: When adding a field here, you must also add it to @@ -75,7 +75,7 @@ public: private: template - using Field = libtransmission::serializer::Field; + using Field = tr::serializer::Field; static constexpr auto Fields = std::tuple{ Field<&Settings::is_anti_brute_force_enabled>{ TR_KEY_anti_brute_force_enabled }, @@ -203,8 +203,8 @@ public: std::unique_ptr bind_address_; - std::unique_ptr start_retry_timer; - libtransmission::evhelpers::evhttp_unique_ptr httpd; + std::unique_ptr start_retry_timer; + tr::evhelpers::evhttp_unique_ptr httpd; tr_session* const session; size_t login_attempts_ = 0U; diff --git a/libtransmission/rpcimpl.cc b/libtransmission/rpcimpl.cc index 83e2e9d08..362997896 100644 --- a/libtransmission/rpcimpl.cc +++ b/libtransmission/rpcimpl.cc @@ -50,7 +50,7 @@ #include "libtransmission/web.h" using namespace std::literals; -using namespace libtransmission::Values; +using namespace tr::Values; namespace JsonRpc { @@ -220,7 +220,7 @@ void tr_rpc_idle_done(struct tr_rpc_idle_data* data, JsonRpc::Error::Code code, data->is_jsonrpc) }; if (!data->is_jsonrpc) { - libtransmission::api_compat::convert(response, libtransmission::api_compat::Style::Tr4); + tr::api_compat::convert(response, tr::api_compat::Style::Tr4); } data->callback(std::move(response)); } @@ -2004,7 +2004,7 @@ void add_strings_from_var(std::set& strings, tr_variant const& [[nodiscard]] auto values_get_units() { - using namespace libtransmission::Values; + using namespace tr::Values; auto const make_units_vec = [](auto const& units) { @@ -2830,7 +2830,7 @@ void tr_rpc_request_exec_impl(tr_session* session, tr_variant& request, tr_rpc_r } else { - libtransmission::api_compat::convert_incoming_data(request); + tr::api_compat::convert_incoming_data(request); map = request.get_if(); TR_ASSERT(map != nullptr); if (map == nullptr) diff --git a/libtransmission/serializer.cc b/libtransmission/serializer.cc index 61f021a57..0c4fbec6a 100644 --- a/libtransmission/serializer.cc +++ b/libtransmission/serializer.cc @@ -34,7 +34,7 @@ using namespace std::literals; -namespace libtransmission::serializer +namespace tr::serializer { namespace { @@ -490,4 +490,4 @@ void Converters::ensure_default_converters() }); } -} // namespace libtransmission::serializer +} // namespace tr::serializer diff --git a/libtransmission/serializer.h b/libtransmission/serializer.h index ab4832a7b..c91a91d48 100644 --- a/libtransmission/serializer.h +++ b/libtransmission/serializer.h @@ -19,7 +19,7 @@ #include "libtransmission/quark.h" #include "libtransmission/variant.h" -namespace libtransmission::serializer +namespace tr::serializer { // These type traits are used for serialize() and deserialize() to sniff @@ -454,4 +454,4 @@ bool to_optional(tr_variant const& src, std::optional* ptgt) } } // namespace detail -} // namespace libtransmission::serializer +} // namespace tr::serializer diff --git a/libtransmission/session-alt-speeds.h b/libtransmission/session-alt-speeds.h index 60db827e6..2cf24bc57 100644 --- a/libtransmission/session-alt-speeds.h +++ b/libtransmission/session-alt-speeds.h @@ -26,7 +26,7 @@ struct tr_variant; /** Manages alternate speed limits and a scheduler to auto-toggle them. */ class tr_session_alt_speeds { - using Speed = libtransmission::Values::Speed; + using Speed = tr::Values::Speed; public: class Settings final @@ -41,12 +41,12 @@ public: void load(tr_variant const& src) { - libtransmission::serializer::load(*this, Fields, src); + tr::serializer::load(*this, Fields, src); } [[nodiscard]] tr_variant::Map save() const { - return libtransmission::serializer::save(*this, Fields); + return tr::serializer::save(*this, Fields); } // NB: When adding a field here, you must also add it to @@ -61,7 +61,7 @@ public: private: template - using Field = libtransmission::serializer::Field; + using Field = tr::serializer::Field; static constexpr auto Fields = std::tuple{ Field<&Settings::is_active>{ TR_KEY_alt_speed_enabled }, diff --git a/libtransmission/session-thread.cc b/libtransmission/session-thread.cc index e1e929013..42c198b07 100644 --- a/libtransmission/session-thread.cc +++ b/libtransmission/session-thread.cc @@ -137,7 +137,7 @@ auto make_event_base() { tr_session_thread::tr_evthread_init(); - return libtransmission::evhelpers::evbase_unique_ptr{ event_base_new() }; + return tr::evhelpers::evbase_unique_ptr{ event_base_new() }; } } // namespace @@ -280,10 +280,8 @@ private: } } - libtransmission::evhelpers::evbase_unique_ptr const evbase_{ make_event_base() }; - libtransmission::evhelpers::event_unique_ptr const work_queue_event_{ - event_new(evbase_.get(), -1, 0, on_work_available_static, this) - }; + tr::evhelpers::evbase_unique_ptr const evbase_{ make_event_base() }; + tr::evhelpers::event_unique_ptr const work_queue_event_{ event_new(evbase_.get(), -1, 0, on_work_available_static, this) }; work_queue_t work_queue_; std::mutex work_queue_mutex_; diff --git a/libtransmission/session.cc b/libtransmission/session.cc index ec44de4f8..26d11b088 100644 --- a/libtransmission/session.cc +++ b/libtransmission/session.cc @@ -64,7 +64,7 @@ struct tr_ctor; using namespace std::literals; -using namespace libtransmission::Values; +using namespace tr::Values; namespace { @@ -85,7 +85,7 @@ void bandwidthGroupRead(tr_session* session, std::string_view config_dir) { return; } - libtransmission::api_compat::convert_incoming_data(*groups_var); + tr::api_compat::convert_incoming_data(*groups_var); auto const* const groups_map = groups_var->get_if(); if (groups_map == nullptr) @@ -152,7 +152,7 @@ void bandwidthGroupWrite(tr_session const* session, std::string_view const confi } auto out = tr_variant{ std::move(groups_map) }; - libtransmission::api_compat::convert_outgoing_data(out); + tr::api_compat::convert_outgoing_data(out); tr_variant_serde::json().to_file(out, tr_pathbuf{ config_dir, '/', BandwidthGroupsFilename }); } } // namespace bandwidth_group_helpers @@ -497,7 +497,7 @@ tr_variant tr_sessionLoadSettings(std::string_view const config_dir, tr_variant { if (auto file_settings = tr_variant_serde::json().parse_file(filename)) { - libtransmission::api_compat::convert_incoming_data(*file_settings); + tr::api_compat::convert_incoming_data(*file_settings); settings.merge(*file_settings); } } @@ -521,14 +521,14 @@ void tr_sessionSaveSettings(tr_session* session, std::string_view const config_d auto settings = tr_sessionGetDefaultSettings(); if (auto file_settings = tr_variant_serde::json().parse_file(filename); file_settings) { - libtransmission::api_compat::convert_incoming_data(*file_settings); + tr::api_compat::convert_incoming_data(*file_settings); settings.merge(*file_settings); } settings.merge(client_settings); settings.merge(tr_sessionGetSettings(session)); // save 'em - libtransmission::api_compat::convert_outgoing_data(settings); + tr::api_compat::convert_outgoing_data(settings); tr_variant_serde::json().to_file(settings, filename); // write bandwidth groups limits to file @@ -2174,7 +2174,7 @@ tr_session::tr_session(std::string_view config_dir, tr_variant const& settings_d , torrent_dir_{ makeTorrentDir(config_dir) } , blocklist_dir_{ makeBlocklistDir(config_dir) } , session_thread_{ tr_session_thread::create() } - , timer_maker_{ std::make_unique(event_base()) } + , timer_maker_{ std::make_unique(event_base()) } , settings_{ settings_dict } , session_id_{ tr_time } , peer_mgr_{ tr_peerMgrNew(this), &tr_peerMgrFree } diff --git a/libtransmission/session.h b/libtransmission/session.h index 6fdb46d06..3c8ed61fd 100644 --- a/libtransmission/session.h +++ b/libtransmission/session.h @@ -77,18 +77,18 @@ struct tr_torrent; struct struct_utp_context; struct tr_variant; -namespace libtransmission::test +namespace tr::test { class SessionTest; -} // namespace libtransmission::test +} // namespace tr::test /** @brief handle to an active libtransmission session */ struct tr_session { - using Memory = libtransmission::Values::Memory; - using Speed = libtransmission::Values::Speed; + using Memory = tr::Values::Memory; + using Speed = tr::Values::Speed; private: class BoundSocket @@ -112,7 +112,7 @@ private: IncomingCallback cb_; void* cb_data_; tr_socket_t socket_ = TR_BAD_SOCKET; - libtransmission::evhelpers::event_unique_ptr ev_; + tr::evhelpers::event_unique_ptr ev_; }; class AltSpeedMediator final : public tr_session_alt_speeds::Mediator @@ -181,7 +181,7 @@ private: return session_.config_dir_; } - [[nodiscard]] libtransmission::TimerMaker& timer_maker() override + [[nodiscard]] tr::TimerMaker& timer_maker() override { return session_.timerMaker(); } @@ -215,7 +215,7 @@ private: return session_.localPeerPort(); } - [[nodiscard]] libtransmission::TimerMaker& timer_maker() override + [[nodiscard]] tr::TimerMaker& timer_maker() override { return session_.timerMaker(); } @@ -297,7 +297,7 @@ private: return session_.allowsLPD(); } - [[nodiscard]] libtransmission::TimerMaker& timerMaker() override + [[nodiscard]] tr::TimerMaker& timerMaker() override { return session_.timerMaker(); } @@ -339,7 +339,7 @@ private: } } - [[nodiscard]] libtransmission::TimerMaker& timer_maker() override + [[nodiscard]] tr::TimerMaker& timer_maker() override { return session_.timerMaker(); } @@ -377,8 +377,8 @@ private: tr_session& session_; tr_socket_t udp4_socket_ = TR_BAD_SOCKET; tr_socket_t udp6_socket_ = TR_BAD_SOCKET; - libtransmission::evhelpers::event_unique_ptr udp4_event_; - libtransmission::evhelpers::event_unique_ptr udp6_event_; + tr::evhelpers::event_unique_ptr udp4_event_; + tr::evhelpers::event_unique_ptr udp6_event_; }; public: @@ -397,7 +397,7 @@ public: void load(tr_variant const& src) { - libtransmission::serializer::load(*this, Fields, src); + tr::serializer::load(*this, Fields, src); if (auto const* map = src.get_if()) { @@ -414,7 +414,7 @@ public: [[nodiscard]] tr_variant::Map save() const { - return libtransmission::serializer::save(*this, Fields); + return tr::serializer::save(*this, Fields); } // NB: When adding a field here, you must also add it to @@ -486,7 +486,7 @@ public: private: template - using Field = libtransmission::serializer::Field; + using Field = tr::serializer::Field; static constexpr auto Fields = std::tuple{ Field<&Settings::announce_ip>{ TR_KEY_announce_ip }, @@ -560,7 +560,7 @@ public: return session_id_.sv(); } - [[nodiscard]] libtransmission::TimerMaker& timerMaker() noexcept + [[nodiscard]] tr::TimerMaker& timerMaker() noexcept { return *timer_maker_; } @@ -967,14 +967,14 @@ public: [[nodiscard]] auto serialize_encryption_mode() const noexcept { - auto var = libtransmission::serializer::to_variant(settings().encryption_mode); + auto var = tr::serializer::to_variant(settings().encryption_mode); TR_ASSERT(var.has_value()); return var; } bool deserialize_encryption_mode(tr_variant const& var) noexcept { - return libtransmission::serializer::Converters::deserialize(var, &settings_.encryption_mode); + return tr::serializer::Converters::deserialize(var, &settings_.encryption_mode); } [[nodiscard]] constexpr auto preallocationMode() const noexcept @@ -1036,14 +1036,14 @@ public: [[nodiscard]] auto save_preferred_transports() const { - auto var = libtransmission::serializer::Converters::serialize(settings_.preferred_transports); + auto var = tr::serializer::Converters::serialize(settings_.preferred_transports); TR_ASSERT(var.has_value()); return var; } bool load_preferred_transports(tr_variant const& var) noexcept { - if (!libtransmission::serializer::Converters::deserialize(var, &settings_.preferred_transports)) + if (!tr::serializer::Converters::deserialize(var, &settings_.preferred_transports)) { return false; } @@ -1245,7 +1245,7 @@ private: static void onIncomingPeerConnection(tr_socket_t fd, void* vsession); - friend class libtransmission::test::SessionTest; + friend class tr::test::SessionTest; friend bool tr_blocklistExists(tr_session const* session); friend bool tr_sessionIsPortForwardingEnabled(tr_session const* session); @@ -1352,7 +1352,7 @@ private: std::unique_ptr const session_thread_; // depends-on: session_thread_ - std::unique_ptr const timer_maker_; + std::unique_ptr const timer_maker_; /// trivial type fields @@ -1406,7 +1406,7 @@ private: tr_open_files open_files_; - libtransmission::Blocklists blocklists_; + tr::Blocklists blocklists_; QueueMediator torrent_queue_mediator_{ *this }; tr_torrent_queue torrent_queue_{ torrent_queue_mediator_ }; @@ -1490,16 +1490,16 @@ private: std::unique_ptr rpc_server_; // depends-on: alt_speeds_, udp_core_, torrents_ - std::unique_ptr now_timer_; + std::unique_ptr now_timer_; // depends-on: torrents_ - std::unique_ptr queue_timer_; + std::unique_ptr queue_timer_; // depends-on: torrents_ - std::unique_ptr save_timer_; + std::unique_ptr save_timer_; std::unique_ptr verifier_ = std::make_unique(); public: - std::unique_ptr utp_timer; + std::unique_ptr utp_timer; }; diff --git a/libtransmission/stats.cc b/libtransmission/stats.cc index f6300069d..de11c1a24 100644 --- a/libtransmission/stats.cc +++ b/libtransmission/stats.cc @@ -19,7 +19,7 @@ #include "libtransmission/variant.h" using namespace std::literals; -using namespace libtransmission; +using namespace tr; namespace { diff --git a/libtransmission/timer-ev.cc b/libtransmission/timer-ev.cc index c8c03fb87..c35a37e35 100644 --- a/libtransmission/timer-ev.cc +++ b/libtransmission/timer-ev.cc @@ -23,7 +23,7 @@ using namespace std::literals; -namespace libtransmission +namespace tr { class EvTimer final : public Timer @@ -170,4 +170,4 @@ std::unique_ptr EvTimerMaker::create() return std::make_unique(event_base_); } -} // namespace libtransmission +} // namespace tr diff --git a/libtransmission/timer-ev.h b/libtransmission/timer-ev.h index 0031caa66..a5e576705 100644 --- a/libtransmission/timer-ev.h +++ b/libtransmission/timer-ev.h @@ -14,7 +14,7 @@ extern "C" struct event_base; } -namespace libtransmission +namespace tr { class EvTimerMaker final : public TimerMaker @@ -31,4 +31,4 @@ private: event_base* const event_base_; }; -} // namespace libtransmission +} // namespace tr diff --git a/libtransmission/timer.h b/libtransmission/timer.h index a0346b0b4..a0412b88d 100644 --- a/libtransmission/timer.h +++ b/libtransmission/timer.h @@ -10,7 +10,7 @@ #include #include -namespace libtransmission +namespace tr { class Timer @@ -79,4 +79,4 @@ public: } }; -} // namespace libtransmission +} // namespace tr diff --git a/libtransmission/torrent-metainfo.cc b/libtransmission/torrent-metainfo.cc index 1366e6ce1..1a9aedcdf 100644 --- a/libtransmission/torrent-metainfo.cc +++ b/libtransmission/torrent-metainfo.cc @@ -57,9 +57,9 @@ namespace auto constexpr MaxBencDepth = 32; } // namespace -struct MetainfoHandler final : public transmission::benc::BasicHandler +struct MetainfoHandler final : public tr::benc::BasicHandler { - using BasicHandler = transmission::benc::BasicHandler; + using BasicHandler = tr::benc::BasicHandler; tr_torrent_metainfo& tm_; uint32_t piece_size_ = {}; @@ -614,7 +614,7 @@ private: bool tr_torrent_metainfo::parse_benc(std::string_view benc, tr_error* error) { - auto stack = transmission::benc::ParserStack{}; + auto stack = tr::benc::ParserStack{}; auto handler = MetainfoHandler{ *this }; auto local_error = tr_error{}; @@ -623,7 +623,7 @@ bool tr_torrent_metainfo::parse_benc(std::string_view benc, tr_error* error) error = &local_error; } - auto const ok = transmission::benc::parse(benc, stack, handler, nullptr, error); + auto const ok = tr::benc::parse(benc, stack, handler, nullptr, error); if (*error) { diff --git a/libtransmission/torrent.cc b/libtransmission/torrent.cc index ef337df23..c04a92a71 100644 --- a/libtransmission/torrent.cc +++ b/libtransmission/torrent.cc @@ -52,7 +52,7 @@ struct tr_ctor; using namespace std::literals; -using namespace libtransmission::Values; +using namespace tr::Values; // --- diff --git a/libtransmission/torrent.h b/libtransmission/torrent.h index c5d6a1cbc..8895f67df 100644 --- a/libtransmission/torrent.h +++ b/libtransmission/torrent.h @@ -54,18 +54,18 @@ void tr_torrentFreeInSessionThread(tr_torrent* tor); void tr_torrentChangeMyPort(tr_torrent* tor); -namespace libtransmission::test +namespace tr::test { class RenameTest_multifileTorrent_Test; class RenameTest_singleFilenameTorrent_Test; -} // namespace libtransmission::test +} // namespace tr::test /** @brief Torrent object */ struct tr_torrent { - using Speed = libtransmission::Values::Speed; + using Speed = tr::Values::Speed; class ResumeHelper { @@ -91,8 +91,8 @@ struct tr_torrent [[nodiscard]] bool start_when_stable() const noexcept; private: - friend class libtransmission::test::RenameTest_multifileTorrent_Test; - friend class libtransmission::test::RenameTest_singleFilenameTorrent_Test; + friend class tr::test::RenameTest_multifileTorrent_Test; + friend class tr::test::RenameTest_singleFilenameTorrent_Test; friend struct tr_torrent; explicit ResumeHelper(tr_torrent& tor) @@ -1006,18 +1006,18 @@ struct tr_torrent // --- - libtransmission::SimpleObservable done_; - libtransmission::SimpleObservable got_bad_piece_; - libtransmission::SimpleObservable piece_completed_; - libtransmission::SimpleObservable doomed_; - libtransmission::SimpleObservable got_metainfo_; - libtransmission::SimpleObservable started_; - libtransmission::SimpleObservable stopped_; - libtransmission::SimpleObservable swarm_is_all_upload_only_; - libtransmission::SimpleObservable files_wanted_changed_; - libtransmission::SimpleObservable priority_changed_; - libtransmission::SimpleObservable sequential_download_changed_; - libtransmission::SimpleObservable sequential_download_from_piece_changed_; + tr::SimpleObservable done_; + tr::SimpleObservable got_bad_piece_; + tr::SimpleObservable piece_completed_; + tr::SimpleObservable doomed_; + tr::SimpleObservable got_metainfo_; + tr::SimpleObservable started_; + tr::SimpleObservable stopped_; + tr::SimpleObservable swarm_is_all_upload_only_; + tr::SimpleObservable files_wanted_changed_; + tr::SimpleObservable priority_changed_; + tr::SimpleObservable sequential_download_changed_; + tr::SimpleObservable sequential_download_from_piece_changed_; CumulativeCount bytes_corrupt_; CumulativeCount bytes_downloaded_; diff --git a/libtransmission/tr-buffer.h b/libtransmission/tr-buffer.h index 3f2b77279..dc9489ebe 100644 --- a/libtransmission/tr-buffer.h +++ b/libtransmission/tr-buffer.h @@ -20,7 +20,7 @@ #include "libtransmission/tr-macros.h" // TR_CONSTEXPR #include "libtransmission/utils.h" // for tr_htonll(), tr_ntohll() -namespace libtransmission +namespace tr { template @@ -319,4 +319,4 @@ private: size_t end_pos_ = {}; }; -} // namespace libtransmission +} // namespace tr diff --git a/libtransmission/tr-dht.cc b/libtransmission/tr-dht.cc index dcdedc052..c20c232c9 100644 --- a/libtransmission/tr-dht.cc +++ b/libtransmission/tr-dht.cc @@ -605,9 +605,9 @@ private: Mediator& mediator_; std::string const state_filename_; - std::unique_ptr const announce_timer_; - std::unique_ptr const bootstrap_timer_; - std::unique_ptr const periodic_timer_; + std::unique_ptr const announce_timer_; + std::unique_ptr const bootstrap_timer_; + std::unique_ptr const periodic_timer_; Id id_ = {}; int64_t id_timestamp_ = {}; diff --git a/libtransmission/tr-dht.h b/libtransmission/tr-dht.h index d3721b811..c7f58417e 100644 --- a/libtransmission/tr-dht.h +++ b/libtransmission/tr-dht.h @@ -29,10 +29,10 @@ struct tr_pex; -namespace libtransmission +namespace tr { class TimerMaker; -} // namespace libtransmission +} // namespace tr class tr_dht { @@ -95,7 +95,7 @@ public: [[nodiscard]] virtual tr_sha1_digest_t torrent_info_hash(tr_torrent_id_t) const = 0; [[nodiscard]] virtual std::string_view config_dir() const = 0; - [[nodiscard]] virtual libtransmission::TimerMaker& timer_maker() = 0; + [[nodiscard]] virtual tr::TimerMaker& timer_maker() = 0; [[nodiscard]] virtual API& api() { return api_; diff --git a/libtransmission/tr-lpd.cc b/libtransmission/tr-lpd.cc index a9d4dfb64..a0c8a96e1 100644 --- a/libtransmission/tr-lpd.cc +++ b/libtransmission/tr-lpd.cc @@ -653,7 +653,7 @@ private: std::string const cookie_ = makeCookie(); Mediator& mediator_; std::array mcast_sockets_ = { TR_BAD_SOCKET, TR_BAD_SOCKET }; // multicast sockets - std::array events_; + std::array events_; static auto constexpr MaxDatagramLength = size_t{ 1400 }; sockaddr_in mcast_addr_ = {}; // initialized from the above constants in init() @@ -662,7 +662,7 @@ private: // BEP14: "To avoid causing multicast storms on large networks a // client should send no more than 1 announce per minute." static auto constexpr AnnounceInterval = 1min; - std::unique_ptr announce_timer_; + std::unique_ptr announce_timer_; // Flood Protection: // To protect against message flooding, stop processing search messages @@ -670,7 +670,7 @@ private: // in a *very* crowded multicast group or a hostile host is sending us // bogus data. Better to drop a few packets than get DoS'ed. static auto constexpr DosInterval = 5s; - std::unique_ptr dos_timer_; + std::unique_ptr dos_timer_; static auto constexpr MaxIncomingPerSecond = 10; static auto constexpr MaxIncomingPerUpkeep = std::chrono::duration_cast(DosInterval).count() * MaxIncomingPerSecond; diff --git a/libtransmission/tr-lpd.h b/libtransmission/tr-lpd.h index f527d8be4..bacf51eab 100644 --- a/libtransmission/tr-lpd.h +++ b/libtransmission/tr-lpd.h @@ -20,7 +20,7 @@ struct event_base; -namespace libtransmission +namespace tr { class TimerMaker; } @@ -49,7 +49,7 @@ public: [[nodiscard]] virtual std::vector torrents() const = 0; - [[nodiscard]] virtual libtransmission::TimerMaker& timerMaker() = 0; + [[nodiscard]] virtual tr::TimerMaker& timerMaker() = 0; virtual void setNextAnnounceTime(std::string_view info_hash_str, time_t announce_at) = 0; diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h index f045dc4b6..fb6856ea7 100644 --- a/libtransmission/transmission.h +++ b/libtransmission/transmission.h @@ -1149,8 +1149,8 @@ struct tr_peer_stat // Will be an empty string if the agent cannot be determined. std::string user_agent; - libtransmission::Values::Speed rate_to_peer; - libtransmission::Values::Speed rate_to_client; + tr::Values::Speed rate_to_peer; + tr::Values::Speed rate_to_client; // how many requests the peer has made that we haven't responded to yet size_t active_reqs_to_client = {}; diff --git a/libtransmission/utils-ev.cc b/libtransmission/utils-ev.cc index f98c31f39..2e3851b40 100644 --- a/libtransmission/utils-ev.cc +++ b/libtransmission/utils-ev.cc @@ -8,7 +8,7 @@ #include "libtransmission/utils-ev.h" -namespace libtransmission::evhelpers +namespace tr::evhelpers { void EventBaseDeleter::operator()(struct event_base* evbase) const noexcept @@ -36,4 +36,4 @@ void EvhttpDeleter::operator()(struct evhttp* evh) const noexcept } } -} // namespace libtransmission::evhelpers +} // namespace tr::evhelpers diff --git a/libtransmission/utils-ev.h b/libtransmission/utils-ev.h index ae14ae798..15118e675 100644 --- a/libtransmission/utils-ev.h +++ b/libtransmission/utils-ev.h @@ -15,7 +15,7 @@ struct event; struct event_base; struct evhttp; -namespace libtransmission::evhelpers +namespace tr::evhelpers { struct EventBaseDeleter @@ -39,4 +39,4 @@ struct EvhttpDeleter using evhttp_unique_ptr = std::unique_ptr; -} // namespace libtransmission::evhelpers +} // namespace tr::evhelpers diff --git a/libtransmission/utils.cc b/libtransmission/utils.cc index ac428a98d..437f45e03 100644 --- a/libtransmission/utils.cc +++ b/libtransmission/utils.cc @@ -61,13 +61,13 @@ #include "libtransmission/values.h" using namespace std::literals; -using namespace libtransmission::Values; +using namespace tr::Values; -time_t libtransmission::detail::tr_time::current_time = {}; +time_t tr::detail::tr_time::current_time = {}; // --- -namespace libtransmission::Values +namespace tr::Values { // default values; can be overridden by client apps @@ -75,7 +75,7 @@ Config::Units Config::memory{ Config::Base::Kibi, "B"sv, "KiB"sv, " Config::Units Config::speed{ Config::Base::Kilo, "B/s"sv, "kB/s"sv, "MB/s"sv, "GB/s"sv, "TB/s"sv }; Config::Units Config::storage{ Config::Base::Kilo, "B"sv, "kB"sv, "MB"sv, "GB"sv, "TB"sv }; -} // namespace libtransmission::Values +} // namespace tr::Values // --- @@ -778,7 +778,7 @@ void tr_lib_init() { tr_net_init_impl::tr_net_init_mgr::create(); - libtransmission::serializer::Converters::ensure_default_converters(); + tr::serializer::Converters::ensure_default_converters(); }); } diff --git a/libtransmission/utils.h b/libtransmission/utils.h index 23385bcac..62406394e 100644 --- a/libtransmission/utils.h +++ b/libtransmission/utils.h @@ -253,7 +253,7 @@ template // --- -namespace libtransmission::detail::tr_time +namespace tr::detail::tr_time { extern time_t current_time; } @@ -270,13 +270,13 @@ extern time_t current_time; */ [[nodiscard]] static inline time_t tr_time() noexcept { - return libtransmission::detail::tr_time::current_time; + return tr::detail::tr_time::current_time; } /** @brief Private libtransmission function to update `tr_time()`'s counter */ constexpr void tr_timeUpdate(time_t now) noexcept { - libtransmission::detail::tr_time::current_time = now; + tr::detail::tr_time::current_time = now; } /** @brief Portability wrapper for `htonll()` that uses the system implementation if available */ diff --git a/libtransmission/values.h b/libtransmission/values.h index 5de5e6306..3fea9464a 100644 --- a/libtransmission/values.h +++ b/libtransmission/values.h @@ -14,7 +14,7 @@ #include -namespace libtransmission::Values +namespace tr::Values { enum class MemoryUnits : uint8_t { @@ -267,4 +267,4 @@ using Memory = Value; using Storage = Value; using Speed = Value; -} // namespace libtransmission::Values +} // namespace tr::Values diff --git a/libtransmission/variant-benc.cc b/libtransmission/variant-benc.cc index 6ace29773..dcdb6eef5 100644 --- a/libtransmission/variant-benc.cc +++ b/libtransmission/variant-benc.cc @@ -34,7 +34,7 @@ auto constexpr MaxBencStrLength = size_t{ 128 * 1024 * 1024 }; // arbitrary // --- -namespace transmission::benc::impl +namespace tr::benc::impl { /** @@ -125,7 +125,7 @@ std::optional ParseString(std::string_view* benc) return string; } -} // namespace transmission::benc::impl +} // namespace tr::benc::impl // --- @@ -133,7 +133,7 @@ namespace { namespace parse_helpers { -struct MyHandler : public transmission::benc::Handler +struct MyHandler : public tr::benc::Handler { tr_variant* const top_; bool inplace_; @@ -259,12 +259,12 @@ private: std::optional tr_variant_serde::parse_benc(std::string_view input) { using namespace parse_helpers; - using Stack = transmission::benc::ParserStack<512>; + using Stack = tr::benc::ParserStack<512>; auto top = tr_variant{}; auto stack = Stack{}; auto handler = MyHandler{ &top, parse_inplace_ }; - if (transmission::benc::parse(input, stack, handler, &end_, &error_) && std::empty(stack)) + if (tr::benc::parse(input, stack, handler, &end_, &error_) && std::empty(stack)) { return std::optional{ std::move(top) }; } diff --git a/libtransmission/watchdir-base.h b/libtransmission/watchdir-base.h index 9ce2a9925..9ff6261d2 100644 --- a/libtransmission/watchdir-base.h +++ b/libtransmission/watchdir-base.h @@ -23,7 +23,7 @@ #include "libtransmission/timer.h" #include "libtransmission/watchdir.h" -namespace libtransmission::impl +namespace tr::impl { // base class for concrete tr_watchdirs class BaseWatchdir : public Watchdir @@ -152,4 +152,4 @@ private: std::chrono::seconds timeout_duration_ = std::chrono::seconds{ 15 }; }; -} // namespace libtransmission::impl +} // namespace tr::impl diff --git a/libtransmission/watchdir-generic.cc b/libtransmission/watchdir-generic.cc index 639d38af9..42414a26e 100644 --- a/libtransmission/watchdir-generic.cc +++ b/libtransmission/watchdir-generic.cc @@ -14,7 +14,7 @@ #include "libtransmission/watchdir.h" #include "libtransmission/watchdir-base.h" -namespace libtransmission +namespace tr { namespace { @@ -24,7 +24,7 @@ public: GenericWatchdir( std::string_view dirname, Callback callback, - libtransmission::TimerMaker& timer_maker, + tr::TimerMaker& timer_maker, std::chrono::milliseconds rescan_interval) : BaseWatchdir{ dirname, std::move(callback), timer_maker } , rescan_timer_{ timer_maker.create() } @@ -43,7 +43,7 @@ private: std::unique_ptr Watchdir::create_generic( std::string_view dirname, Callback callback, - libtransmission::TimerMaker& timer_maker, + tr::TimerMaker& timer_maker, std::chrono::milliseconds rescan_interval) { return std::make_unique(dirname, std::move(callback), timer_maker, rescan_interval); @@ -54,11 +54,11 @@ std::unique_ptr Watchdir::create_generic( std::unique_ptr Watchdir::create( std::string_view dirname, Callback callback, - libtransmission::TimerMaker& timer_maker, + tr::TimerMaker& timer_maker, struct event_base* /*evbase*/) { return std::make_unique(dirname, std::move(callback), timer_maker, generic_rescan_interval()); } #endif -} // namespace libtransmission +} // namespace tr diff --git a/libtransmission/watchdir-inotify.cc b/libtransmission/watchdir-inotify.cc index a46b26b74..2a748f046 100644 --- a/libtransmission/watchdir-inotify.cc +++ b/libtransmission/watchdir-inotify.cc @@ -31,7 +31,7 @@ struct event_base; -namespace libtransmission +namespace tr { class TimerMaker; @@ -182,10 +182,10 @@ private: std::unique_ptr Watchdir::create( std::string_view dirname, Callback callback, - libtransmission::TimerMaker& timer_maker, + tr::TimerMaker& timer_maker, event_base* evbase) { return std::make_unique(dirname, std::move(callback), timer_maker, evbase); } -} // namespace libtransmission +} // namespace tr diff --git a/libtransmission/watchdir-kqueue.cc b/libtransmission/watchdir-kqueue.cc index c8afa9259..e73b891f2 100644 --- a/libtransmission/watchdir-kqueue.cc +++ b/libtransmission/watchdir-kqueue.cc @@ -30,14 +30,14 @@ #include "libtransmission/utils-ev.h" #include "libtransmission/watchdir-base.h" -namespace libtransmission +namespace tr { namespace { class KQueueWatchdir final : public impl::BaseWatchdir { public: - KQueueWatchdir(std::string_view dirname, Callback callback, libtransmission::TimerMaker& timer_maker, event_base* evbase) + KQueueWatchdir(std::string_view dirname, Callback callback, tr::TimerMaker& timer_maker, event_base* evbase) : BaseWatchdir{ dirname, std::move(callback), timer_maker } { init(evbase); @@ -160,7 +160,7 @@ private: int kq_ = -1; int dirfd_ = -1; - libtransmission::evhelpers::event_unique_ptr event_; + tr::evhelpers::event_unique_ptr event_; }; } // namespace @@ -174,4 +174,4 @@ std::unique_ptr Watchdir::create( return std::make_unique(dirname, std::move(callback), timer_maker, evbase); } -} // namespace libtransmission +} // namespace tr diff --git a/libtransmission/watchdir-win32.cc b/libtransmission/watchdir-win32.cc index 8f181f0bd..32498c021 100644 --- a/libtransmission/watchdir-win32.cc +++ b/libtransmission/watchdir-win32.cc @@ -29,7 +29,7 @@ #include "libtransmission/utils.h" #include "libtransmission/watchdir-base.h" -namespace libtransmission +namespace tr { namespace { @@ -83,11 +83,7 @@ BOOL tr_get_overlapped_result_ex( class Win32Watchdir final : public impl::BaseWatchdir { public: - Win32Watchdir( - std::string_view dirname, - Callback callback, - libtransmission::TimerMaker& timer_maker, - struct event_base* event_base) + Win32Watchdir(std::string_view dirname, Callback callback, tr::TimerMaker& timer_maker, struct event_base* event_base) : BaseWatchdir{ dirname, std::move(callback), timer_maker } { init(event_base); @@ -377,4 +373,4 @@ std::unique_ptr Watchdir::create( return std::make_unique(dirname, std::move(callback), timer_maker, evbase); } -} // namespace libtransmission +} // namespace tr diff --git a/libtransmission/watchdir.cc b/libtransmission/watchdir.cc index 76f415892..4fa2d6c85 100644 --- a/libtransmission/watchdir.cc +++ b/libtransmission/watchdir.cc @@ -21,7 +21,7 @@ using namespace std::literals; -namespace libtransmission +namespace tr { namespace { @@ -125,4 +125,4 @@ void BaseWatchdir::scan() } } // namespace impl -} // namespace libtransmission +} // namespace tr diff --git a/libtransmission/watchdir.h b/libtransmission/watchdir.h index 7b3f7ad23..80ee28f05 100644 --- a/libtransmission/watchdir.h +++ b/libtransmission/watchdir.h @@ -12,7 +12,7 @@ struct event_base; -namespace libtransmission +namespace tr { class TimerMaker; @@ -50,13 +50,13 @@ public: [[nodiscard]] static std::unique_ptr create( std::string_view dirname, Callback callback, - libtransmission::TimerMaker& timer_maker, + tr::TimerMaker& timer_maker, struct event_base* evbase); [[nodiscard]] static std::unique_ptr create_generic( std::string_view dirname, Callback callback, - libtransmission::TimerMaker& timer_maker, + tr::TimerMaker& timer_maker, std::chrono::milliseconds rescan_interval = generic_rescan_interval_); private: @@ -64,4 +64,4 @@ private: static inline auto generic_rescan_interval_ = std::chrono::milliseconds{ 1000 }; }; -} // namespace libtransmission +} // namespace tr diff --git a/libtransmission/webseed.cc b/libtransmission/webseed.cc index fc4d7c3d7..79510364e 100644 --- a/libtransmission/webseed.cc +++ b/libtransmission/webseed.cc @@ -38,7 +38,7 @@ #include "libtransmission/webseed.h" using namespace std::literals; -using namespace libtransmission::Values; +using namespace tr::Values; namespace { @@ -74,7 +74,7 @@ private: // the current position in the task; i.e., the next block to save tr_block_info::Location loc_; - libtransmission::StackBuffer> content_; + tr::StackBuffer> content_; }; /** @@ -352,7 +352,7 @@ public: private: static auto constexpr IdleTimerInterval = 2s; - std::unique_ptr const idle_timer_; + std::unique_ptr const idle_timer_; tr_bitfield have_; diff --git a/macosx/Controller.mm b/macosx/Controller.mm index 415723e7c..cf34857f2 100644 --- a/macosx/Controller.mm +++ b/macosx/Controller.mm @@ -137,7 +137,7 @@ static NSTimeInterval const kDonateNagTime = 60 * 60 * 24 * 7; static void initUnits() { - using Config = libtransmission::Values::Config; + using Config = tr::Values::Config; // use a random value to avoid possible pluralization issues with 1 or 0 (an example is if we use 1 for bytes, // we'd get "byte" when we'd want "bytes" for the generic libtransmission value at least) diff --git a/macosx/Torrent.mm b/macosx/Torrent.mm index 9ef9873bb..707167003 100644 --- a/macosx/Torrent.mm +++ b/macosx/Torrent.mm @@ -1028,11 +1028,11 @@ bool trashDataFile(std::string_view const filename, tr_error* error) if (peer.is_uploading_to) { - dict[@"UL To Rate"] = @(peer.rate_to_peer.count(libtransmission::Values::Speed::Units::KByps)); + dict[@"UL To Rate"] = @(peer.rate_to_peer.count(tr::Values::Speed::Units::KByps)); } if (peer.is_downloading_from) { - dict[@"DL From Rate"] = @(peer.rate_to_client.count(libtransmission::Values::Speed::Units::KByps)); + dict[@"DL From Rate"] = @(peer.rate_to_client.count(tr::Values::Speed::Units::KByps)); } [peerDicts addObject:dict]; diff --git a/qt/Application.cc b/qt/Application.cc index c7e20e539..ad8ffcbfb 100644 --- a/qt/Application.cc +++ b/qt/Application.cc @@ -70,7 +70,7 @@ bool loadTranslation(QTranslator& translator, QString const& name, QLocale const void initUnits() { - using Config = libtransmission::Values::Config; + using Config = tr::Values::Config; Config::speed = { Config::Base::Kilo, QObject::tr("B/s").toStdString(), diff --git a/qt/Application.h b/qt/Application.h index 011b872e9..ac5ec9ac7 100644 --- a/qt/Application.h +++ b/qt/Application.h @@ -121,7 +121,7 @@ private: QTranslator qt_translator_; QTranslator app_translator_; - transmission::app::FaviconCache favicon_cache_; + tr::app::FaviconCache favicon_cache_; }; #define trApp dynamic_cast(Application::instance()) diff --git a/qt/FaviconCache.cc b/qt/FaviconCache.cc index ba942a6f0..40d41b6ab 100644 --- a/qt/FaviconCache.cc +++ b/qt/FaviconCache.cc @@ -10,7 +10,7 @@ #include #include -using namespace transmission::app; +using namespace tr::app; using Icon = QPixmap; template<> diff --git a/qt/FileTreeView.cc b/qt/FileTreeView.cc index 3bcc87b99..6480687dd 100644 --- a/qt/FileTreeView.cc +++ b/qt/FileTreeView.cc @@ -23,7 +23,7 @@ #include "Formatter.h" #include "Utils.h" -using namespace libtransmission::Values; +using namespace tr::Values; namespace { diff --git a/qt/Formatter.cc b/qt/Formatter.cc index 3f10cd587..b6ba68207 100644 --- a/qt/Formatter.cc +++ b/qt/Formatter.cc @@ -10,7 +10,7 @@ #include using namespace std::literals; -using namespace libtransmission::Values; +using namespace tr::Values; QString Formatter::memory_to_string(int64_t const bytes) { diff --git a/qt/Prefs.cc b/qt/Prefs.cc index bc4412703..1e89adfd9 100644 --- a/qt/Prefs.cc +++ b/qt/Prefs.cc @@ -22,8 +22,8 @@ #include "Prefs.h" #include "UserMetaType.h" -namespace api_compat = libtransmission::api_compat; -namespace ser = libtransmission::serializer; +namespace api_compat = tr::api_compat; +namespace ser = tr::serializer; using namespace std::string_view_literals; // --- diff --git a/qt/PrefsDialog.cc b/qt/PrefsDialog.cc index a162c67f1..3d434f3d2 100644 --- a/qt/PrefsDialog.cc +++ b/qt/PrefsDialog.cc @@ -34,7 +34,7 @@ #include "UserMetaType.h" #include "Utils.h" -using namespace libtransmission; +using namespace tr; // --- diff --git a/qt/RpcClient.cc b/qt/RpcClient.cc index 0eb9232b8..7ace013d1 100644 --- a/qt/RpcClient.cc +++ b/qt/RpcClient.cc @@ -26,7 +26,7 @@ #include "VariantHelpers.h" using ::trqt::variant_helpers::dictFind; -namespace api_compat = libtransmission::api_compat; +namespace api_compat = tr::api_compat; namespace { @@ -69,7 +69,7 @@ void RpcClient::stop() session_ = nullptr; session_id_.clear(); url_.clear(); - network_style_ = libtransmission::api_compat::default_style(); + network_style_ = tr::api_compat::default_style(); QObject::disconnect(nam_, nullptr, this, nullptr); } diff --git a/qt/RpcClient.h b/qt/RpcClient.h index cf4b28d38..b8aae013f 100644 --- a/qt/RpcClient.h +++ b/qt/RpcClient.h @@ -98,7 +98,7 @@ private: [[nodiscard]] int64_t parseResponseId(tr_variant& response) const; [[nodiscard]] RpcResponse parseResponseData(tr_variant& response) const; - libtransmission::api_compat::Style network_style_ = libtransmission::api_compat::default_style(); + tr::api_compat::Style network_style_ = tr::api_compat::default_style(); tr_session* session_ = {}; QByteArray session_id_; QUrl url_; diff --git a/qt/Session.cc b/qt/Session.cc index fff79cc01..7703c3e80 100644 --- a/qt/Session.cc +++ b/qt/Session.cc @@ -46,7 +46,7 @@ using namespace std::literals; -using ::libtransmission::serializer::to_variant; +using ::tr::serializer::to_variant; using ::trqt::variant_helpers::dictAdd; using ::trqt::variant_helpers::dictFind; diff --git a/qt/Speed.h b/qt/Speed.h index f9a469ffb..6d1955881 100644 --- a/qt/Speed.h +++ b/qt/Speed.h @@ -10,7 +10,7 @@ #include "libtransmission/values.h" -class Speed : public libtransmission::Values::Speed +class Speed : public tr::Values::Speed { Q_DECLARE_TR_FUNCTIONS(Speed) @@ -19,13 +19,13 @@ public: template>* = nullptr> constexpr Speed(Number value, Units multiple) - : libtransmission::Values::Speed{ value, multiple } + : tr::Values::Speed{ value, multiple } { } template>* = nullptr> Speed(Number value, Units multiple) - : libtransmission::Values::Speed{ value, multiple } + : tr::Values::Speed{ value, multiple } { } diff --git a/qt/TrQtInit.cc b/qt/TrQtInit.cc index c5d37fbd1..4b05414f5 100644 --- a/qt/TrQtInit.cc +++ b/qt/TrQtInit.cc @@ -14,7 +14,7 @@ namespace trqt void trqt_init() { - transmission::app::init(); + tr::app::init(); trqt::variant_helpers::register_qt_converters(); } diff --git a/qt/TrackerDelegate.cc b/qt/TrackerDelegate.cc index edf0e6093..5fdc88e0c 100644 --- a/qt/TrackerDelegate.cc +++ b/qt/TrackerDelegate.cc @@ -19,7 +19,7 @@ #include "TrackerModel.h" #include "Utils.h" -using namespace transmission::app; +using namespace tr::app; /*** **** diff --git a/qt/UserMetaType.h b/qt/UserMetaType.h index e30507692..927bcfa85 100644 --- a/qt/UserMetaType.h +++ b/qt/UserMetaType.h @@ -24,11 +24,11 @@ public: Q_DECLARE_METATYPE(tr_encryption_mode) -using ShowMode = transmission::app::ShowMode; +using ShowMode = tr::app::ShowMode; Q_DECLARE_METATYPE(ShowMode) -inline auto constexpr DefaultShowMode = transmission::app::DefaultShowMode; -inline auto constexpr ShowModeCount = transmission::app::ShowModeCount; +inline auto constexpr DefaultShowMode = tr::app::DefaultShowMode; +inline auto constexpr ShowModeCount = tr::app::ShowModeCount; -using SortMode = transmission::app::SortMode; +using SortMode = tr::app::SortMode; Q_DECLARE_METATYPE(SortMode) -inline auto constexpr DefaultSortMode = transmission::app::DefaultSortMode; +inline auto constexpr DefaultSortMode = tr::app::DefaultSortMode; diff --git a/qt/VariantHelpers.cc b/qt/VariantHelpers.cc index f96bd9a5e..b3e1c72e6 100644 --- a/qt/VariantHelpers.cc +++ b/qt/VariantHelpers.cc @@ -20,7 +20,7 @@ #include "Speed.h" #include "Torrent.h" -namespace ser = libtransmission::serializer; +namespace ser = tr::serializer; namespace trqt::variant_helpers { @@ -301,7 +301,7 @@ void register_qt_converters() once, [] { - using namespace libtransmission::serializer; + using namespace tr::serializer; Converters::add(toInt, fromInt); Converters::add(toQDateTime, fromQDateTime); Converters::add(toQString, fromQString); diff --git a/qt/main.cc b/qt/main.cc index 9a6d1ef5b..8b0829575 100644 --- a/qt/main.cc +++ b/qt/main.cc @@ -105,7 +105,7 @@ bool tryDelegate(QStringList const& filenames) int tr_main(int argc, char** argv) { - transmission::app::init(); + tr::app::init(); trqt::variant_helpers::register_qt_converters(); // parse the command-line arguments diff --git a/tests/libtransmission/announce-list-test.cc b/tests/libtransmission/announce-list-test.cc index 4063b7aa4..c6c4f6caa 100644 --- a/tests/libtransmission/announce-list-test.cc +++ b/tests/libtransmission/announce-list-test.cc @@ -25,7 +25,7 @@ #include "test-fixtures.h" -using AnnounceListTest = ::libtransmission::test::TransmissionTest; +using AnnounceListTest = ::tr::test::TransmissionTest; using namespace std::literals; TEST_F(AnnounceListTest, canAdd) @@ -364,7 +364,7 @@ TEST_F(AnnounceListTest, save) // first, set up a scratch torrent auto constexpr* const OriginalFile = LIBTRANSMISSION_TEST_ASSETS_DIR "/Android-x86 8.1 r6 iso.torrent"; auto original_content = std::vector{}; - auto const sandbox = libtransmission::test::Sandbox::createSandbox(::testing::TempDir(), "transmission-test-XXXXXX"); + auto const sandbox = tr::test::Sandbox::createSandbox(::testing::TempDir(), "transmission-test-XXXXXX"); auto const test_file = tr_pathbuf{ sandbox, "transmission-announce-list-test.torrent"sv }; auto error = tr_error{}; EXPECT_TRUE(tr_file_read(OriginalFile, original_content, &error)); diff --git a/tests/libtransmission/announcer-test.cc b/tests/libtransmission/announcer-test.cc index 31959b63e..eb23f0777 100644 --- a/tests/libtransmission/announcer-test.cc +++ b/tests/libtransmission/announcer-test.cc @@ -17,7 +17,7 @@ #include "test-fixtures.h" -using AnnouncerTest = ::libtransmission::test::TransmissionTest; +using AnnouncerTest = ::tr::test::TransmissionTest; using namespace std::literals; diff --git a/tests/libtransmission/announcer-udp-test.cc b/tests/libtransmission/announcer-udp-test.cc index 5be2010b6..eae45c19f 100644 --- a/tests/libtransmission/announcer-udp-test.cc +++ b/tests/libtransmission/announcer-udp-test.cc @@ -49,9 +49,9 @@ using namespace std::literals; using tau_connection_t = uint64_t; using tau_transaction_t = uint32_t; -using MessageBuffer = libtransmission::StackBuffer<4096, std::byte>; +using MessageBuffer = tr::StackBuffer<4096, std::byte>; -class AnnouncerUdpTest : public ::libtransmission::test::TransmissionTest +class AnnouncerUdpTest : public ::tr::test::TransmissionTest { private: void SetUp() override @@ -243,8 +243,7 @@ protected: sockaddr* const from = nullptr, socklen_t* const fromlen = nullptr) { - EXPECT_TRUE( - libtransmission::test::waitFor(mediator.eventBase(), [&mediator]() { return !std::empty(mediator.sent_); })); + EXPECT_TRUE(tr::test::waitFor(mediator.eventBase(), [&mediator]() { return !std::empty(mediator.sent_); })); auto& sent = mediator.sent_.front(); auto const buf = std::move(sent.buf_); if (from != nullptr) @@ -375,7 +374,7 @@ protected: // emulate the upkeep timer that tr_announcer runs in production static auto createUpkeepTimer(MockMediator& mediator, std::unique_ptr& announcer) { - auto timer_maker = libtransmission::EvTimerMaker{ mediator.eventBase() }; + auto timer_maker = tr::EvTimerMaker{ mediator.eventBase() }; auto timer = timer_maker.create(); timer->set_callback([&announcer]() { announcer->upkeep(); }); timer->start_repeating(200ms); diff --git a/tests/libtransmission/api-compat-test.cc b/tests/libtransmission/api-compat-test.cc index bf0b4ba48..4be290701 100644 --- a/tests/libtransmission/api-compat-test.cc +++ b/tests/libtransmission/api-compat-test.cc @@ -13,7 +13,7 @@ #include "test-fixtures.h" -using ApiCompatTest = ::libtransmission::test::TransmissionTest; +using ApiCompatTest = ::tr::test::TransmissionTest; namespace { @@ -1205,7 +1205,7 @@ constexpr std::string_view ResumeBenc = TEST_F(ApiCompatTest, canConvertRpc) { - using Style = libtransmission::api_compat::Style; + using Style = tr::api_compat::Style; using TestCase = std::tuple; // clang-format off @@ -1294,14 +1294,14 @@ TEST_F(ApiCompatTest, canConvertRpc) auto serde = tr_variant_serde::json(); auto parsed = serde.parse(src); ASSERT_TRUE(parsed.has_value()) << name << ": " << serde.error_; - libtransmission::api_compat::convert(*parsed, tgt_style); + tr::api_compat::convert(*parsed, tgt_style); EXPECT_EQ(expected, serde.to_string(*parsed)) << name; } } TEST_F(ApiCompatTest, canConvertJsonDataFiles) { - using Style = libtransmission::api_compat::Style; + using Style = tr::api_compat::Style; using TestCase = std::tuple; static auto constexpr TestCases = std::array{ { @@ -1335,14 +1335,14 @@ TEST_F(ApiCompatTest, canConvertJsonDataFiles) auto parsed = serde.parse(src); ASSERT_TRUE(parsed.has_value()); - libtransmission::api_compat::convert(*parsed, tgt_style); + tr::api_compat::convert(*parsed, tgt_style); EXPECT_EQ(expected, serde.to_string(*parsed)) << name; } } TEST_F(ApiCompatTest, canConvertBencDataFiles) { - using Style = libtransmission::api_compat::Style; + using Style = tr::api_compat::Style; using TestCase = std::tuple; static auto constexpr TestCases = std::array{ { @@ -1359,7 +1359,7 @@ TEST_F(ApiCompatTest, canConvertBencDataFiles) auto parsed = serde.parse(src); ASSERT_TRUE(parsed.has_value()) << name; - libtransmission::api_compat::convert(*parsed, tgt_style); + tr::api_compat::convert(*parsed, tgt_style); EXPECT_EQ(expected, serde.to_string(*parsed)) << name; } } diff --git a/tests/libtransmission/benc-test.cc b/tests/libtransmission/benc-test.cc index a05ff91e0..b3726c9fe 100644 --- a/tests/libtransmission/benc-test.cc +++ b/tests/libtransmission/benc-test.cc @@ -13,7 +13,7 @@ #include "test-fixtures.h" -using BencTest = ::libtransmission::test::TransmissionTest; +using BencTest = ::tr::test::TransmissionTest; using namespace std::literals; TEST_F(BencTest, MalformedBenc) @@ -22,12 +22,12 @@ TEST_F(BencTest, MalformedBenc) auto constexpr Benc = "d14:failure reason119:The tracker was unable to process your request. It may be down, overloaded, under attack or it just does not like you.12:min intervali1800e8:intervali1800e5:peers0:ee\n"sv; auto constexpr MaxBencDepth = 8; - using TestHandler = transmission::benc::BasicHandler; + using TestHandler = tr::benc::BasicHandler; - auto stack = transmission::benc::ParserStack{}; + auto stack = tr::benc::ParserStack{}; auto handler = TestHandler{}; auto error = tr_error{}; - EXPECT_FALSE(transmission::benc::parse(Benc, stack, handler, nullptr, &error)); + EXPECT_FALSE(tr::benc::parse(Benc, stack, handler, nullptr, &error)); EXPECT_TRUE(error); EXPECT_NE(""sv, error.message()); } @@ -47,9 +47,9 @@ TEST_F(BencTest, ContextTokenIsCorrect) // clang-format on auto constexpr MaxBencDepth = 32; - struct ContextHandler final : public transmission::benc::BasicHandler + struct ContextHandler final : public tr::benc::BasicHandler { - using BasicHandler = transmission::benc::BasicHandler; + using BasicHandler = tr::benc::BasicHandler; bool StartArray(Context const& context) override { @@ -92,9 +92,9 @@ TEST_F(BencTest, ContextTokenIsCorrect) } }; - auto stack = transmission::benc::ParserStack{}; + auto stack = tr::benc::ParserStack{}; auto handler = ContextHandler{}; auto error = tr_error{}; - transmission::benc::parse(Benc, stack, handler, nullptr, &error); + tr::benc::parse(Benc, stack, handler, nullptr, &error); EXPECT_FALSE(error); } diff --git a/tests/libtransmission/block-info-test.cc b/tests/libtransmission/block-info-test.cc index 929481139..4c5482a60 100644 --- a/tests/libtransmission/block-info-test.cc +++ b/tests/libtransmission/block-info-test.cc @@ -11,7 +11,7 @@ #include "test-fixtures.h" -using BlockInfoTest = ::libtransmission::test::TransmissionTest; +using BlockInfoTest = ::tr::test::TransmissionTest; TEST_F(BlockInfoTest, fieldsAreSet) { diff --git a/tests/libtransmission/blocklist-test.cc b/tests/libtransmission/blocklist-test.cc index ce40d74f7..8cfdc3b8f 100644 --- a/tests/libtransmission/blocklist-test.cc +++ b/tests/libtransmission/blocklist-test.cc @@ -16,7 +16,7 @@ #include "test-fixtures.h" -namespace libtransmission::test +namespace tr::test { class BlocklistTest : public SessionTest @@ -122,4 +122,4 @@ TEST_F(BlocklistTest, updating) // cleanup } -} // namespace libtransmission::test +} // namespace tr::test diff --git a/tests/libtransmission/buffer-test.cc b/tests/libtransmission/buffer-test.cc index e71552e2d..d2f3e48b5 100644 --- a/tests/libtransmission/buffer-test.cc +++ b/tests/libtransmission/buffer-test.cc @@ -13,9 +13,9 @@ #include "test-fixtures.h" -using BufferTest = ::libtransmission::test::TransmissionTest; +using BufferTest = ::tr::test::TransmissionTest; using namespace std::literals; -using Buffer = libtransmission::StackBuffer<1024, std::byte>; +using Buffer = tr::StackBuffer<1024, std::byte>; TEST_F(BufferTest, startsWithInSingleSegment) { diff --git a/tests/libtransmission/completion-test.cc b/tests/libtransmission/completion-test.cc index ae30b3509..a0729b772 100644 --- a/tests/libtransmission/completion-test.cc +++ b/tests/libtransmission/completion-test.cc @@ -18,7 +18,7 @@ #include "test-fixtures.h" -using CompletionTest = ::libtransmission::test::TransmissionTest; +using CompletionTest = ::tr::test::TransmissionTest; namespace { diff --git a/tests/libtransmission/copy-test.cc b/tests/libtransmission/copy-test.cc index a3ffa72ad..592c57928 100644 --- a/tests/libtransmission/copy-test.cc +++ b/tests/libtransmission/copy-test.cc @@ -19,7 +19,7 @@ #include "test-fixtures.h" -namespace libtransmission::test +namespace tr::test { class CopyTest : public SandboxedTest @@ -88,4 +88,4 @@ TEST_F(CopyTest, copy) testImpl(filename1, filename2, random_file_length); } -} // namespace libtransmission::test +} // namespace tr::test diff --git a/tests/libtransmission/dht-test.cc b/tests/libtransmission/dht-test.cc index 6980118ca..ff7219092 100644 --- a/tests/libtransmission/dht-test.cc +++ b/tests/libtransmission/dht-test.cc @@ -59,14 +59,14 @@ using namespace std::literals; -namespace libtransmission::test +namespace tr::test { namespace { bool waitFor(struct event_base* event_base, std::chrono::milliseconds msec) { - return libtransmission::test::waitFor(event_base, []() { return false; }, msec); + return tr::test::waitFor(event_base, []() { return false; }, msec); } auto constexpr IdLength = size_t{ 20U }; @@ -267,7 +267,7 @@ protected: }; // Creates real timers, but with shortened intervals so that tests can run faster - class MockTimer final : public libtransmission::Timer + class MockTimer final : public tr::Timer { public: explicit MockTimer(std::unique_ptr real_timer) @@ -315,7 +315,7 @@ protected: }; // Creates MockTimers - class MockTimerMaker final : public libtransmission::TimerMaker + class MockTimerMaker final : public tr::TimerMaker { public: explicit MockTimerMaker(struct event_base* evb) @@ -359,7 +359,7 @@ protected: return config_dir_; } - [[nodiscard]] libtransmission::TimerMaker& timer_maker() override + [[nodiscard]] tr::TimerMaker& timer_maker() override { return mock_timer_maker_; } @@ -674,4 +674,4 @@ TEST_F(DhtTest, callsPeriodicPeriodically) EXPECT_NEAR(mock_dht.n_periodic_calls_, baseline + Periods, Periods / 2.0); } -} // namespace libtransmission::test +} // namespace tr::test diff --git a/tests/libtransmission/dns-test.cc b/tests/libtransmission/dns-test.cc index 36bb0d1be..888a8eb12 100644 --- a/tests/libtransmission/dns-test.cc +++ b/tests/libtransmission/dns-test.cc @@ -18,10 +18,10 @@ using namespace std::literals; -namespace libtransmission::test +namespace tr::test { -class EvDnsTest : public ::libtransmission::test::TransmissionTest +class EvDnsTest : public ::tr::test::TransmissionTest { protected: void SetUp() override @@ -171,4 +171,4 @@ TEST_F(EvDnsTest, doesCacheEntries) EXPECT_GT(res->second, 0); } -} // namespace libtransmission::test +} // namespace tr::test diff --git a/tests/libtransmission/file-piece-map-test.cc b/tests/libtransmission/file-piece-map-test.cc index 20621ba5b..8cd06b600 100644 --- a/tests/libtransmission/file-piece-map-test.cc +++ b/tests/libtransmission/file-piece-map-test.cc @@ -18,7 +18,7 @@ #include "test-fixtures.h" -class FilePieceMapTest : public ::libtransmission::test::TransmissionTest +class FilePieceMapTest : public ::tr::test::TransmissionTest { protected: static constexpr size_t PieceSize{ tr_block_info::BlockSize }; diff --git a/tests/libtransmission/file-test.cc b/tests/libtransmission/file-test.cc index 69a2a0882..f775c0670 100644 --- a/tests/libtransmission/file-test.cc +++ b/tests/libtransmission/file-test.cc @@ -46,7 +46,7 @@ using namespace std::literals; -namespace libtransmission::test +namespace tr::test { class FileTest : public SandboxedTest @@ -1388,4 +1388,4 @@ TEST_F(FileTest, dirOpen) EXPECT_FALSE(err) << err; } -} // namespace libtransmission::test +} // namespace tr::test diff --git a/tests/libtransmission/getopt-test.cc b/tests/libtransmission/getopt-test.cc index c3c576099..0dc730f6c 100644 --- a/tests/libtransmission/getopt-test.cc +++ b/tests/libtransmission/getopt-test.cc @@ -61,7 +61,7 @@ auto constexpr Options = std::array{ { static_assert(Options[std::size(Options) - 2].val != 0); } // namespace -class GetoptTest : public ::libtransmission::test::TransmissionTest +class GetoptTest : public ::tr::test::TransmissionTest { protected: static void runTest( // diff --git a/tests/libtransmission/handshake-test.cc b/tests/libtransmission/handshake-test.cc index 7ec4906df..22c6f79ab 100644 --- a/tests/libtransmission/handshake-test.cc +++ b/tests/libtransmission/handshake-test.cc @@ -45,7 +45,7 @@ using namespace std::literals; #define LOCAL_SOCKETPAIR_AF TR_IF_WIN32(AF_INET, AF_UNIX) -namespace libtransmission::test +namespace tr::test { auto constexpr MaxWaitMsec = 5000; @@ -84,7 +84,7 @@ public: return {}; } - [[nodiscard]] libtransmission::TimerMaker& timer_maker() override + [[nodiscard]] tr::TimerMaker& timer_maker() override { return session_->timerMaker(); } @@ -468,7 +468,7 @@ TEST_F(HandshakeTest, outgoingEncrypted) static auto constexpr WantedLen = tr_handshake::PadbMaxlen + std::tuple_size_v; static auto constexpr NeedleBase64 = "mbpZFBwdi4U1snVvboN3sMEpNmU="sv; auto const needle = tr_base64_decode(NeedleBase64); - auto buf = libtransmission::StackBuffer{}; + auto buf = tr::StackBuffer{}; ASSERT_TRUE(waitFor( [&s = sock, &buf, &needle, n_read = size_t{}]() mutable { @@ -525,4 +525,4 @@ TEST_F(HandshakeTest, outgoingEncrypted) tr_net_close_socket(sock); } -} // namespace libtransmission::test +} // namespace tr::test diff --git a/tests/libtransmission/ip-cache-test.cc b/tests/libtransmission/ip-cache-test.cc index d255bf92c..862f0d0e8 100644 --- a/tests/libtransmission/ip-cache-test.cc +++ b/tests/libtransmission/ip-cache-test.cc @@ -22,19 +22,19 @@ using namespace std::literals; -class IPCacheTest : public ::libtransmission::test::TransmissionTest +class IPCacheTest : public ::tr::test::TransmissionTest { protected: - class MockTimerMaker final : public libtransmission::TimerMaker + class MockTimerMaker final : public tr::TimerMaker { public: - [[nodiscard]] std::unique_ptr create() override + [[nodiscard]] std::unique_ptr create() override { return std::make_unique(); } }; - class MockTimer final : public libtransmission::Timer + class MockTimer final : public tr::Timer { void stop() override { @@ -70,7 +70,7 @@ protected: class MockMediator : public tr_ip_cache::Mediator { public: - [[nodiscard]] libtransmission::TimerMaker& timer_maker() override + [[nodiscard]] tr::TimerMaker& timer_maker() override { return timer_maker_; } diff --git a/tests/libtransmission/lpd-test.cc b/tests/libtransmission/lpd-test.cc index 970e01807..0c6ca9107 100644 --- a/tests/libtransmission/lpd-test.cc +++ b/tests/libtransmission/lpd-test.cc @@ -26,7 +26,7 @@ using namespace std::literals; -namespace libtransmission::test +namespace tr::test { using LpdTest = SessionTest; @@ -64,7 +64,7 @@ public: return torrents_; } - [[nodiscard]] libtransmission::TimerMaker& timerMaker() override + [[nodiscard]] tr::TimerMaker& timerMaker() override { return session_.timerMaker(); } @@ -219,4 +219,4 @@ TEST_F(LpdTest, DISABLED_DoesNotReannounceTooSoon) } } -} // namespace libtransmission::test +} // namespace tr::test diff --git a/tests/libtransmission/magnet-metainfo-test.cc b/tests/libtransmission/magnet-metainfo-test.cc index 1ceacab7b..693d918f1 100644 --- a/tests/libtransmission/magnet-metainfo-test.cc +++ b/tests/libtransmission/magnet-metainfo-test.cc @@ -13,7 +13,7 @@ #include "test-fixtures.h" -using MagnetMetainfoTest = ::libtransmission::test::TransmissionTest; +using MagnetMetainfoTest = ::tr::test::TransmissionTest; using namespace std::literals; TEST_F(MagnetMetainfoTest, magnetParse) diff --git a/tests/libtransmission/makemeta-test.cc b/tests/libtransmission/makemeta-test.cc index defa4cc9a..68ad48a28 100644 --- a/tests/libtransmission/makemeta-test.cc +++ b/tests/libtransmission/makemeta-test.cc @@ -29,7 +29,7 @@ using namespace std::literals; -namespace libtransmission::test +namespace tr::test { class MakemetaTest : public SandboxedTest @@ -292,4 +292,4 @@ TEST_F(MakemetaTest, privateAndSourceHasDifferentInfoHash) EXPECT_NE(private_metainfo.info_hash(), private_source_metainfo.info_hash()); } -} // namespace libtransmission::test +} // namespace tr::test diff --git a/tests/libtransmission/move-test.cc b/tests/libtransmission/move-test.cc index 7e3831169..ed7a8b594 100644 --- a/tests/libtransmission/move-test.cc +++ b/tests/libtransmission/move-test.cc @@ -26,7 +26,7 @@ using namespace std::literals; -namespace libtransmission::test +namespace tr::test { auto constexpr MaxWaitMsec = 5000; @@ -194,4 +194,4 @@ TEST_F(MoveTest, setLocation) tr_torrentRemove(tor, true); } -} // namespace libtransmission::test +} // namespace tr::test diff --git a/tests/libtransmission/net-test.cc b/tests/libtransmission/net-test.cc index 48d2e2bad..6e64e22ac 100644 --- a/tests/libtransmission/net-test.cc +++ b/tests/libtransmission/net-test.cc @@ -22,7 +22,7 @@ #include "test-fixtures.h" -using NetTest = ::libtransmission::test::TransmissionTest; +using NetTest = ::tr::test::TransmissionTest; using namespace std::literals; TEST_F(NetTest, conversionsIPv4) diff --git a/tests/libtransmission/open-files-test.cc b/tests/libtransmission/open-files-test.cc index 662d879a9..bc62e504b 100644 --- a/tests/libtransmission/open-files-test.cc +++ b/tests/libtransmission/open-files-test.cc @@ -25,7 +25,7 @@ using namespace std::literals; -using OpenFilesTest = libtransmission::test::SessionTest; +using OpenFilesTest = tr::test::SessionTest; static auto constexpr PreallocateFull = tr_open_files::Preallocation::Full; diff --git a/tests/libtransmission/peer-mgr-wishlist-test.cc b/tests/libtransmission/peer-mgr-wishlist-test.cc index 0ddfb4985..56c745d33 100644 --- a/tests/libtransmission/peer-mgr-wishlist-test.cc +++ b/tests/libtransmission/peer-mgr-wishlist-test.cc @@ -18,7 +18,7 @@ #include "test-fixtures.h" -class PeerMgrWishlistTest : public ::libtransmission::test::TransmissionTest +class PeerMgrWishlistTest : public ::tr::test::TransmissionTest { protected: struct MockMediator final : public Wishlist::Mediator @@ -85,114 +85,112 @@ protected: return piece_priority_[piece]; } - [[nodiscard]] libtransmission::ObserverTag observe_files_wanted_changed( - libtransmission::SimpleObservable::Observer observer) - override + [[nodiscard]] tr::ObserverTag observe_files_wanted_changed( + tr::SimpleObservable::Observer observer) override { return parent_.files_wanted_changed_.observe(std::move(observer)); } - [[nodiscard]] libtransmission::ObserverTag observe_peer_disconnect( - libtransmission::SimpleObservable::Observer observer) override + [[nodiscard]] tr::ObserverTag observe_peer_disconnect( + tr::SimpleObservable::Observer observer) override { return parent_.peer_disconnect_.observe(std::move(observer)); } - [[nodiscard]] libtransmission::ObserverTag observe_got_bad_piece( - libtransmission::SimpleObservable::Observer observer) override + [[nodiscard]] tr::ObserverTag observe_got_bad_piece( + tr::SimpleObservable::Observer observer) override { return parent_.got_bad_piece_.observe(std::move(observer)); } - [[nodiscard]] libtransmission::ObserverTag observe_got_bitfield( - libtransmission::SimpleObservable::Observer observer) override + [[nodiscard]] tr::ObserverTag observe_got_bitfield( + tr::SimpleObservable::Observer observer) override { return parent_.got_bitfield_.observe(std::move(observer)); } - [[nodiscard]] libtransmission::ObserverTag observe_got_block( - libtransmission::SimpleObservable::Observer observer) override + [[nodiscard]] tr::ObserverTag observe_got_block( + tr::SimpleObservable::Observer observer) override { return parent_.got_block_.observe(std::move(observer)); } - [[nodiscard]] libtransmission::ObserverTag observe_got_choke( - libtransmission::SimpleObservable::Observer observer) override + [[nodiscard]] tr::ObserverTag observe_got_choke( + tr::SimpleObservable::Observer observer) override { return parent_.got_choke_.observe(std::move(observer)); } - [[nodiscard]] libtransmission::ObserverTag observe_got_have( - libtransmission::SimpleObservable::Observer observer) override + [[nodiscard]] tr::ObserverTag observe_got_have( + tr::SimpleObservable::Observer observer) override { return parent_.got_have_.observe(std::move(observer)); } - [[nodiscard]] libtransmission::ObserverTag observe_got_have_all( - libtransmission::SimpleObservable::Observer observer) override + [[nodiscard]] tr::ObserverTag observe_got_have_all(tr::SimpleObservable::Observer observer) override { return parent_.got_have_all_.observe(std::move(observer)); } - [[nodiscard]] libtransmission::ObserverTag observe_got_reject( - libtransmission::SimpleObservable::Observer observer) override + [[nodiscard]] tr::ObserverTag observe_got_reject( + tr::SimpleObservable::Observer observer) override { return parent_.got_reject_.observe(std::move(observer)); } - [[nodiscard]] libtransmission::ObserverTag observe_piece_completed( - libtransmission::SimpleObservable::Observer observer) override + [[nodiscard]] tr::ObserverTag observe_piece_completed( + tr::SimpleObservable::Observer observer) override { return parent_.piece_completed_.observe(std::move(observer)); } - [[nodiscard]] libtransmission::ObserverTag observe_priority_changed( - libtransmission::SimpleObservable::Observer - observer) override + [[nodiscard]] tr::ObserverTag observe_priority_changed( + tr::SimpleObservable::Observer observer) + override { return parent_.priority_changed_.observe(std::move(observer)); } - [[nodiscard]] libtransmission::ObserverTag observe_sent_cancel( - libtransmission::SimpleObservable::Observer observer) override + [[nodiscard]] tr::ObserverTag observe_sent_cancel( + tr::SimpleObservable::Observer observer) override { return parent_.sent_cancel_.observe(std::move(observer)); } - [[nodiscard]] libtransmission::ObserverTag observe_sent_request( - libtransmission::SimpleObservable::Observer observer) override + [[nodiscard]] tr::ObserverTag observe_sent_request( + tr::SimpleObservable::Observer observer) override { return parent_.sent_request_.observe(std::move(observer)); } - [[nodiscard]] libtransmission::ObserverTag observe_sequential_download_changed( - libtransmission::SimpleObservable::Observer observer) override + [[nodiscard]] tr::ObserverTag observe_sequential_download_changed( + tr::SimpleObservable::Observer observer) override { return parent_.sequential_download_changed_.observe(std::move(observer)); } - [[nodiscard]] libtransmission::ObserverTag observe_sequential_download_from_piece_changed( - libtransmission::SimpleObservable::Observer observer) override + [[nodiscard]] tr::ObserverTag observe_sequential_download_from_piece_changed( + tr::SimpleObservable::Observer observer) override { return parent_.sequential_download_from_piece_changed_.observe(std::move(observer)); } }; - libtransmission::SimpleObservable files_wanted_changed_; - libtransmission::SimpleObservable peer_disconnect_; - libtransmission::SimpleObservable got_bad_piece_; - libtransmission::SimpleObservable got_bitfield_; - libtransmission::SimpleObservable got_block_; - libtransmission::SimpleObservable got_choke_; - libtransmission::SimpleObservable got_have_; - libtransmission::SimpleObservable got_have_all_; - libtransmission::SimpleObservable got_reject_; - libtransmission::SimpleObservable sent_cancel_; - libtransmission::SimpleObservable sent_request_; - libtransmission::SimpleObservable piece_completed_; - libtransmission::SimpleObservable priority_changed_; - libtransmission::SimpleObservable sequential_download_changed_; - libtransmission::SimpleObservable sequential_download_from_piece_changed_; + tr::SimpleObservable files_wanted_changed_; + tr::SimpleObservable peer_disconnect_; + tr::SimpleObservable got_bad_piece_; + tr::SimpleObservable got_bitfield_; + tr::SimpleObservable got_block_; + tr::SimpleObservable got_choke_; + tr::SimpleObservable got_have_; + tr::SimpleObservable got_have_all_; + tr::SimpleObservable got_reject_; + tr::SimpleObservable sent_cancel_; + tr::SimpleObservable sent_request_; + tr::SimpleObservable piece_completed_; + tr::SimpleObservable priority_changed_; + tr::SimpleObservable sequential_download_changed_; + tr::SimpleObservable sequential_download_from_piece_changed_; static auto constexpr PeerHasAllPieces = [](tr_piece_index_t) { diff --git a/tests/libtransmission/platform-test.cc b/tests/libtransmission/platform-test.cc index 230a7ba0a..de4a599bc 100644 --- a/tests/libtransmission/platform-test.cc +++ b/tests/libtransmission/platform-test.cc @@ -20,7 +20,7 @@ #include "test-fixtures.h" using namespace std::literals; -using PlatformTest = ::libtransmission::test::SessionTest; +using PlatformTest = ::tr::test::SessionTest; #ifdef _WIN32 #include diff --git a/tests/libtransmission/quark-test.cc b/tests/libtransmission/quark-test.cc index 5ef12c873..be4e49745 100644 --- a/tests/libtransmission/quark-test.cc +++ b/tests/libtransmission/quark-test.cc @@ -12,7 +12,7 @@ #include "test-fixtures.h" -using QuarkTest = ::libtransmission::test::TransmissionTest; +using QuarkTest = ::tr::test::TransmissionTest; TEST_F(QuarkTest, allPredefinedKeysCanBeLookedUp) { diff --git a/tests/libtransmission/remove-test.cc b/tests/libtransmission/remove-test.cc index 56223fb19..48a75d47e 100644 --- a/tests/libtransmission/remove-test.cc +++ b/tests/libtransmission/remove-test.cc @@ -23,7 +23,7 @@ using namespace std::literals; using SubpathAndSize = std::pair; -class RemoveTest : public libtransmission::test::SandboxedTest +class RemoveTest : public tr::test::SandboxedTest { protected: static constexpr std::string_view Content = "Hello, World!"sv; @@ -198,7 +198,7 @@ protected: filenames.emplace(filename); }; - libtransmission::test::depthFirstWalk(tr_pathbuf{ parent_dir }, file_func); + tr::test::depthFirstWalk(tr_pathbuf{ parent_dir }, file_func); return filenames; } diff --git a/tests/libtransmission/rename-test.cc b/tests/libtransmission/rename-test.cc index 9dbcbcec2..727e5c67f 100644 --- a/tests/libtransmission/rename-test.cc +++ b/tests/libtransmission/rename-test.cc @@ -29,7 +29,7 @@ struct tr_ctor; using namespace std::literals; -namespace libtransmission::test +namespace tr::test { class RenameTest : public SessionTest @@ -494,4 +494,4 @@ TEST_F(RenameTest, partialFile) torrentRemoveAndWait(tor, 0); } -} // namespace libtransmission::test +} // namespace tr::test diff --git a/tests/libtransmission/rpc-test.cc b/tests/libtransmission/rpc-test.cc index 41fc38352..ba62024df 100644 --- a/tests/libtransmission/rpc-test.cc +++ b/tests/libtransmission/rpc-test.cc @@ -26,7 +26,7 @@ struct tr_session; using namespace std::literals; -namespace libtransmission::test +namespace tr::test { using RpcTest = SessionTest; @@ -888,4 +888,4 @@ TEST_F(RpcTest, DISABLED_wellFormedLegacyFreeSpace) } } // namespace free_space_test -} // namespace libtransmission::test +} // namespace tr::test diff --git a/tests/libtransmission/serializer-tests.cc b/tests/libtransmission/serializer-tests.cc index 26126768c..746c27aca 100644 --- a/tests/libtransmission/serializer-tests.cc +++ b/tests/libtransmission/serializer-tests.cc @@ -19,9 +19,9 @@ #include "test-fixtures.h" -using SerializerTest = ::libtransmission::test::TransmissionTest; +using SerializerTest = ::tr::test::TransmissionTest; using namespace std::literals; -using libtransmission::serializer::Converters; +using tr::serializer::Converters; namespace { @@ -303,9 +303,9 @@ TEST_F(SerializerTest, optionalRejectsWrongType) // --- -using libtransmission::serializer::Field; -using libtransmission::serializer::load; -using libtransmission::serializer::save; +using tr::serializer::Field; +using tr::serializer::load; +using tr::serializer::save; struct Endpoint { diff --git a/tests/libtransmission/session-alt-speeds-test.cc b/tests/libtransmission/session-alt-speeds-test.cc index f4cd269cc..68c1cea71 100644 --- a/tests/libtransmission/session-alt-speeds-test.cc +++ b/tests/libtransmission/session-alt-speeds-test.cc @@ -14,7 +14,7 @@ using namespace std::literals; -class SessionAltSpeedsTest : public ::libtransmission::test::TransmissionTest +class SessionAltSpeedsTest : public ::tr::test::TransmissionTest { protected: using ChangeReason = tr_session_alt_speeds::ChangeReason; @@ -72,7 +72,7 @@ protected: } }; -namespace libtransmission::test +namespace tr::test { TEST_F(SessionAltSpeedsTest, canInstantiate) @@ -148,4 +148,4 @@ TEST_F(SessionAltSpeedsTest, canSchedule) EXPECT_EQ(now, mediator.changelog_[n_changes].timestamp); } -} // namespace libtransmission::test +} // namespace tr::test diff --git a/tests/libtransmission/session-test.cc b/tests/libtransmission/session-test.cc index 50ec2d742..0eabdf8bb 100644 --- a/tests/libtransmission/session-test.cc +++ b/tests/libtransmission/session-test.cc @@ -27,7 +27,7 @@ using namespace std::literals; -namespace libtransmission::test +namespace tr::test { TEST_F(SessionTest, propertiesApi) @@ -357,4 +357,4 @@ TEST_F(SessionTest, loadTorrentsThenMagnets) EXPECT_TRUE(tor->has_metainfo()); } -} // namespace libtransmission::test +} // namespace tr::test diff --git a/tests/libtransmission/settings-test.cc b/tests/libtransmission/settings-test.cc index b7bc4a5eb..953eff867 100644 --- a/tests/libtransmission/settings-test.cc +++ b/tests/libtransmission/settings-test.cc @@ -22,7 +22,7 @@ #include "test-fixtures.h" -using SettingsTest = ::libtransmission::test::TransmissionTest; +using SettingsTest = ::tr::test::TransmissionTest; using namespace std::literals; TEST_F(SettingsTest, canInstantiate) diff --git a/tests/libtransmission/strbuf-test.cc b/tests/libtransmission/strbuf-test.cc index 93b9c6424..91750837b 100644 --- a/tests/libtransmission/strbuf-test.cc +++ b/tests/libtransmission/strbuf-test.cc @@ -11,7 +11,7 @@ #include "test-fixtures.h" -using StrbufTest = ::libtransmission::test::TransmissionTest; +using StrbufTest = ::tr::test::TransmissionTest; using namespace std::literals; TEST_F(StrbufTest, append) diff --git a/tests/libtransmission/subprocess-test.cc b/tests/libtransmission/subprocess-test.cc index f7624403d..33cd0cb47 100644 --- a/tests/libtransmission/subprocess-test.cc +++ b/tests/libtransmission/subprocess-test.cc @@ -27,7 +27,7 @@ #define setenv(key, value, unused) SetEnvironmentVariableA(key, value) #endif -namespace libtransmission::test +namespace tr::test { namespace @@ -43,7 +43,7 @@ std::string getTestProgramPath(std::string_view const filename) } // unnamed namespace class SubprocessTest - : public ::libtransmission::test::TransmissionTest + : public ::tr::test::TransmissionTest , public testing::WithParamInterface { protected: @@ -296,4 +296,4 @@ INSTANTIATE_TEST_SUITE_P( ::testing::Values( // getTestProgramPath("subprocess-test")))); -} // namespace libtransmission::test +} // namespace tr::test diff --git a/tests/libtransmission/test-fixtures.h b/tests/libtransmission/test-fixtures.h index 79d11b695..d71af53a3 100644 --- a/tests/libtransmission/test-fixtures.h +++ b/tests/libtransmission/test-fixtures.h @@ -37,7 +37,7 @@ inline std::ostream& operator<<(std::ostream& os, tr_error const& err) return os; } -namespace libtransmission::test +namespace tr::test { using file_func_t = std::function; @@ -515,4 +515,4 @@ private: std::vector verified_; }; -} // namespace libtransmission::test +} // namespace tr::test diff --git a/tests/libtransmission/timer-test.cc b/tests/libtransmission/timer-test.cc index d2680c3cc..a1d92c4fa 100644 --- a/tests/libtransmission/timer-test.cc +++ b/tests/libtransmission/timer-test.cc @@ -16,7 +16,7 @@ #include "test-fixtures.h" -namespace libtransmission::test +namespace tr::test { class TimerTest : public TransmissionTest { @@ -368,4 +368,4 @@ TEST_F(TimerTest, destroyedTimersStop) EXPECT_EQ(0U, n_calls); } -} // namespace libtransmission::test +} // namespace tr::test diff --git a/tests/libtransmission/torrent-files-test.cc b/tests/libtransmission/torrent-files-test.cc index c5b85cee6..124401b3c 100644 --- a/tests/libtransmission/torrent-files-test.cc +++ b/tests/libtransmission/torrent-files-test.cc @@ -24,7 +24,7 @@ using namespace std::literals; -class TorrentFilesTest : public ::libtransmission::test::SandboxedTest +class TorrentFilesTest : public ::tr::test::SandboxedTest { }; diff --git a/tests/libtransmission/torrent-magnet-test.cc b/tests/libtransmission/torrent-magnet-test.cc index d6250b848..959434ee2 100644 --- a/tests/libtransmission/torrent-magnet-test.cc +++ b/tests/libtransmission/torrent-magnet-test.cc @@ -15,7 +15,7 @@ #include "test-fixtures.h" -namespace libtransmission::test +namespace tr::test { using TorrentMagnetTest = SessionTest; @@ -90,4 +90,4 @@ TEST_F(TorrentMagnetTest, setMetadataPiece) EXPECT_EQ(tor->get_metadata_percent(), 1.0); } -} // namespace libtransmission::test +} // namespace tr::test diff --git a/tests/libtransmission/torrent-metainfo-test.cc b/tests/libtransmission/torrent-metainfo-test.cc index 2c04c2c30..5a4e8d4a4 100644 --- a/tests/libtransmission/torrent-metainfo-test.cc +++ b/tests/libtransmission/torrent-metainfo-test.cc @@ -26,7 +26,7 @@ using namespace std::literals; -namespace libtransmission::test +namespace tr::test { using TorrentMetainfoTest = SessionTest; @@ -134,7 +134,7 @@ TEST_F(TorrentMetainfoTest, AndroidTorrent) TEST_F(TorrentMetainfoTest, ctorSaveContents) { - auto const sandbox = libtransmission::test::Sandbox::createSandbox(::testing::TempDir(), "transmission-test-XXXXXX"); + auto const sandbox = tr::test::Sandbox::createSandbox(::testing::TempDir(), "transmission-test-XXXXXX"); auto const src_filename = tr_pathbuf{ LIBTRANSMISSION_TEST_ASSETS_DIR, "/Android-x86 8.1 r6 iso.torrent"sv }; auto const tgt_filename = tr_pathbuf{ sandbox, "save-contents-test.torrent" }; @@ -213,4 +213,4 @@ TEST_F(TorrentMetainfoTest, parseBencOOBWrite) EXPECT_FALSE(tm.parse_benc(tr_base64_decode("ZGg0OmluZm9kNjpwaWVjZXMzOkFpzQ=="))); } -} // namespace libtransmission::test +} // namespace tr::test diff --git a/tests/libtransmission/torrent-queue-test.cc b/tests/libtransmission/torrent-queue-test.cc index 56d46e862..ffb00edb2 100644 --- a/tests/libtransmission/torrent-queue-test.cc +++ b/tests/libtransmission/torrent-queue-test.cc @@ -18,7 +18,7 @@ using namespace std::literals; -struct TorrentQueueTest : public libtransmission::test::SandboxedTest +struct TorrentQueueTest : public tr::test::SandboxedTest { class MockMediator final : public tr_torrent_queue::Mediator { diff --git a/tests/libtransmission/torrents-test.cc b/tests/libtransmission/torrents-test.cc index 334cb9262..6a24b0334 100644 --- a/tests/libtransmission/torrents-test.cc +++ b/tests/libtransmission/torrents-test.cc @@ -22,7 +22,7 @@ #include "test-fixtures.h" -using TorrentsTest = ::libtransmission::test::TransmissionTest; +using TorrentsTest = ::tr::test::TransmissionTest; using namespace std::literals; TEST_F(TorrentsTest, simpleTests) @@ -136,7 +136,7 @@ TEST_F(TorrentsTest, removedSince) EXPECT_EQ(remove, torrents.removedSince(50)); } -using TorrentsPieceSpanTest = libtransmission::test::SessionTest; +using TorrentsPieceSpanTest = tr::test::SessionTest; TEST_F(TorrentsPieceSpanTest, exposesFilePieceSpan) { diff --git a/tests/libtransmission/tr-peer-info-test.cc b/tests/libtransmission/tr-peer-info-test.cc index b8b49e170..7f8f30daa 100644 --- a/tests/libtransmission/tr-peer-info-test.cc +++ b/tests/libtransmission/tr-peer-info-test.cc @@ -19,7 +19,7 @@ using namespace std::literals; -using PeerInfoTest = ::libtransmission::test::TransmissionTest; +using PeerInfoTest = ::tr::test::TransmissionTest; TEST_F(PeerInfoTest, mergeConnectable) { diff --git a/tests/libtransmission/utils-apple-test.mm b/tests/libtransmission/utils-apple-test.mm index b1a2c790f..c887a883f 100644 --- a/tests/libtransmission/utils-apple-test.mm +++ b/tests/libtransmission/utils-apple-test.mm @@ -14,7 +14,7 @@ #include "test-fixtures.h" -using UtilsTest = ::libtransmission::test::TransmissionTest; +using UtilsTest = ::tr::test::TransmissionTest; using namespace std::literals; namespace diff --git a/tests/libtransmission/utils-test.cc b/tests/libtransmission/utils-test.cc index 92430115a..5becce87f 100644 --- a/tests/libtransmission/utils-test.cc +++ b/tests/libtransmission/utils-test.cc @@ -33,7 +33,7 @@ #include "test-fixtures.h" -using UtilsTest = ::libtransmission::test::TransmissionTest; +using UtilsTest = ::tr::test::TransmissionTest; using namespace std::literals; TEST_F(UtilsTest, trStrvContains) @@ -312,7 +312,7 @@ TEST_F(UtilsTest, saveFile) auto filename = tr_pathbuf{}; // save a file to GoogleTest's temp dir - auto const sandbox = libtransmission::test::Sandbox::createSandbox(::testing::TempDir(), "transmission-test-XXXXXX"); + auto const sandbox = tr::test::Sandbox::createSandbox(::testing::TempDir(), "transmission-test-XXXXXX"); filename.assign(sandbox, "filename.txt"sv); auto contents = "these are the contents"sv; auto error = tr_error{}; diff --git a/tests/libtransmission/values-test.cc b/tests/libtransmission/values-test.cc index eb84bde3f..e892326a6 100644 --- a/tests/libtransmission/values-test.cc +++ b/tests/libtransmission/values-test.cc @@ -7,8 +7,8 @@ #include "test-fixtures.h" -using ValuesTest = ::libtransmission::test::TransmissionTest; -using namespace libtransmission::Values; +using ValuesTest = ::tr::test::TransmissionTest; +using namespace tr::Values; TEST_F(ValuesTest, baseQuantity) { diff --git a/tests/libtransmission/variant-test.cc b/tests/libtransmission/variant-test.cc index 3de14d9ae..03c10728a 100644 --- a/tests/libtransmission/variant-test.cc +++ b/tests/libtransmission/variant-test.cc @@ -26,7 +26,7 @@ #include "test-fixtures.h" -using VariantTest = ::libtransmission::test::TransmissionTest; +using VariantTest = ::tr::test::TransmissionTest; using namespace std::literals; namespace @@ -142,7 +142,7 @@ TEST_F(VariantTest, parseInt) static auto constexpr ExpectVal = int64_t{ 64 }; auto benc = Benc; - auto const value = transmission::benc::impl::ParseInt(&benc); + auto const value = tr::benc::impl::ParseInt(&benc); ASSERT_TRUE(value); EXPECT_EQ(ExpectVal, *value); EXPECT_EQ(std::data(Benc) + std::size(Benc), std::data(benc)); @@ -153,7 +153,7 @@ TEST_F(VariantTest, parseIntWithMissingEnd) static auto constexpr Benc = "i64"sv; auto benc = Benc; - EXPECT_FALSE(transmission::benc::impl::ParseInt(&benc)); + EXPECT_FALSE(tr::benc::impl::ParseInt(&benc)); EXPECT_EQ(std::data(Benc), std::data(benc)); } @@ -162,7 +162,7 @@ TEST_F(VariantTest, parseIntEmptyBuffer) static auto constexpr Benc = ""sv; auto benc = Benc; - EXPECT_FALSE(transmission::benc::impl::ParseInt(&benc)); + EXPECT_FALSE(tr::benc::impl::ParseInt(&benc)); EXPECT_EQ(std::data(Benc), std::data(benc)); } @@ -171,7 +171,7 @@ TEST_F(VariantTest, parseIntWithBadDigits) static auto constexpr Benc = "i6z4e"sv; auto benc = Benc; - EXPECT_FALSE(transmission::benc::impl::ParseInt(&benc)); + EXPECT_FALSE(tr::benc::impl::ParseInt(&benc)); EXPECT_EQ(std::data(Benc), std::data(benc)); } @@ -181,7 +181,7 @@ TEST_F(VariantTest, parseNegativeInt) static auto constexpr Expected = int64_t{ -3 }; auto benc = Benc; - auto const value = transmission::benc::impl::ParseInt(&benc); + auto const value = tr::benc::impl::ParseInt(&benc); ASSERT_TRUE(value); EXPECT_EQ(Expected, *value); EXPECT_EQ(std::data(Benc) + std::size(Benc), std::data(benc)); @@ -192,7 +192,7 @@ TEST_F(VariantTest, parseNegativeWithLeadingZero) static auto constexpr Benc = "i-03e"sv; auto benc = Benc; - EXPECT_FALSE(transmission::benc::impl::ParseInt(&benc)); + EXPECT_FALSE(tr::benc::impl::ParseInt(&benc)); EXPECT_EQ(std::data(Benc), std::data(benc)); } @@ -202,7 +202,7 @@ TEST_F(VariantTest, parseIntZero) static auto constexpr Expected = int64_t{ 0 }; auto benc = Benc; - auto const value = transmission::benc::impl::ParseInt(&benc); + auto const value = tr::benc::impl::ParseInt(&benc); ASSERT_TRUE(value); EXPECT_EQ(Expected, *value); EXPECT_EQ(std::data(Benc) + std::size(Benc), std::data(benc)); @@ -213,13 +213,13 @@ TEST_F(VariantTest, parseIntWithLeadingZero) static auto constexpr Benc = "i04e"sv; auto benc = Benc; - EXPECT_FALSE(transmission::benc::impl::ParseInt(&benc)); + EXPECT_FALSE(tr::benc::impl::ParseInt(&benc)); EXPECT_EQ(std::data(Benc), std::data(benc)); } TEST_F(VariantTest, str) { - using namespace transmission::benc::impl; + using namespace tr::benc::impl; // string len is designed to overflow auto benc = "99999999999999999999:boat"sv; diff --git a/tests/libtransmission/watchdir-test.cc b/tests/libtransmission/watchdir-test.cc index 7d67ea6af..fea8b23f2 100644 --- a/tests/libtransmission/watchdir-test.cc +++ b/tests/libtransmission/watchdir-test.cc @@ -44,7 +44,7 @@ static auto constexpr RetryDuration = 100ms; static auto constexpr ProcessEventsTimeout = 300ms; static_assert(ProcessEventsTimeout > GenericRescanInterval); -namespace libtransmission::test +namespace tr::test { enum class WatchMode : uint8_t @@ -59,14 +59,14 @@ class WatchDirTest { private: std::shared_ptr ev_base_; - std::unique_ptr timer_maker_; + std::unique_ptr timer_maker_; protected: void SetUp() override { SandboxedTest::SetUp(); ev_base_.reset(event_base_new(), event_base_free); - timer_maker_ = std::make_unique(ev_base_.get()); + timer_maker_ = std::make_unique(ev_base_.get()); Watchdir::set_generic_rescan_interval(GenericRescanInterval); } @@ -261,4 +261,4 @@ INSTANTIATE_TEST_SUITE_P( // WatchMode::NATIVE, WatchMode::GENERIC)); -} // namespace libtransmission::test +} // namespace tr::test diff --git a/tests/libtransmission/web-utils-test.cc b/tests/libtransmission/web-utils-test.cc index 4288dcdcf..d6cdced89 100644 --- a/tests/libtransmission/web-utils-test.cc +++ b/tests/libtransmission/web-utils-test.cc @@ -20,7 +20,7 @@ #include "test-fixtures.h" -using WebUtilsTest = ::libtransmission::test::TransmissionTest; +using WebUtilsTest = ::tr::test::TransmissionTest; using namespace std::literals; TEST_F(WebUtilsTest, urlParse) diff --git a/tests/qt/rpcclient-test.cc b/tests/qt/rpcclient-test.cc index af448349d..038331f28 100644 --- a/tests/qt/rpcclient-test.cc +++ b/tests/qt/rpcclient-test.cc @@ -15,7 +15,7 @@ #include "RpcClient.h" #include "rpc-test-fixtures.h" -namespace api_compat = libtransmission::api_compat; +namespace api_compat = tr::api_compat; using Style = api_compat::Style; Q_DECLARE_METATYPE(Style) diff --git a/tests/qt/session-test.cc b/tests/qt/session-test.cc index 3d1305936..eea8891dd 100644 --- a/tests/qt/session-test.cc +++ b/tests/qt/session-test.cc @@ -24,7 +24,7 @@ #define QCOMPARE_NE(actual, expected) QVERIFY((actual) != (expected)) #endif -namespace api_compat = libtransmission::api_compat; +namespace api_compat = tr::api_compat; using Style = api_compat::Style; Q_DECLARE_METATYPE(Style) diff --git a/utils/create.cc b/utils/create.cc index 1b34d5893..6446faa46 100644 --- a/utils/create.cc +++ b/utils/create.cc @@ -32,7 +32,7 @@ using namespace std::literals; -using namespace libtransmission::Values; +using namespace tr::Values; namespace { diff --git a/utils/remote.cc b/utils/remote.cc index 43a9c93af..571d30979 100644 --- a/utils/remote.cc +++ b/utils/remote.cc @@ -42,8 +42,8 @@ using namespace std::literals; -namespace api_compat = libtransmission::api_compat; -using namespace libtransmission::Values; +namespace api_compat = tr::api_compat; +using namespace tr::Values; #define SPEED_K_STR "kB/s" #define MEM_M_STR "MiB" diff --git a/utils/show.cc b/utils/show.cc index a991fd172..7ad1a4018 100644 --- a/utils/show.cc +++ b/utils/show.cc @@ -37,7 +37,7 @@ #include using namespace std::literals; -using namespace libtransmission::Values; +using namespace tr::Values; namespace {