From c524f2f9dc6ddbb74dba2e07db5c193b2ecdaa74 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 3 Jun 2010 14:12:23 +0200 Subject: [PATCH] Use correct variable types for printf format --- src/mmg/jobs.cpp | 4 ++-- src/mmg/mux_dialog.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mmg/jobs.cpp b/src/mmg/jobs.cpp index f7661fc0e..1b2b30ae3 100644 --- a/src/mmg/jobs.cpp +++ b/src/mmg/jobs.cpp @@ -288,7 +288,7 @@ job_run_dialog::update_remaining_time() { int64_t remaining_time = total_time - now + m_start_time; m_next_remaining_time_update = now + 1000; - st_remaining_time->SetLabel(wxString::Format(Z("%d minute(s) %d second(s)"), remaining_time / 60000, (remaining_time / 1000) % 60)); + st_remaining_time->SetLabel(wxString::Format(Z("%d minute(s) %d second(s)"), static_cast(remaining_time / 60000), static_cast((remaining_time / 1000) % 60))); } if (now >= m_next_remaining_time_update_total) { @@ -296,7 +296,7 @@ job_run_dialog::update_remaining_time() { int64_t remaining_time = total_time - now + m_start_time_total; m_next_remaining_time_update_total = now + 1000; - st_remaining_time_total->SetLabel(wxString::Format(Z("%d minute(s) %d second(s)"), remaining_time / 60000, (remaining_time / 1000) % 60)); + st_remaining_time_total->SetLabel(wxString::Format(Z("%d minute(s) %d second(s)"), static_cast(remaining_time / 60000), static_cast((remaining_time / 1000) % 60))); } } diff --git a/src/mmg/mux_dialog.cpp b/src/mmg/mux_dialog.cpp index ba45bc201..04accf76a 100644 --- a/src/mmg/mux_dialog.cpp +++ b/src/mmg/mux_dialog.cpp @@ -245,7 +245,7 @@ mux_dialog::update_remaining_time() { int64_t total_time = (now - m_start_time) * 100 / m_progress; int64_t remaining_time = total_time - now + m_start_time; - st_remaining_time->SetLabel(wxString::Format(Z("%d minute(s) %d second(s)"), remaining_time / 60000, (remaining_time / 1000) % 60)); + st_remaining_time->SetLabel(wxString::Format(Z("%d minute(s) %d second(s)"), static_cast(remaining_time / 60000), static_cast((remaining_time / 1000) % 60))); m_next_remaining_time_update = now + 1000; }