summaryrefslogtreecommitdiff
path: root/src/citra_qt/util/util.cpp
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2016-09-21 11:29:48 -0700
committerGravatar GitHub2016-09-21 11:29:48 -0700
commitd5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a (patch)
tree8a22ca73ff838f3f0090b29a548ae81087fc90ed /src/citra_qt/util/util.cpp
parentREADME: Specify master branch for Travis CI badge (diff)
parentFix Travis clang-format check (diff)
downloadyuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.tar.gz
yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.tar.xz
yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.zip
Merge pull request #2086 from linkmauve/clang-format
Add clang-format as part of our {commit,travis}-time checks
Diffstat (limited to 'src/citra_qt/util/util.cpp')
-rw-r--r--src/citra_qt/util/util.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/citra_qt/util/util.cpp b/src/citra_qt/util/util.cpp
index 2f9beb5cc..02be92bbd 100644
--- a/src/citra_qt/util/util.cpp
+++ b/src/citra_qt/util/util.cpp
@@ -4,7 +4,6 @@
4 4
5#include <array> 5#include <array>
6#include <cmath> 6#include <cmath>
7
8#include "citra_qt/util/util.h" 7#include "citra_qt/util/util.h"
9 8
10QFont GetMonospaceFont() { 9QFont GetMonospaceFont() {
@@ -16,10 +15,12 @@ QFont GetMonospaceFont() {
16} 15}
17 16
18QString ReadableByteSize(qulonglong size) { 17QString ReadableByteSize(qulonglong size) {
19 static const std::array<const char*, 6> units = { "B", "KiB", "MiB", "GiB", "TiB", "PiB" }; 18 static const std::array<const char*, 6> units = {"B", "KiB", "MiB", "GiB", "TiB", "PiB"};
20 if (size == 0) 19 if (size == 0)
21 return "0"; 20 return "0";
22 int digit_groups = std::min<int>(static_cast<int>(std::log10(size) / std::log10(1024)), static_cast<int>(units.size())); 21 int digit_groups = std::min<int>(static_cast<int>(std::log10(size) / std::log10(1024)),
23 return QString("%L1 %2").arg(size / std::pow(1024, digit_groups), 0, 'f', 1) 22 static_cast<int>(units.size()));
24 .arg(units[digit_groups]); 23 return QString("%L1 %2")
24 .arg(size / std::pow(1024, digit_groups), 0, 'f', 1)
25 .arg(units[digit_groups]);
25} 26}