Added Signal::connect() function that takes an object + function pointer.
This commit is contained in:
parent
7c1dd29a85
commit
463890cfcb
@ -57,6 +57,8 @@ public:
|
||||
public:
|
||||
template<typename THandler, typename TWeak = void>
|
||||
inline token_t connect(THandler handler, Oneshot oneshot = Oneshot::NO, std::weak_ptr<TWeak> referenced = std::weak_ptr<TWeak>()) noexcept;
|
||||
template<typename TObject, typename TWeak = void>
|
||||
inline token_t connect(TObject& object, void (TObject::* handler)(TArgs...), Oneshot oneshot = Oneshot::NO, std::weak_ptr<TWeak> referenced = std::weak_ptr<TWeak>()) noexcept;
|
||||
inline void disconnect(token_t token) noexcept;
|
||||
inline void emit(TArgs&&... args) noexcept;
|
||||
};
|
||||
@ -82,6 +84,26 @@ inline auto Signal<TArgs...>::connect(THandler handler, Oneshot oneshot, std::we
|
||||
return nextToken++;
|
||||
}
|
||||
|
||||
template<typename... TArgs>
|
||||
template<typename TObject, typename TWeak>
|
||||
inline auto Signal<TArgs...>::connect(TObject& object, void (TObject::* handler)(TArgs...), Oneshot oneshot, std::weak_ptr<TWeak> referenced) noexcept -> token_t
|
||||
{
|
||||
std::lock_guard lock(handlersMutex_);
|
||||
|
||||
auto callable = [object = &object, handler](TArgs... args)
|
||||
{
|
||||
std::invoke(handler, object, std::forward<TArgs>(args)...);
|
||||
};
|
||||
handlers_.push_back({
|
||||
.callable = std::move(callable),
|
||||
.referenced = std::move(referenced),
|
||||
.token = nextToken,
|
||||
.oneshot = oneshot
|
||||
});
|
||||
|
||||
return nextToken++;
|
||||
}
|
||||
|
||||
template<typename... TArgs>
|
||||
inline void Signal<TArgs...>::disconnect(token_t token) noexcept
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user