From 478ef67fc69347c83a6331cc699b53344ade3b78 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Sun, 10 Apr 2022 12:30:59 +0300 Subject: [PATCH] flags: rename flags_to_string -> to_string For consistency. --- lib/message/mu-flags.cc | 2 +- lib/message/mu-flags.hh | 2 +- lib/mu-maildir.cc | 2 +- lib/tests/test-mu-maildir.cc | 2 +- lib/tests/test-mu-msg.cc | 2 +- mu/mu-cmd-find.cc | 2 +- toys/mug/mug-msg-list-view.cc | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/message/mu-flags.cc b/lib/message/mu-flags.cc index 7d3816a8..fc45f52c 100644 --- a/lib/message/mu-flags.cc +++ b/lib/message/mu-flags.cc @@ -27,7 +27,7 @@ using namespace Mu; std::string -Mu::flags_to_string(Flags flags) +Mu::to_string(Flags flags) { std::string str; diff --git a/lib/message/mu-flags.hh b/lib/message/mu-flags.hh index dc8f5127..dfc68afb 100644 --- a/lib/message/mu-flags.hh +++ b/lib/message/mu-flags.hh @@ -328,7 +328,7 @@ flags_filter(Flags flags, MessageFlagCategory cat) * * @return string as a sequence of message-flag shortcuts */ -std::string flags_to_string(Flags flags); +std::string to_string(Flags flags); } // namespace Mu diff --git a/lib/mu-maildir.cc b/lib/mu-maildir.cc index e07591ee..9ca0d1e8 100644 --- a/lib/mu-maildir.cc +++ b/lib/mu-maildir.cc @@ -480,7 +480,7 @@ determine_dst_filename(const std::string& file, Flags flags, return std::move(parts.base); const auto flagstr{ - flags_to_string( + to_string( flags_filter( flags, MessageFlagCategory::Mailfile))}; diff --git a/lib/tests/test-mu-maildir.cc b/lib/tests/test-mu-maildir.cc index 923d7dd6..49d466d8 100644 --- a/lib/tests/test-mu-maildir.cc +++ b/lib/tests/test-mu-maildir.cc @@ -191,7 +191,7 @@ test_mu_maildir_flags_from_path(void) g_assert_true(!!res); if (g_test_verbose()) g_print("%s -> <%s>\n", paths[i].path, - flags_to_string(res.value()).c_str()); + to_string(res.value()).c_str()); g_assert_true(res.value() == paths[i].flags); } } diff --git a/lib/tests/test-mu-msg.cc b/lib/tests/test-mu-msg.cc index 7b41b3e4..781229f3 100644 --- a/lib/tests/test-mu-msg.cc +++ b/lib/tests/test-mu-msg.cc @@ -114,7 +114,7 @@ test_mu_msg_02(void) g_assert_true(contacts[1].name.empty()); g_assert_true(contacts[1].email == "help-gnu-emacs@gnu.org"); - g_print("flags: %s\n", Mu::flags_to_string(mu_msg_get_flags(msg)).c_str()); + g_print("flags: %s\n", Mu::to_string(mu_msg_get_flags(msg)).c_str()); g_assert_true(mu_msg_get_flags(msg) == (Flags::Seen|Flags::MailingList)); mu_msg_unref(msg); diff --git a/mu/mu-cmd-find.cc b/mu/mu-cmd-find.cc index 1d073c40..0f19ae6a 100644 --- a/mu/mu-cmd-find.cc +++ b/mu/mu-cmd-find.cc @@ -278,7 +278,7 @@ static const char* flags_s(Flags flags) { static char buf[64]; - const auto flagstr{flags_to_string(flags)}; + const auto flagstr{to_string(flags)}; ::strncpy(buf, flagstr.c_str(), sizeof(buf) - 1); diff --git a/toys/mug/mug-msg-list-view.cc b/toys/mug/mug-msg-list-view.cc index 631a8621..aa5dcc30 100644 --- a/toys/mug/mug-msg-list-view.cc +++ b/toys/mug/mug-msg-list-view.cc @@ -326,7 +326,7 @@ add_row(GtkTreeStore* store, MuMsg* msg, GtkTreeIter* treeiter) from = empty_or_display_contact(mu_msg_get_from(msg)); to = empty_or_display_contact(mu_msg_get_to(msg)); - flag_str = flags_to_string(mu_msg_get_flags(msg)); + flag_str = to_string(mu_msg_get_flags(msg)); /* if (0) { */ /* GtkTreeIter myiter; */