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

JNI: don't declare namespaces nested into QtJniTypes as inline

Browse Source 
Sadly, inline namespaces are resulting in ambiguities. With two
declarations

    QtJniTypes::android::io::File

and

    QtJniTypes::org::qtproject::qt::android::QtWindow

referring to QtJniTypes::android already is ambiguous if `org`,
`qtproject`, and `qt` namespaces are all inline. This breaks the
idea behind Q_DECLARE_JNI_CLASS as a variadic macro that generates types
that we can transparently use as QtJniTypes.

So remove the inline keyword from the namespace declarations. The macro
might still be the way to go, but user code will to either fully qualify
the types, or use `using namespace QtJniTypes::java::lang` to use e.g.
the `String` type without ambiguities.

Types declared with the two-argument overload continue to live
directly in the QtJniTypes namespace anyway.

As a drive-by, break the excessively long lines.

Change-Id: Ie9303e6c9117fb96b3cff31c7df4df92237b5520
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit d1b89671de70ac9ffca52337058e976d86a367c1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Volker Hilsheimer 2024-06-21 21:51:00 +02:00 committed by Qt Cherry-pick Bot
parent ed5435877c
commit de23caa4f6
2 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/corelib/kernel/qjnitypes.h
View File

@ -53,62 +53,69 @@ struct QtJniTypes::Traits<QtJniTypes::Type##Tag> { \
}; \ }; \
#define Q_DECLARE_JNI_CLASS_3(NS0, NS1, Type) \ #define Q_DECLARE_JNI_CLASS_3(NS0, NS1, Type) \
inline namespace NS0 { \ namespace NS0 { \
inline namespace NS1 { \ namespace NS1 { \
Q_DECLARE_JNI_CLASS_2(Type, Q_UNUSED(0)) \ Q_DECLARE_JNI_CLASS_2(Type, Q_UNUSED(0)) \
} \ } \
} \ } \
#define Q_DECLARE_JNI_CLASS_SPECIALIZATION_3(NS0, NS1, Type) \ #define Q_DECLARE_JNI_CLASS_SPECIALIZATION_3(NS0, NS1, Type) \
Q_DECLARE_JNI_CLASS_SPECIALIZATION_2(NS0::NS1::Type, #NS0 "/" #NS1 "/" #Type) Q_DECLARE_JNI_CLASS_SPECIALIZATION_2(NS0::NS1::Type, \
#NS0 "/" #NS1 "/" #Type)
#define Q_DECLARE_JNI_CLASS_4(NS0, NS1, NS2, Type) \ #define Q_DECLARE_JNI_CLASS_4(NS0, NS1, NS2, Type) \
inline namespace NS0 { \ namespace NS0 { \
Q_DECLARE_JNI_CLASS_3(NS1, NS2, Type) \ Q_DECLARE_JNI_CLASS_3(NS1, NS2, Type) \
} \ } \
#define Q_DECLARE_JNI_CLASS_SPECIALIZATION_4(NS0, NS1, NS2, Type) \ #define Q_DECLARE_JNI_CLASS_SPECIALIZATION_4(NS0, NS1, NS2, Type) \
Q_DECLARE_JNI_CLASS_SPECIALIZATION_2(NS0::NS1::NS2::Type, #NS0 "/" #NS1 "/" #NS2 "/" #Type) Q_DECLARE_JNI_CLASS_SPECIALIZATION_2(NS0::NS1::NS2::Type, \
#NS0 "/" #NS1 "/" #NS2 "/" #Type)
#define Q_DECLARE_JNI_CLASS_5(NS0, NS1, NS2, NS3, Type) \ #define Q_DECLARE_JNI_CLASS_5(NS0, NS1, NS2, NS3, Type) \
inline namespace NS0 { \ namespace NS0 { \
Q_DECLARE_JNI_CLASS_4(NS1, NS2, NS3, Type) \ Q_DECLARE_JNI_CLASS_4(NS1, NS2, NS3, Type) \
} \ } \
#define Q_DECLARE_JNI_CLASS_SPECIALIZATION_5(NS0, NS1, NS2, NS3, Type) \ #define Q_DECLARE_JNI_CLASS_SPECIALIZATION_5(NS0, NS1, NS2, NS3, Type) \
Q_DECLARE_JNI_CLASS_SPECIALIZATION_2(NS0::NS1::NS2::NS3::Type, #NS0 "/" #NS1 "/" #NS2 "/" #NS3 "/" #Type) Q_DECLARE_JNI_CLASS_SPECIALIZATION_2(NS0::NS1::NS2::NS3::Type, \
#NS0 "/" #NS1 "/" #NS2 "/" #NS3 "/" #Type)
#define Q_DECLARE_JNI_CLASS_6(NS0, NS1, NS2, NS3, NS4, Type) \ #define Q_DECLARE_JNI_CLASS_6(NS0, NS1, NS2, NS3, NS4, Type) \
inline namespace NS0 { \ namespace NS0 { \
Q_DECLARE_JNI_CLASS_5(NS1, NS2, NS3, NS4, Type) \ Q_DECLARE_JNI_CLASS_5(NS1, NS2, NS3, NS4, Type) \
} \ } \
#define Q_DECLARE_JNI_CLASS_SPECIALIZATION_6(NS0, NS1, NS2, NS3, NS4, Type) \ #define Q_DECLARE_JNI_CLASS_SPECIALIZATION_6(NS0, NS1, NS2, NS3, NS4, Type) \
Q_DECLARE_JNI_CLASS_SPECIALIZATION_2(NS0::NS1::NS2::NS3::NS4::Type, #NS0 "/" #NS1 "/" #NS2 "/" #NS3 "/" #NS4 "/" #Type) Q_DECLARE_JNI_CLASS_SPECIALIZATION_2(NS0::NS1::NS2::NS3::NS4::Type, \
#NS0 "/" #NS1 "/" #NS2 "/" #NS3 "/" #NS4 "/" #Type)
#define Q_DECLARE_JNI_CLASS_7(NS0, NS1, NS2, NS3, NS4, NS5, Type) \ #define Q_DECLARE_JNI_CLASS_7(NS0, NS1, NS2, NS3, NS4, NS5, Type) \
inline namespace NS0 { \ namespace NS0 { \
Q_DECLARE_JNI_CLASS_6(NS1, NS2, NS3, NS4, NS5, Type) \ Q_DECLARE_JNI_CLASS_6(NS1, NS2, NS3, NS4, NS5, Type) \
} \ } \
#define Q_DECLARE_JNI_CLASS_SPECIALIZATION_7(NS0, NS1, NS2, NS3, NS4, NS5, Type) \ #define Q_DECLARE_JNI_CLASS_SPECIALIZATION_7(NS0, NS1, NS2, NS3, NS4, NS5, Type) \
Q_DECLARE_JNI_CLASS_SPECIALIZATION_2(NS0::NS1::NS2::NS3::NS4::NS5::Type, #NS0 "/" #NS1 "/" #NS2 "/" #NS3 "/" #NS4 "/" #NS5 "/" #Type) Q_DECLARE_JNI_CLASS_SPECIALIZATION_2(NS0::NS1::NS2::NS3::NS4::NS5::Type, \
#NS0 "/" #NS1 "/" #NS2 "/" #NS3 "/" #NS4 "/" #NS5 "/" #Type)
#define Q_DECLARE_JNI_CLASS_8(NS0, NS1, NS2, NS3, NS4, NS5, NS6, Type) \ #define Q_DECLARE_JNI_CLASS_8(NS0, NS1, NS2, NS3, NS4, NS5, NS6, Type) \
inline namespace NS0 { \ namespace NS0 { \
Q_DECLARE_JNI_CLASS_7(NS1, NS2, NS3, NS4, NS5, NS6, Type) \ Q_DECLARE_JNI_CLASS_7(NS1, NS2, NS3, NS4, NS5, NS6, Type) \
} \ } \
#define Q_DECLARE_JNI_CLASS_SPECIALIZATION_8(NS0, NS1, NS2, NS3, NS4, NS5, NS6, Type) \ #define Q_DECLARE_JNI_CLASS_SPECIALIZATION_8(NS0, NS1, NS2, NS3, NS4, NS5, NS6, Type) \
Q_DECLARE_JNI_CLASS_SPECIALIZATION_2(NS0::NS1::NS2::NS3::NS4::NS5::NS6::Type, #NS0 "/" #NS1 "/" #NS2 "/" #NS3 "/" #NS4 "/" #NS5 "/" #NS6 "/" #Type) Q_DECLARE_JNI_CLASS_SPECIALIZATION_2(NS0::NS1::NS2::NS3::NS4::NS5::NS6::Type, \
#NS0 "/" #NS1 "/" #NS2 "/" #NS3 "/" #NS4 "/" #NS5 "/" #NS6 "/" #Type)
#define Q_DECLARE_JNI_CLASS_9(NS0, NS1, NS2, NS3, NS4, NS5, NS6, NS7, Type) \ #define Q_DECLARE_JNI_CLASS_9(NS0, NS1, NS2, NS3, NS4, NS5, NS6, NS7, Type) \
inline namespace NS0 { \ namespace NS0 { \
Q_DECLARE_JNI_CLASS_8(NS1, NS2, NS3, NS4, NS5, NS6, NS7, Type) \ Q_DECLARE_JNI_CLASS_8(NS1, NS2, NS3, NS4, NS5, NS6, NS7, Type) \
} \ } \
#define Q_DECLARE_JNI_CLASS_SPECIALIZATION_9(NS0, NS1, NS2, NS3, NS4, NS5, NS6, NS7, Type) \ #define Q_DECLARE_JNI_CLASS_SPECIALIZATION_9(NS0, NS1, NS2, NS3, NS4, NS5, NS6, NS7, Type) \
Q_DECLARE_JNI_CLASS_SPECIALIZATION_2(NS0::NS1::NS2::NS3::NS4::NS5::NS6::NS7::Type, #NS0 "/" #NS1 "/" #NS2 "/" #NS3 "/" #NS4 "/" #NS5 "/" #NS6 "/" #NS7 "/" #Type) Q_DECLARE_JNI_CLASS_SPECIALIZATION_2(NS0::NS1::NS2::NS3::NS4::NS5::NS6::NS7::Type, \
#NS0 "/" #NS1 "/" #NS2 "/" #NS3 "/" #NS4 "/" #NS5 "/" #NS6 "/" #NS7 "/" #Type)
#define Q_DECLARE_JNI_CLASS(...) \ #define Q_DECLARE_JNI_CLASS(...) \
namespace QtJniTypes { \ namespace QtJniTypes { \

13
tests/auto/corelib/kernel/qjnitypes/tst_qjnitypes.cpp
View File

@ -73,16 +73,13 @@ static_assert(QtJniTypes::Traits<QtJniTypes::QtTextToSpeech>::className() == "or
// declaring two types Size in different packages // declaring two types Size in different packages
Q_DECLARE_JNI_CLASS(android, util, Size) Q_DECLARE_JNI_CLASS(android, util, Size)
// inline namespaces, so this works Q_DECLARE_JNI_CLASS(org, qtproject, android, Size)
static_assert(QtJniTypes::Traits<QtJniTypes::Size>::className() == "android/util/Size");
Q_DECLARE_JNI_CLASS(org, qtproject, Size)
// this would now be ambiguous
// static_assert(QtJniTypes::Traits<QtJniTypes::Size>::className() == "android/util/Size");
// but client code can be explicit
static_assert(QtJniTypes::Traits<QtJniTypes::android::util::Size>::className() == "android/util/Size"); static_assert(QtJniTypes::Traits<QtJniTypes::android::util::Size>::className() == "android/util/Size");
static_assert(QtJniTypes::Traits<QtJniTypes::org::qtproject::Size>::className() == "org/qtproject/Size"); static_assert(QtJniTypes::Traits<QtJniTypes::org::qtproject::android::Size>::className() == "org/qtproject/android/Size");
using namespace QtJniTypes::org::qtproject;
static_assert(QtJniTypes::Traits<android::Size>::className() == "org/qtproject/android/Size");
static_assert(QtJniTypes::fieldSignature<jint>() == "I"); static_assert(QtJniTypes::fieldSignature<jint>() == "I");
static_assert(QtJniTypes::fieldSignature<jint[]>() == "[I"); static_assert(QtJniTypes::fieldSignature<jint[]>() == "[I");