diff --git a/.travis.yml b/.travis.yml index 7c5392eff..d7bd38a3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -147,7 +147,7 @@ install: sudo dpkg -i "$HOME/travis/deb/libtorrent-rasterbar-dev_1.2.x_amd64.deb" "$HOME/travis/deb/libtorrent-rasterbar10_1.2.x_amd64.deb" fi - - | + - | if [ "$libt_branch" = "RC_1_1" ] && [ "$TRAVIS_OS_NAME" = "osx" ]; then wget https://builds.shiki.hu/travis/brew/1_1/version if ! cmp --quiet "version" "$HOME/travis/brew/1_1/version" ; then diff --git a/src/base/utils/misc.cpp b/src/base/utils/misc.cpp index 39c066f75..6514abf8f 100644 --- a/src/base/utils/misc.cpp +++ b/src/base/utils/misc.cpp @@ -80,13 +80,13 @@ namespace if (sizeInBytes < 0) return false; int i = 0; - auto rawVal = static_cast(sizeInBytes); + val = static_cast(sizeInBytes); - while ((rawVal >= 1024.) && (i <= static_cast(Utils::Misc::SizeUnit::ExbiByte))) { - rawVal /= 1024.; + while ((val >= 1024.) && (i <= static_cast(Utils::Misc::SizeUnit::ExbiByte))) { + val /= 1024.; ++i; } - val = rawVal; + unit = static_cast(i); return true; } @@ -250,13 +250,20 @@ QString Utils::Misc::friendlyUnit(const qint64 bytesValue, const bool isSpeed) + unitString(unit, isSpeed); } -int Utils::Misc::friendlyUnitPrecision(SizeUnit unit) +int Utils::Misc::friendlyUnitPrecision(const SizeUnit unit) { // friendlyUnit's number of digits after the decimal point - if (unit == SizeUnit::Byte) return 0; - if (unit <= SizeUnit::MebiByte) return 1; - if (unit == SizeUnit::GibiByte) return 2; - return 3; + switch (unit) { + case SizeUnit::Byte: + return 0; + case SizeUnit::KibiByte: + case SizeUnit::MebiByte: + return 1; + case SizeUnit::GibiByte: + return 2; + default: + return 3; + } } qlonglong Utils::Misc::sizeInBytes(qreal size, const Utils::Misc::SizeUnit unit)