From 8d511a4712436a7c5ee40b289a51397717fce6f0 Mon Sep 17 00:00:00 2001 From: Borys Jelenski Date: Mon, 31 May 2021 01:07:13 +0200 Subject: [PATCH] [EGD-6704] Fix incorrectly displayed time in "Date and time" window Time was incorrectly displayed when opening the "Change date and time" window due to invalid string conversion. Fixed by using different string converting function which does not use printf underneath. --- module-apps/widgets/TimeWidget.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/module-apps/widgets/TimeWidget.cpp b/module-apps/widgets/TimeWidget.cpp index a753082d5c34184ce342ff24661c826fcb785481..1c30c596f21c0b04f4fb95725ba171196fe6676d 100644 --- a/module-apps/widgets/TimeWidget.cpp +++ b/module-apps/widgets/TimeWidget.cpp @@ -384,8 +384,8 @@ namespace gui if (!mode24H) { if (type == Type::Start) { const auto hours12H = date::make12(hoursFrom); - hourInput->setText(std::to_string(hours12H.count())); - minuteInput->setText(std::to_string(minutesFrom.count())); + hourInput->setText(utils::to_string(hours12H.count())); + minuteInput->setText(utils::to_string(minutesFrom.count())); if (date::is_am(hoursFrom)) { mode12hInput->setText(timeConstants::before_noon); } @@ -395,8 +395,8 @@ namespace gui } else if (type == Type::End) { const auto hours12H = date::make12(hoursTill); - hourInput->setText(std::to_string(hours12H.count())); - minuteInput->setText(std::to_string(minutesTill.count())); + hourInput->setText(utils::to_string(hours12H.count())); + minuteInput->setText(utils::to_string(minutesTill.count())); if (date::is_am(hoursTill)) { mode12hInput->setText(timeConstants::before_noon); } @@ -407,12 +407,12 @@ namespace gui } else { if (type == Type::Start) { - hourInput->setText(std::to_string(hoursFrom.count())); - minuteInput->setText(std::to_string(minutesFrom.count())); + hourInput->setText(utils::to_string(hoursFrom.count())); + minuteInput->setText(utils::to_string(minutesFrom.count())); } else if (type == Type::End) { - hourInput->setText(std::to_string(hoursTill.count())); - minuteInput->setText(std::to_string(minutesTill.count())); + hourInput->setText(utils::to_string(hoursTill.count())); + minuteInput->setText(utils::to_string(minutesTill.count())); } } }