diff options
| author | cah <cth@carlh.net> | 2025-07-10 22:47:19 +0200 |
|---|---|---|
| committer | cah <cth@carlh.net> | 2025-07-10 22:47:19 +0200 |
| commit | 4be4e97abf911e7633172ada950d107a3ed28834 (patch) | |
| tree | c9deceb5f3684fa081db0613da88264732093fcb /src/lib/content.cc | |
| parent | 727c1aa7da8b325dfa38c8443b1dd356acaf6ec3 (diff) | |
| parent | 42bde2d97039f6d0d645d83db90612d18ebf225a (diff) | |
Merge branch 'compose-to-fmt-take2'
This removes all uses of String::compose, replacing them with fmt and
updating the i18n strings where required.
Diffstat (limited to 'src/lib/content.cc')
| -rw-r--r-- | src/lib/content.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/content.cc b/src/lib/content.cc index 2a69adefd..196288f4a 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -26,7 +26,6 @@ #include "audio_content.h" #include "change_signaller.h" -#include "compose.hpp" #include "content.h" #include "content_factory.h" #include "exceptions.h" @@ -296,9 +295,9 @@ Content::clone() const string Content::technical_summary() const { - auto s = String::compose("%1 %2 %3", path_summary(), digest(), position().seconds()); + auto s = fmt::format("{} {} {}", path_summary(), digest(), position().seconds()); if (_video_frame_rate) { - s += String::compose(" %1", *_video_frame_rate); + s += fmt::format(" {}", *_video_frame_rate); } return s; } @@ -452,7 +451,7 @@ Content::add_properties(shared_ptr<const Film>, list<UserProperty>& p) const } } if (paths_to_show < number_of_paths()) { - paths += String::compose("... and %1 more", number_of_paths() - paths_to_show); + paths += fmt::format("... and {} more", number_of_paths() - paths_to_show); } p.push_back( UserProperty( |