From 2e142d2d8a94bff208171334c1af18c05c16db36 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sun, 21 Feb 2021 13:16:18 +0100 Subject: [PATCH] mkvmerge: remove #defines --- src/merge/mkvmerge.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/merge/mkvmerge.cpp b/src/merge/mkvmerge.cpp index 8865435e1..01e3dcc89 100644 --- a/src/merge/mkvmerge.cpp +++ b/src/merge/mkvmerge.cpp @@ -76,18 +76,17 @@ static std::string s_split_by_chapters_arg; /** \brief Outputs usage information */ -#define S(x) std::string{x} static void set_usage() { std::string usage_text; - auto nl = S("\n"); + auto nl = "\n"s; usage_text = ""; usage_text += Y("mkvmerge -o out [global options] [options1] [@option-file.json] …\n"); usage_text += "\n"; usage_text += Y(" Global options:\n"); - usage_text += S(" -v, --verbose ") + Y("Increase verbosity.") + nl; - usage_text += S(" -q, --quiet ") + Y("Suppress status output.") + nl; + usage_text += " -v, --verbose "s + Y("Increase verbosity.") + nl; + usage_text += " -q, --quiet "s + Y("Suppress status output.") + nl; usage_text += Y(" -o, --output out Write to the file 'out'.\n"); usage_text += Y(" -w, --webm Create WebM compliant file.\n"); usage_text += Y(" --title Title for this destination file.\n"); @@ -408,7 +407,6 @@ set_usage() { mtx::cli::g_version_info = get_version_info("mkvmerge", vif_full); mtx::cli::g_usage_text = usage_text; } -#undef S /** \brief Prints information about what has been compiled into mkvmerge */