From aac807fd3a79432480f46520f228dd38ac97b54d Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 16 Aug 2018 10:28:03 -0400 Subject: qt/main: Get rid of compilation warnings Gets rid of truncation warnings about conversion to int. While we're at it, we can also de-hardcode the buffer size being used. --- src/yuzu/main.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index f7eee7769..2e62135f4 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -634,18 +634,22 @@ void GMainWindow::OnMenuInstallToNAND() { if (!dest->Resize(src->GetSize())) return false; + std::array buffer{}; + const int progress_maximum = static_cast(src->GetSize() / buffer.size()); + QProgressDialog progress(fmt::format("Installing file \"{}\"...", src->GetName()).c_str(), - "Cancel", 0, src->GetSize() / 0x1000, this); + "Cancel", 0, progress_maximum, this); progress.setWindowModality(Qt::WindowModal); - std::array buffer{}; - for (size_t i = 0; i < src->GetSize(); i += 0x1000) { + for (size_t i = 0; i < src->GetSize(); i += buffer.size()) { if (progress.wasCanceled()) { dest->Resize(0); return false; } - progress.setValue(i / 0x1000); + const int progress_value = static_cast(i / buffer.size()); + progress.setValue(progress_value); + const auto read = src->Read(buffer.data(), buffer.size(), i); dest->Write(buffer.data(), read, i); } -- cgit v1.2.3