summaryrefslogtreecommitdiffstats
path: root/src/citra
diff options
context:
space:
mode:
authorAlexander Laties <alex.laties@gmail.com>2016-04-25 22:10:03 +0200
committerAlexander Laties <alex.laties@gmail.com>2016-05-07 17:41:55 +0200
commit0a31e373f1728316b3dfed391ddcb99a474e4102 (patch)
tree1b1bcf1af2398481e7208610f6a2e49264fe11db /src/citra
parentMerge pull request #1736 from MerryMage/sdl2-sink (diff)
downloadyuzu-0a31e373f1728316b3dfed391ddcb99a474e4102.tar
yuzu-0a31e373f1728316b3dfed391ddcb99a474e4102.tar.gz
yuzu-0a31e373f1728316b3dfed391ddcb99a474e4102.tar.bz2
yuzu-0a31e373f1728316b3dfed391ddcb99a474e4102.tar.lz
yuzu-0a31e373f1728316b3dfed391ddcb99a474e4102.tar.xz
yuzu-0a31e373f1728316b3dfed391ddcb99a474e4102.tar.zst
yuzu-0a31e373f1728316b3dfed391ddcb99a474e4102.zip
Diffstat (limited to '')
-rw-r--r--src/citra/config.cpp2
-rw-r--r--src/citra_qt/debugger/graphics_vertex_shader.cpp2
-rw-r--r--src/citra_qt/util/util.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index 0d17c80bf..c5cb4fb38 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -85,7 +85,7 @@ void Config::ReadValues() {
// Debugging
Settings::values.use_gdbstub = sdl2_config->GetBoolean("Debugging", "use_gdbstub", false);
- Settings::values.gdbstub_port = sdl2_config->GetInteger("Debugging", "gdbstub_port", 24689);
+ Settings::values.gdbstub_port = static_cast<u16>(sdl2_config->GetInteger("Debugging", "gdbstub_port", 24689));
}
void Config::Reload() {
diff --git a/src/citra_qt/debugger/graphics_vertex_shader.cpp b/src/citra_qt/debugger/graphics_vertex_shader.cpp
index 6e8d7ef42..854f6ff16 100644
--- a/src/citra_qt/debugger/graphics_vertex_shader.cpp
+++ b/src/citra_qt/debugger/graphics_vertex_shader.cpp
@@ -515,7 +515,7 @@ void GraphicsVertexShaderWidget::Reload(bool replace_vertex_data, void* vertex_d
}
// Initialize debug info text for current cycle count
- cycle_index->setMaximum(debug_data.records.size() - 1);
+ cycle_index->setMaximum(static_cast<int>(debug_data.records.size() - 1));
OnCycleIndexChanged(cycle_index->value());
model->endResetModel();
diff --git a/src/citra_qt/util/util.cpp b/src/citra_qt/util/util.cpp
index 8734a8efd..2f9beb5cc 100644
--- a/src/citra_qt/util/util.cpp
+++ b/src/citra_qt/util/util.cpp
@@ -19,7 +19,7 @@ QString ReadableByteSize(qulonglong size) {
static const std::array<const char*, 6> units = { "B", "KiB", "MiB", "GiB", "TiB", "PiB" };
if (size == 0)
return "0";
- int digit_groups = std::min<int>((int)(std::log10(size) / std::log10(1024)), units.size());
+ int digit_groups = std::min<int>(static_cast<int>(std::log10(size) / std::log10(1024)), static_cast<int>(units.size()));
return QString("%L1 %2").arg(size / std::pow(1024, digit_groups), 0, 'f', 1)
.arg(units[digit_groups]);
}