diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-05-03 15:55:00 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-05-04 22:11:24 +0200 |
| commit | f9f64cd3447425ef3d3f60c6cbf01fcfd339f6db (patch) | |
| tree | 88f476ec76306be5da872828be444020b1d6e965 /src/corelib/global/qglobal.h | |
| parent | 3a7d0e516bac285b8cc8ac036f4c703d0bd4790c (diff) | |
Tweak naming of QT_OVERLOADED_MACRO variants
Add a _ suffix before the number of arguments, to improve readability
of the argument-specific functions.
Change-Id: I1dfc4f381450825dd143ece524bb10e117c09971
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 1b92b5e8b6..966fa5d87c 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1391,7 +1391,7 @@ inline int qIntCast(float f) { return int(f); } #define QT_VA_ARGS_CHOOSE(_1, _2, _3, _4, _5, _6, _7, _8, _9, N, ...) N #define QT_VA_ARGS_EXPAND(...) __VA_ARGS__ // Needed for MSVC #define QT_VA_ARGS_COUNT(...) QT_VA_ARGS_EXPAND(QT_VA_ARGS_CHOOSE(__VA_ARGS__, 9, 8, 7, 6, 5, 4, 3, 2, 1)) -#define QT_OVERLOADED_MACRO_EXPAND(MACRO, ARGC) MACRO##ARGC +#define QT_OVERLOADED_MACRO_EXPAND(MACRO, ARGC) MACRO##_##ARGC #define QT_OVERLOADED_MACRO_IMP(MACRO, ARGC) QT_OVERLOADED_MACRO_EXPAND(MACRO, ARGC) #define QT_OVERLOADED_MACRO(MACRO, ...) QT_VA_ARGS_EXPAND(QT_OVERLOADED_MACRO_IMP(MACRO, QT_VA_ARGS_COUNT(__VA_ARGS__))(__VA_ARGS__)) @@ -1407,13 +1407,13 @@ inline int qIntCast(float f) { return int(f); } QNativeInterface *nativeInterface() const; // Provides a definition for the interface destructor -#define QT_DEFINE_NATIVE_INTERFACE2(Namespace, InterfaceClass) \ +#define QT_DEFINE_NATIVE_INTERFACE_2(Namespace, InterfaceClass) \ QT_PREPEND_NAMESPACE(Namespace)::InterfaceClass::~InterfaceClass() = default // Provides a definition for the destructor, and an explicit // template instantiation of the native interface accessor. -#define QT_DEFINE_NATIVE_INTERFACE3(Namespace, InterfaceClass, PublicClass) \ - QT_DEFINE_NATIVE_INTERFACE2(Namespace, InterfaceClass); \ +#define QT_DEFINE_NATIVE_INTERFACE_3(Namespace, InterfaceClass, PublicClass) \ + QT_DEFINE_NATIVE_INTERFACE_2(Namespace, InterfaceClass); \ template Q_DECL_EXPORT QT_PREPEND_NAMESPACE(Namespace)::InterfaceClass *PublicClass::nativeInterface() const #define QT_DEFINE_NATIVE_INTERFACE(...) QT_OVERLOADED_MACRO(QT_DEFINE_NATIVE_INTERFACE, QNativeInterface, __VA_ARGS__) |