diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2023-05-05 09:50:11 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2023-05-10 10:30:54 +0200 |
| commit | ccd3b28aab33bd36f9c382cd38352f82396d25da (patch) | |
| tree | 3fb9620986c9297a7eb396f4a342c48a06b4742c /src/corelib/kernel/qobject.h | |
| parent | 0306247f5a5d057fedfa183da06a78cc41139d1d (diff) | |
Rename QFunctorSlotObject to QCallableObject
After the recent changes we only have a single implementation of
QSlotObjectBase, which can handle free functions, member functions,
functors, and lambdas. Rename it to callable, and explicitly hide
the static implementation function so that it doesn't become a symbol
of static libraries using Qt.
Also rename makeSlotObject to makeCallableObject, and polish coding
style and comments in the qobjectdefs_impl header a bit.
Change-Id: Id19107cedfe9c624f807cd8089beb80e9eb99f50
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel/qobject.h')
| -rw-r--r-- | src/corelib/kernel/qobject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h index 9cb025d20d..852f5c7053 100644 --- a/src/corelib/kernel/qobject.h +++ b/src/corelib/kernel/qobject.h @@ -230,7 +230,7 @@ public: pSlot = const_cast<void **>(reinterpret_cast<void *const *>(&slot)); return connectImpl(sender, reinterpret_cast<void **>(&signal), context, pSlot, - QtPrivate::makeSlotObject<Func1>(std::forward<Func2>(slot)), + QtPrivate::makeCallableObject<Func1>(std::forward<Func2>(slot)), type, types, &SignalType::Object::staticMetaObject); } |