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

Core: Remove duplicate QtPrivate namespace

Browse Source 
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 <thiago.macieira@intel.com>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit 4f05eac0a88959ff0faa4d6b194d9dd8eeb3f4b6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Ulf Hermann 2025-01-15 15:05:06 +01:00 committed by Qt Cherry-pick Bot
parent a2b68996b2
commit a256dba802
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/global/qglobal.cpp
View File

@ -370,9 +370,7 @@ bool QInternal::activateCallbacks(Callback cb, void **parameters)
\sa QT_DISABLE_DEPRECATED_UP_TO, QT_NO_KEYWORDS, QT_VERSION_CHECK \sa QT_DISABLE_DEPRECATED_UP_TO, QT_NO_KEYWORDS, QT_VERSION_CHECK
*/ */
namespace QtPrivate {
Q_LOGGING_CATEGORY(lcNativeInterface, "qt.nativeinterface") Q_LOGGING_CATEGORY(lcNativeInterface, "qt.nativeinterface")
}
QT_END_NAMESPACE QT_END_NAMESPACE

3
src/corelib/global/qnativeinterface_p.h
View File

@ -20,9 +20,7 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace QtPrivate {
QT_DECLARE_EXPORTED_QT_LOGGING_CATEGORY(lcNativeInterface, Q_CORE_EXPORT) QT_DECLARE_EXPORTED_QT_LOGGING_CATEGORY(lcNativeInterface, Q_CORE_EXPORT)
}
// Provides a definition for the interface destructor // Provides a definition for the interface destructor
#define QT_DEFINE_NATIVE_INTERFACE_2(Namespace, InterfaceClass) \ #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) \ #define QT_NATIVE_INTERFACE_RETURN_IF(NativeInterface, baseType) \
{ \ { \
using QtPrivate::lcNativeInterface; \
using QNativeInterface::Private::TypeInfo; \ using QNativeInterface::Private::TypeInfo; \
qCDebug(lcNativeInterface, "Comparing requested interface name %s with available %s", \ qCDebug(lcNativeInterface, "Comparing requested interface name %s with available %s", \
name, TypeInfo<NativeInterface>::name()); \ name, TypeInfo<NativeInterface>::name()); \