1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QMessageLogger: merge the isFatal() call into qt_message_fatal()

Browse Source 
Making it qt_maybe_message_fatal(). Thus we're less likely to forget to
do the right thing.

Change-Id: Ie3c344d9f64527fc755ffffdd3c97cf8fa3fcc90
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Thiago Macieira 2025-01-14 19:03:10 -08:00
parent cc517dd30d
commit f8d1b58427
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/corelib/global/qlogging.cpp
View File

@ -127,10 +127,7 @@ Q_TRACE_POINT(qtcore, qt_message_print, int type, const char *category, const ch
*/
template <typename String>
#if !defined(Q_CC_MSVC_ONLY)
Q_NORETURN
#endif
static void qt_message_fatal(QtMsgType, const QMessageLogContext &context, String &&message);
static void qt_maybe_message_fatal(QtMsgType, const QMessageLogContext &context, String &&message);
static void qt_message_print(QtMsgType, const QMessageLogContext &context, const QString &message);
static void preformattedMessageHandler(QtMsgType type, const QMessageLogContext &context,
const QString &formattedMessage);
@ -337,9 +334,7 @@ static void qt_message(QtMsgType msgType, const QMessageLogContext &context, con
{
QString buf = QString::vasprintf(msg, ap);
qt_message_print(msgType, context, buf);
if (isFatal(msgType))
qt_message_fatal(msgType, context, buf);
qt_maybe_message_fatal(msgType, context, buf);
}
/*!
@ -2031,9 +2026,11 @@ static void qt_message_print(QtMsgType msgType, const QMessageLogContext &contex
}
}
template <typename String>
static void qt_message_fatal(QtMsgType, const QMessageLogContext &context, String &&message)
template <typename String> static void
qt_maybe_message_fatal(QtMsgType msgType, const QMessageLogContext &context, String &&message)
{
if (!isFatal(msgType))
return;
#if defined(Q_CC_MSVC_ONLY) && defined(QT_DEBUG) && defined(_DEBUG) && defined(_CRT_ERROR)
wchar_t contextFileL[256];
// we probably should let the compiler do this for us, by declaring QMessageLogContext::file to
@ -2069,8 +2066,7 @@ void qt_message_output(QtMsgType msgType, const QMessageLogContext &context, con
{
QInternalMessageLogContext ctx(context);
qt_message_print(msgType, ctx, message);
if (isFatal(msgType))
qt_message_fatal(msgType, ctx, message);
qt_maybe_message_fatal(msgType, ctx, message);
}
void qErrnoWarning(const char *msg, ...)