diff --git a/cli/cli.cc b/cli/cli.cc index f6be48708..82606d5da 100644 --- a/cli/cli.cc +++ b/cli/cli.cc @@ -450,7 +450,7 @@ int tr_main(int argc, char* argv[]) } auto const status_str = getStatusStr(st); - printf("\r%-*s", TR_ARG_TUPLE(LineWidth, status_str.c_str())); + printf("\r%-*s", LineWidth, status_str.c_str()); if (messageName[st->error]) { diff --git a/libtransmission/tr-macros.h b/libtransmission/tr-macros.h index 1eb57ff07..d08845604 100644 --- a/libtransmission/tr-macros.h +++ b/libtransmission/tr-macros.h @@ -70,9 +70,6 @@ #define TR_ADDRSTRLEN 64 -// Mostly to enforce better formatting -#define TR_ARG_TUPLE(...) __VA_ARGS__ - // https://www.bittorrent.org/beps/bep_0007.html // "The client SHOULD include a key parameter in its announces. The key // should remain the same for a particular infohash during a torrent diff --git a/qt/Prefs.cc b/qt/Prefs.cc index b0607d960..8c980a5bf 100644 --- a/qt/Prefs.cc +++ b/qt/Prefs.cc @@ -49,8 +49,10 @@ void ensureSoundCommandIsAList(tr_variant* dict) key, std::array{ "canberra-gtk-play", - TR_ARG_TUPLE("-i", "complete-download"), - TR_ARG_TUPLE("-d", "transmission torrent downloaded"), + "-i", + "complete-download", + "-d", + "transmission torrent downloaded", }); }