whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QLoggingCategory: code tidies 

Sprinkle explicit and remove an unnecessary operator in favor
of a named function.

Change-Id: I7e11b3910014827018341fde7d5aba36f9487fc4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Giuseppe D'Angelo 2022-03-06 13:31:45 +01:00 committed by Thiago Macieira
parent bc54031d57
commit 9d685a870d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/corelib/io/qloggingcategory.h
View File

@ -112,12 +112,12 @@ template <QtMsgType Which> struct QLoggingCategoryMacroHolder
static const bool IsOutputEnabled;
const QLoggingCategory *category = nullptr;
bool control = false;
QLoggingCategoryMacroHolder(const QLoggingCategory &cat)
explicit QLoggingCategoryMacroHolder(const QLoggingCategory &cat)
{
if (IsOutputEnabled)
init(cat);
}
QLoggingCategoryMacroHolder(QMessageLogger::CategoryFunction catfunc)
explicit QLoggingCategoryMacroHolder(QMessageLogger::CategoryFunction catfunc)
{
if (IsOutputEnabled)
init(catfunc());
@ -138,8 +138,8 @@ template <QtMsgType Which> struct QLoggingCategoryMacroHolder
control = cat.isCriticalEnabled();
}
}
operator const char *() const { return category->categoryName(); }
operator bool() const { return Q_UNLIKELY(control); }
const char *name() const { return category->categoryName(); }
explicit operator bool() const { return Q_UNLIKELY(control); }
};
template <QtMsgType Which> const bool QLoggingCategoryMacroHolder<Which>::IsOutputEnabled = true;
@ -166,7 +166,7 @@ template <> const bool QLoggingCategoryMacroHolder<QtWarningMsg>::IsOutputEnable
#define QT_MESSAGE_LOGGER_COMMON(category, level) \
for (QLoggingCategoryMacroHolder<level> qt_category(category); qt_category; qt_category.control = false) \
QMessageLogger(QT_MESSAGELOG_FILE, QT_MESSAGELOG_LINE, QT_MESSAGELOG_FUNC, qt_category)
QMessageLogger(QT_MESSAGELOG_FILE, QT_MESSAGELOG_LINE, QT_MESSAGELOG_FUNC, qt_category.name())
#define qCDebug(category, ...) QT_MESSAGE_LOGGER_COMMON(category, QtDebugMsg).debug(__VA_ARGS__)
#define qCInfo(category, ...) QT_MESSAGE_LOGGER_COMMON(category, QtInfoMsg).info(__VA_ARGS__)