From 0fef0167485714d93fee5d2526f3d68652a68700 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 10 Feb 2025 10:00:01 -0800 Subject: [PATCH] QLoggingCategory: remove init() and merge with the constructor Nothing else calls it. Drive-by initialize the two pointers via NSDMI. Pick-to: 6.8 Change-Id: I8c51cf5126aeb8bd6254fffdd21a37526329bbf3 Reviewed-by: Marc Mutz (cherry picked from commit c7ec043e4643d4b18731fdf2efc14976a81e1809) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/io/qloggingcategory.cpp | 7 +------ src/corelib/io/qloggingcategory.h | 6 ++---- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/corelib/io/qloggingcategory.cpp b/src/corelib/io/qloggingcategory.cpp index 4e28c44e7b9..d60abba70d5 100644 --- a/src/corelib/io/qloggingcategory.cpp +++ b/src/corelib/io/qloggingcategory.cpp @@ -172,11 +172,6 @@ Q_GLOBAL_STATIC(QLoggingCategory, qtDefaultCategory, qtDefaultCategoryName) QLoggingCategory::QLoggingCategory(const char *category, QtMsgType enableForLevel) : d(nullptr), name(nullptr) -{ - init(category, enableForLevel); -} - -void QLoggingCategory::init(const char *category, QtMsgType severityLevel) { enabled.storeRelaxed(0x01010101); // enabledDebug = enabledWarning = enabledCritical = true; @@ -186,7 +181,7 @@ void QLoggingCategory::init(const char *category, QtMsgType severityLevel) name = qtDefaultCategoryName; if (QLoggingRegistry *reg = QLoggingRegistry::instance()) - reg->registerCategory(this, severityLevel); + reg->registerCategory(this, enableForLevel); } /*! diff --git a/src/corelib/io/qloggingcategory.h b/src/corelib/io/qloggingcategory.h index bd1a4e91553..f2fdee24e7b 100644 --- a/src/corelib/io/qloggingcategory.h +++ b/src/corelib/io/qloggingcategory.h @@ -38,10 +38,8 @@ public: static void setFilterRules(const QString &rules); private: - void init(const char *category, QtMsgType severityLevel); - - Q_DECL_UNUSED_MEMBER void *d; // reserved for future use - const char *name; + Q_DECL_UNUSED_MEMBER void *d = nullptr; // reserved for future use + const char *name = nullptr; struct AtomicBools { QBasicAtomicInteger enabledDebug;