From a256dba802a86e1afe6aa0c4282506fda351a354 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 15 Jan 2025 15:05:06 +0100 Subject: [PATCH] Core: Remove duplicate QtPrivate namespace The logging category macro already puts the logging category into the QtPrivate namespace. There is no need to wrap it into another QtPrivate namespace. Fixes: QTBUG-132111 Change-Id: I99a7aa16662e3515c5f96d6736d47c1d0e45034c Reviewed-by: Thiago Macieira Reviewed-by: Marc Mutz (cherry picked from commit 4f05eac0a88959ff0faa4d6b194d9dd8eeb3f4b6) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/global/qglobal.cpp | 2 -- src/corelib/global/qnativeinterface_p.h | 3 --- 2 files changed, 5 deletions(-) diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 1796fe66760..fc9706bda50 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -370,9 +370,7 @@ bool QInternal::activateCallbacks(Callback cb, void **parameters) \sa QT_DISABLE_DEPRECATED_UP_TO, QT_NO_KEYWORDS, QT_VERSION_CHECK */ -namespace QtPrivate { Q_LOGGING_CATEGORY(lcNativeInterface, "qt.nativeinterface") -} QT_END_NAMESPACE diff --git a/src/corelib/global/qnativeinterface_p.h b/src/corelib/global/qnativeinterface_p.h index c6d216460af..93807f0ba67 100644 --- a/src/corelib/global/qnativeinterface_p.h +++ b/src/corelib/global/qnativeinterface_p.h @@ -20,9 +20,7 @@ QT_BEGIN_NAMESPACE -namespace QtPrivate { QT_DECLARE_EXPORTED_QT_LOGGING_CATEGORY(lcNativeInterface, Q_CORE_EXPORT) -} // Provides a definition for the interface destructor #define QT_DEFINE_NATIVE_INTERFACE_2(Namespace, InterfaceClass) \ @@ -35,7 +33,6 @@ QT_DECLARE_EXPORTED_QT_LOGGING_CATEGORY(lcNativeInterface, Q_CORE_EXPORT) #define QT_NATIVE_INTERFACE_RETURN_IF(NativeInterface, baseType) \ { \ - using QtPrivate::lcNativeInterface; \ using QNativeInterface::Private::TypeInfo; \ qCDebug(lcNativeInterface, "Comparing requested interface name %s with available %s", \ name, TypeInfo::name()); \