Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-24 20:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make some utility functions return std::string to simplify code (#2368)

Browse Source 
* tr_formatter_speed_KBps returns std::string

* tr_formatter_mem_B returns std::string

* tr_formatter_size_B returns std::string

* tr_strpercent/tr_strratio returns std::string
This commit is contained in:
Mike Gelfand
2021-12-31 00:30:21 +00:00
committed by GitHub
parent 26110d5c8e
commit d8d361e491
15 changed files with 146 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gtk/SystemTrayIcon.cc
View File

@@ -92,51 +92,31 @@ void SystemTrayIcon::Impl::refresh()
{
double KBps;
double limit;
char up[64];
Glib::ustring upLimit;
char down[64];
Glib::ustring downLimit;
char const* idle = _("Idle");
char const* const idle = _("Idle");
auto* session = core_->get_session();
/* up */
KBps = tr_sessionGetRawSpeed_KBps(session, TR_UP);
if (KBps < 0.001)
{
g_strlcpy(up, idle, sizeof(up));
}
else
{
tr_formatter_speed_KBps(up, KBps, sizeof(up));
}
auto const up = KBps < 0.001 ? idle : tr_formatter_speed_KBps(KBps);
/* up limit */
if (tr_sessionGetActiveSpeedLimit_KBps(session, TR_UP, &limit))
{
char buf[64];
tr_formatter_speed_KBps(buf, limit, sizeof(buf));
upLimit = gtr_sprintf(_(" (Limit: %s)"), buf);
upLimit = gtr_sprintf(_(" (Limit: %s)"), tr_formatter_speed_KBps(limit));
}
/* down */
KBps = tr_sessionGetRawSpeed_KBps(session, TR_DOWN);
if (KBps < 0.001)
{
g_strlcpy(down, idle, sizeof(down));
}
else
{
tr_formatter_speed_KBps(down, KBps, sizeof(down));
}
auto const down = KBps < 0.001 ? idle : tr_formatter_speed_KBps(KBps);
/* down limit */
if (tr_sessionGetActiveSpeedLimit_KBps(session, TR_DOWN, &limit))
{
char buf[64];
tr_formatter_speed_KBps(buf, limit, sizeof(buf));
downLimit = gtr_sprintf(_(" (Limit: %s)"), buf);
downLimit = gtr_sprintf(_(" (Limit: %s)"), tr_formatter_speed_KBps(limit));
}
/* %1$s: current upload speed