From 8ea0a4b34492188ff41cc971b6ac420ce6bf1898 Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Sun, 8 Nov 2020 23:17:08 +0000 Subject: [PATCH] Issue #77 Break dependency of verify.cpp on logmessage.h --- src/blackmisc/verify.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/blackmisc/verify.cpp b/src/blackmisc/verify.cpp index 481f680f1..708f7be4a 100644 --- a/src/blackmisc/verify.cpp +++ b/src/blackmisc/verify.cpp @@ -7,8 +7,10 @@ */ #include "blackmisc/verify.h" -#include "blackmisc/logmessage.h" +#include "blackmisc/logcategories.h" +#include #include +#include #ifdef BLACK_USE_CRASHPAD #include "crashpad/client/simulate_crash.h" @@ -62,13 +64,14 @@ namespace BlackMisc #endif #if defined(QT_NO_DEBUG) || defined(Q_CC_MSVC) + auto logger = QMessageLogger().warning(QLoggingCategory(qPrintable(CLogCategories::verification()))); if (context && message) { - CLogMessage(CLogCategories::verification()).warning(u"Failed to verify: %1 (%2 in %3) in %4 line %5") << condition << message << context << filename << line; + logger << QStringLiteral("Failed to verify: %1 (%2 in %3) in %4 line %5").arg(condition, message, context, filename, QString::number(line)); } else { - CLogMessage(CLogCategories::verification()).warning(u"Failed to verify: %1 in %2 line %3") << condition << filename << line; + logger << QStringLiteral("Failed to verify: %1 in %2 line %3").arg(condition, filename, QString::number(line)); } # if defined(BLACK_USE_CRASHPAD) CRASHPAD_SIMULATE_CRASH();