diff --git a/AK/NumberFormat.cpp b/AK/NumberFormat.cpp index 3841f5ce339..b1dcb459e14 100644 --- a/AK/NumberFormat.cpp +++ b/AK/NumberFormat.cpp @@ -5,10 +5,8 @@ */ #include -#include #include #include -#include namespace AK { @@ -75,7 +73,7 @@ ByteString human_readable_size_long(u64 size, UseThousandsSeparator use_thousand return ByteString::formatted("{} ({} bytes)", human_readable_size_string, size); } -ByteString human_readable_time(i64 time_in_seconds) +String human_readable_time(i64 time_in_seconds) { auto days = time_in_seconds / 86400; time_in_seconds = time_in_seconds % 86400; @@ -99,10 +97,10 @@ ByteString human_readable_time(i64 time_in_seconds) builder.appendff("{} second{}", time_in_seconds, time_in_seconds == 1 ? "" : "s"); - return builder.to_byte_string(); + return MUST(builder.to_string()); } -ByteString human_readable_digital_time(i64 time_in_seconds) +String human_readable_digital_time(i64 time_in_seconds) { auto hours = time_in_seconds / 3600; time_in_seconds = time_in_seconds % 3600; @@ -117,7 +115,7 @@ ByteString human_readable_digital_time(i64 time_in_seconds) builder.appendff("{:02}:", minutes); builder.appendff("{:02}", time_in_seconds); - return builder.to_byte_string(); + return MUST(builder.to_string()); } } diff --git a/AK/NumberFormat.h b/AK/NumberFormat.h index fdb16d3a113..49caf11a458 100644 --- a/AK/NumberFormat.h +++ b/AK/NumberFormat.h @@ -6,7 +6,7 @@ #pragma once -#include +#include namespace AK { @@ -24,8 +24,8 @@ ByteString human_readable_size(u64 size, HumanReadableBasedOn based_on = HumanRe ByteString human_readable_quantity(u64 quantity, HumanReadableBasedOn based_on = HumanReadableBasedOn::Base2, StringView unit = "B"sv, UseThousandsSeparator use_thousands_separator = UseThousandsSeparator::No); ByteString human_readable_size_long(u64 size, UseThousandsSeparator use_thousands_separator = UseThousandsSeparator::No); -ByteString human_readable_time(i64 time_in_seconds); -ByteString human_readable_digital_time(i64 time_in_seconds); +String human_readable_time(i64 time_in_seconds); +String human_readable_digital_time(i64 time_in_seconds); } diff --git a/Userland/Applications/FileManager/PropertiesWindow.cpp b/Userland/Applications/FileManager/PropertiesWindow.cpp index 51ae96fec52..8dea2d90d27 100644 --- a/Userland/Applications/FileManager/PropertiesWindow.cpp +++ b/Userland/Applications/FileManager/PropertiesWindow.cpp @@ -285,7 +285,7 @@ ErrorOr PropertiesWindow::create_audio_tab(GUI::TabWidget& tab_widget, Non tab.find_descendant_of_type_named("audio_type")->set_text(TRY(String::from_byte_string(loader->format_name()))); auto duration_seconds = loader->total_samples() / loader->sample_rate(); - tab.find_descendant_of_type_named("audio_duration")->set_text(TRY(String::from_byte_string(human_readable_digital_time(duration_seconds)))); + tab.find_descendant_of_type_named("audio_duration")->set_text(human_readable_digital_time(duration_seconds)); tab.find_descendant_of_type_named("audio_sample_rate")->set_text(TRY(String::formatted("{} Hz", loader->sample_rate()))); tab.find_descendant_of_type_named("audio_format")->set_text(TRY(String::formatted("{}-bit", loader->bits_per_sample()))); diff --git a/Userland/Games/Minesweeper/Field.cpp b/Userland/Games/Minesweeper/Field.cpp index 516b510136b..970fd0bba0f 100644 --- a/Userland/Games/Minesweeper/Field.cpp +++ b/Userland/Games/Minesweeper/Field.cpp @@ -138,7 +138,7 @@ void Field::initialize() m_timer = Core::Timer::create_repeating( 1000, [this] { ++m_time_elapsed; - m_time_label.set_text(String::from_byte_string(human_readable_digital_time(m_time_elapsed)).release_value_but_fixme_should_propagate_errors()); + m_time_label.set_text(human_readable_digital_time(m_time_elapsed)); }, this) .release_value_but_fixme_should_propagate_errors();