mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-20 11:43:21 +02:00
yuzu/util: Specify string conversions explicitly
Allows the util code to build with implicit string conversions disabled.
This commit is contained in:
parent
0adb54abc1
commit
317f1263fb
@ -8,7 +8,7 @@
|
|||||||
#include "yuzu/util/util.h"
|
#include "yuzu/util/util.h"
|
||||||
|
|
||||||
QFont GetMonospaceFont() {
|
QFont GetMonospaceFont() {
|
||||||
QFont font("monospace");
|
QFont font(QStringLiteral("monospace"));
|
||||||
// Automatic fallback to a monospace font on on platforms without a font called "monospace"
|
// Automatic fallback to a monospace font on on platforms without a font called "monospace"
|
||||||
font.setStyleHint(QFont::Monospace);
|
font.setStyleHint(QFont::Monospace);
|
||||||
font.setFixedPitch(true);
|
font.setFixedPitch(true);
|
||||||
@ -16,14 +16,16 @@ QFont GetMonospaceFont() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
QString ReadableByteSize(qulonglong size) {
|
QString ReadableByteSize(qulonglong size) {
|
||||||
static const std::array<const char*, 6> units = {"B", "KiB", "MiB", "GiB", "TiB", "PiB"};
|
static constexpr std::array units{"B", "KiB", "MiB", "GiB", "TiB", "PiB"};
|
||||||
if (size == 0)
|
if (size == 0) {
|
||||||
return "0";
|
return QStringLiteral("0");
|
||||||
int digit_groups = std::min<int>(static_cast<int>(std::log10(size) / std::log10(1024)),
|
}
|
||||||
static_cast<int>(units.size()));
|
|
||||||
return QString("%L1 %2")
|
const int digit_groups = std::min(static_cast<int>(std::log10(size) / std::log10(1024)),
|
||||||
|
static_cast<int>(units.size()));
|
||||||
|
return QStringLiteral("%L1 %2")
|
||||||
.arg(size / std::pow(1024, digit_groups), 0, 'f', 1)
|
.arg(size / std::pow(1024, digit_groups), 0, 'f', 1)
|
||||||
.arg(units[digit_groups]);
|
.arg(QString::fromUtf8(units[digit_groups]));
|
||||||
}
|
}
|
||||||
|
|
||||||
QPixmap CreateCirclePixmapFromColor(const QColor& color) {
|
QPixmap CreateCirclePixmapFromColor(const QColor& color) {
|
||||||
|
Loading…
Reference in New Issue
Block a user