squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-19 23:17:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation on MSVC2013 by moving unicode strings to

Browse Source 
"unicodestrings.h". Closes #3059.

Conflicts:
	src/core/misc.cpp
	src/gui/addnewtorrentdialog.cpp
	src/gui/options_imp.cpp
	src/gui/properties/propertieswidget.cpp
	src/gui/transferlistdelegate.cpp
This commit is contained in:
Chocobo1
2015-06-15 17:36:14 +08:00
committed by sledgehammer999
parent 07e2e88e79
commit 04e582793e
8 changed files with 187 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/misc.cpp
View File

@@ -28,6 +28,7 @@
* Contact : chris@qbittorrent.org
*/
#include "core/unicodestrings.h"
#include "misc.h"
#include <cmath>
@@ -405,7 +406,7 @@ QString misc::magnetUriToHash(const QString& magnet_uri)
QString misc::userFriendlyDuration(qlonglong seconds)
{
if (seconds < 0 || seconds >= MAX_ETA)
return QString::fromUtf8("∞");
return QString::fromUtf8(C_INFINITY);
if (seconds == 0)
return "0";
if (seconds < 60)
@@ -421,7 +422,7 @@ QString misc::userFriendlyDuration(qlonglong seconds)
hours = hours - days * 24;
if (days < 100)
return QCoreApplication::translate("misc", "%1d %2h", "e.g: 2days 10hours").arg(QString::number(days)).arg(QString::number(hours));
return QString::fromUtf8("∞");
return QString::fromUtf8(C_INFINITY);
}
QString misc::getUserIDString()