From 8d120174e9e75d262f0bb7f5bc2907e41712b431 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 27 Sep 2021 16:07:25 +0200 Subject: [PATCH] Avoid duplicated code by reworking #if-ery around an if/else MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I08376d2dfd071989fab9ee18dbb90ab8670ed20f Reviewed-by: Tor Arne Vestbø --- src/testlib/qtaptestlogger.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/testlib/qtaptestlogger.cpp b/src/testlib/qtaptestlogger.cpp index 30712c274a..3a8e3674d7 100644 --- a/src/testlib/qtaptestlogger.cpp +++ b/src/testlib/qtaptestlogger.cpp @@ -207,18 +207,13 @@ void QTapTestLogger::addIncident(IncidentTypes type, const char *description, ); outputString(diagnosticsYamlish.data()); - } else { + } else +#endif + { QTestCharBuffer unparsableDescription; - QTest::qt_asprintf(&unparsableDescription, - YAML_INDENT "# %s\n", description); + QTest::qt_asprintf(&unparsableDescription, YAML_INDENT "# %s\n", description); outputString(unparsableDescription.data()); } -#else - QTestCharBuffer unparsableDescription; - QTest::qt_asprintf(&unparsableDescription, - YAML_INDENT "# %s\n", description); - outputString(unparsableDescription.data()); -#endif } if (file) {