From 9d685a870d3b0e8553120a8e00d3bc92da401e8a Mon Sep 17 00:00:00 2001
From: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Date: Sun, 6 Mar 2022 13:31:45 +0100
Subject: [PATCH] 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>
---
 src/corelib/io/qloggingcategory.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/corelib/io/qloggingcategory.h b/src/corelib/io/qloggingcategory.h
index 5a66bb2e68..3e11132576 100644
--- a/src/corelib/io/qloggingcategory.h
+++ b/src/corelib/io/qloggingcategory.h
@@ -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__)