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/kernel/qproperty.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/kernel/qproperty.h')
| -rw-r--r-- | src/corelib/kernel/qproperty.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/kernel/qproperty.h b/src/corelib/kernel/qproperty.h index 1faf87aadc..f5513be73f 100644 --- a/src/corelib/kernel/qproperty.h +++ b/src/corelib/kernel/qproperty.h @@ -1130,13 +1130,13 @@ private: } }; -#define Q_OBJECT_BINDABLE_PROPERTY3(Class, Type, name) \ +#define QT_OBJECT_BINDABLE_PROPERTY_3(Class, Type, name) \ static constexpr size_t _qt_property_##name##_offset() { \ return offsetof(Class, name); \ } \ QObjectBindableProperty<Class, Type, Class::_qt_property_##name##_offset, nullptr> name; -#define Q_OBJECT_BINDABLE_PROPERTY4(Class, Type, name, Signal) \ +#define QT_OBJECT_BINDABLE_PROPERTY_4(Class, Type, name, Signal) \ static constexpr size_t _qt_property_##name##_offset() { \ return offsetof(Class, name); \ } \ @@ -1144,10 +1144,10 @@ private: #define Q_OBJECT_BINDABLE_PROPERTY(...) \ QT_WARNING_PUSH QT_WARNING_DISABLE_INVALID_OFFSETOF \ - QT_OVERLOADED_MACRO(Q_OBJECT_BINDABLE_PROPERTY, __VA_ARGS__) \ + QT_OVERLOADED_MACRO(QT_OBJECT_BINDABLE_PROPERTY, __VA_ARGS__) \ QT_WARNING_POP -#define Q_OBJECT_BINDABLE_PROPERTY_WITH_ARGS4(Class, Type, name, value) \ +#define QT_OBJECT_BINDABLE_PROPERTY_WITH_ARGS_4(Class, Type, name, value) \ static constexpr size_t _qt_property_##name##_offset() \ { \ return offsetof(Class, name); \ @@ -1156,7 +1156,7 @@ private: QObjectBindableProperty<Class, Type, Class::_qt_property_##name##_offset, nullptr>( \ value); -#define Q_OBJECT_BINDABLE_PROPERTY_WITH_ARGS5(Class, Type, name, value, Signal) \ +#define QT_OBJECT_BINDABLE_PROPERTY_WITH_ARGS_5(Class, Type, name, value, Signal) \ static constexpr size_t _qt_property_##name##_offset() \ { \ return offsetof(Class, name); \ @@ -1167,7 +1167,7 @@ private: #define Q_OBJECT_BINDABLE_PROPERTY_WITH_ARGS(...) \ QT_WARNING_PUSH QT_WARNING_DISABLE_INVALID_OFFSETOF \ - QT_OVERLOADED_MACRO(Q_OBJECT_BINDABLE_PROPERTY_WITH_ARGS, __VA_ARGS__) \ + QT_OVERLOADED_MACRO(QT_OBJECT_BINDABLE_PROPERTY_WITH_ARGS, __VA_ARGS__) \ QT_WARNING_POP template<typename Class, typename T, auto Offset, auto Getter> |