diff --git a/src/properties/propertieswidget.cpp b/src/properties/propertieswidget.cpp index de83ccce2..7c32dcf7d 100644 --- a/src/properties/propertieswidget.cpp +++ b/src/properties/propertieswidget.cpp @@ -317,14 +317,8 @@ void PropertiesWidget::loadDynamicData() { wasted->setText(misc::friendlyUnit(h.total_failed_bytes()+h.total_redundant_bytes())); upTotal->setText(misc::friendlyUnit(h.all_time_upload()) + " ("+misc::friendlyUnit(h.total_payload_upload())+" "+tr("this session")+")"); dlTotal->setText(misc::friendlyUnit(h.all_time_download()) + " ("+misc::friendlyUnit(h.total_payload_download())+" "+tr("this session")+")"); - if (h.upload_limit() <= 0) - lbl_uplimit->setText(QString::fromUtf8("∞")); - else - lbl_uplimit->setText(misc::friendlyUnit(h.upload_limit())+tr("/s", "/second (i.e. per second)")); - if (h.download_limit() <= 0) - lbl_dllimit->setText(QString::fromUtf8("∞")); - else - lbl_dllimit->setText(misc::friendlyUnit(h.download_limit())+tr("/s", "/second (i.e. per second)")); + lbl_uplimit->setText(h.upload_limit() <= 0 ? QString::fromUtf8("∞") : misc::friendlyUnit(h.upload_limit())+tr("/s", "/second (i.e. per second)")); + lbl_dllimit->setText(h.download_limit() <= 0 ? QString::fromUtf8("∞") : misc::friendlyUnit(h.download_limit())+tr("/s", "/second (i.e. per second)")); QString elapsed_txt = misc::userFriendlyDuration(h.active_time()); if (h.is_seed()) { elapsed_txt += " ("+tr("Seeded for %1", "e.g. Seeded for 3m10s").arg(misc::userFriendlyDuration(h.seeding_time()))+")"; @@ -338,10 +332,9 @@ void PropertiesWidget::loadDynamicData() { reannounce_lbl->setText(h.next_announce()); // Update ratio info const qreal ratio = QBtSession::instance()->getRealRatio(h.hash()); - if (ratio > QBtSession::MAX_RATIO) - shareRatio->setText(QString::fromUtf8("∞")); - else - shareRatio->setText(QString(QByteArray::number(ratio, 'f', 2))); + /* HACK because QString rounds up. Eg QString::number(0.999*100.0, 'f' ,1) == 99.9 + ** but QString::number(0.9999*100.0, 'f' ,1) == 100.0 */ + shareRatio->setText(ratio > QBtSession::MAX_RATIO ? QString::fromUtf8("∞") : QString::number((int)(ratio*100)/100.0, 'f', 2)); if (!h.is_seed()) { showPiecesDownloaded(true); // Downloaded pieces diff --git a/src/rss/feedlistwidget.cpp b/src/rss/feedlistwidget.cpp index 50834cdcb..259502593 100644 --- a/src/rss/feedlistwidget.cpp +++ b/src/rss/feedlistwidget.cpp @@ -40,7 +40,7 @@ FeedListWidget::FeedListWidget(QWidget *parent, const RssManagerPtr& rssmanager) setColumnCount(1); headerItem()->setText(0, tr("RSS feeds")); m_unreadStickyItem = new QTreeWidgetItem(this); - m_unreadStickyItem->setText(0, tr("Unread") + QString::fromUtf8(" (") + QString::number(rssmanager->unreadCount(), 10)+ QString(")")); + m_unreadStickyItem->setText(0, tr("Unread") + QString::fromUtf8(" (") + QString::number(rssmanager->unreadCount())+ QString(")")); m_unreadStickyItem->setData(0,Qt::DecorationRole, IconProvider::instance()->getIcon("mail-folder-inbox")); itemAdded(m_unreadStickyItem, rssmanager); connect(this, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), SLOT(updateCurrentFeed(QTreeWidgetItem*))); diff --git a/src/rss/rss_imp.cpp b/src/rss/rss_imp.cpp index 75b3af51d..82438c3e4 100644 --- a/src/rss/rss_imp.cpp +++ b/src/rss/rss_imp.cpp @@ -456,7 +456,7 @@ QTreeWidgetItem* RSSImp::createFolderListItem(const RssFilePtr& rssFile) { Q_ASSERT(rssFile); QTreeWidgetItem* item = new QTreeWidgetItem; - item->setData(0, Qt::DisplayRole, QVariant(rssFile->displayName()+ QString::fromUtf8(" (")+QString::number(rssFile->unreadCount(), 10)+QString(")"))); + item->setData(0, Qt::DisplayRole, QVariant(rssFile->displayName()+ QString::fromUtf8(" (")+QString::number(rssFile->unreadCount())+QString(")"))); item->setData(0, Qt::DecorationRole, rssFile->icon()); return item; @@ -619,7 +619,7 @@ void RSSImp::updateItemInfos(QTreeWidgetItem *item) name = tr("Unread"); else name = rss_item->displayName(); - item->setText(0, name + QString::fromUtf8(" (") + QString::number(rss_item->unreadCount(), 10)+ QString(")")); + item->setText(0, name + QString::fromUtf8(" (") + QString::number(rss_item->unreadCount())+ QString(")")); // If item has a parent, update it too if (item->parent()) updateItemInfos(item->parent()); diff --git a/src/searchengine/searchlistdelegate.h b/src/searchengine/searchlistdelegate.h index ca3cd14f6..98a55d085 100644 --- a/src/searchengine/searchlistdelegate.h +++ b/src/searchengine/searchlistdelegate.h @@ -32,7 +32,6 @@ #define SEARCHLISTDELEGATE_H #include -#include #include #include #include diff --git a/src/transferlistdelegate.h b/src/transferlistdelegate.h index 101ec470f..2dfd20409 100644 --- a/src/transferlistdelegate.h +++ b/src/transferlistdelegate.h @@ -33,12 +33,9 @@ #include #include -#include -#include #include #include #include -#include #include "misc.h" #include "torrentmodel.h" #include "qbtsession.h" @@ -133,12 +130,9 @@ public: QItemDelegate::drawBackground(painter, opt, index); const qlonglong limit = index.data().toLongLong(); opt.displayAlignment = Qt::AlignRight; - if (limit > 0) - /* HACK because QString rounds up. Eg QString::number(0.999*100.0, 'f' ,1) == 99.9 - ** but QString::number(0.9999*100.0, 'f' ,1) == 100.0 */ - QItemDelegate::drawDisplay(painter, opt, opt.rect, QString::number((int)((limit/1024.)*10)/10.0, 'f', 1) + " " + tr("KiB/s", "KiB/second (.i.e per second)")); - else - QItemDelegate::drawDisplay(painter, opt, opt.rect, QString::fromUtf8("∞")); + /* HACK because QString rounds up. Eg QString::number(0.999*100.0, 'f' ,1) == 99.9 + ** but QString::number(0.9999*100.0, 'f' ,1) == 100.0 */ + QItemDelegate::drawDisplay(painter, opt, opt.rect, limit > 0 ? QString::number((int)((limit/1024.)*10)/10.0, 'f', 1) + " " + tr("KiB/s", "KiB/second (.i.e per second)") : QString::fromUtf8("∞")); break; } case TorrentModelItem::TR_TIME_ELAPSED: { @@ -159,12 +153,9 @@ public: QItemDelegate::drawBackground(painter, opt, index); opt.displayAlignment = Qt::AlignRight; const qreal ratio = index.data().toDouble(); - if (ratio > QBtSession::MAX_RATIO) - QItemDelegate::drawDisplay(painter, opt, opt.rect, QString::fromUtf8("∞")); - else - /* HACK because QString rounds up. Eg QString::number(0.999*100.0, 'f' ,1) == 99.9 - ** but QString::number(0.9999*100.0, 'f' ,1) == 100.0 */ - QItemDelegate::drawDisplay(painter, opt, opt.rect, QString::number((int)(ratio*100)/100.0, 'f', 2)); + /* HACK because QString rounds up. Eg QString::number(0.999*100.0, 'f' ,1) == 99.9 + ** but QString::number(0.9999*100.0, 'f' ,1) == 100.0 */ + QItemDelegate::drawDisplay(painter, opt, opt.rect, ratio > QBtSession::MAX_RATIO ? QString::fromUtf8("∞") : QString::number((int)(ratio*100)/100.0, 'f', 2)); break; } case TorrentModelItem::TR_PRIORITY: { diff --git a/src/webui/btjson.cpp b/src/webui/btjson.cpp index 2957bb148..52da45303 100644 --- a/src/webui/btjson.cpp +++ b/src/webui/btjson.cpp @@ -299,14 +299,8 @@ QString btjson::getPropertiesForTorrent(const QString& hash) data.add(KEY_PROP_WASTED, misc::friendlyUnit(h.total_failed_bytes() + h.total_redundant_bytes())); data.add(KEY_PROP_UPLOADED, QString(misc::friendlyUnit(h.all_time_upload()) + " (" + misc::friendlyUnit(h.total_payload_upload()) + " " + tr("this session") + ")")); data.add(KEY_PROP_DOWNLOADED, QString(misc::friendlyUnit(h.all_time_download()) + " (" + misc::friendlyUnit(h.total_payload_download()) + " " + tr("this session") + ")")); - if (h.upload_limit() <= 0) - data.add(KEY_PROP_UP_LIMIT, QString::fromUtf8("∞")); - else - data.add(KEY_PROP_UP_LIMIT, misc::friendlyUnit(h.upload_limit(), true)); - if (h.download_limit() <= 0) - data.add(KEY_PROP_DL_LIMIT, QString::fromUtf8("∞")); - else - data.add(KEY_PROP_DL_LIMIT, misc::friendlyUnit(h.download_limit(), true)); + data.add(KEY_PROP_UP_LIMIT, h.upload_limit() <= 0 ? QString::fromUtf8("∞") : misc::friendlyUnit(h.upload_limit(), true)); + data.add(KEY_PROP_DL_LIMIT, h.download_limit() <= 0 ? QString::fromUtf8("∞") : misc::friendlyUnit(h.download_limit(), true)); QString elapsed_txt = misc::userFriendlyDuration(h.active_time()); if (h.is_seed()) elapsed_txt += " ("+tr("Seeded for %1", "e.g. Seeded for 3m10s").arg(misc::userFriendlyDuration(h.seeding_time()))+")";