Skip to content

Support any signal/slot signature in all interface #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stijnvanbeek wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Support any signal/slot signature in all interface #130

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions core/src/nap/signalslot.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ namespace nap
void disconnect(Signal<Args...>& signal);

/**
* Convenience method to connect a member function with one argument.
* Convenience method to connect a member function.
*/
template <typename U, typename F>
void connect(U* object, F memberFunction) { connect(std::bind(memberFunction, object, std::placeholders::_1)); }
template <typename U>
void connect(U* object, void(U::*memberFunction)(Args...)) { connect([object, memberFunction](Args... args){ (object->*memberFunction)(args...); }); }

/**
* Call operator to trigger the signal to be emitted.
Expand Down Expand Up @@ -144,24 +144,28 @@ namespace nap
{ }

/**
* This templated constructor can be used to initialize the slot with a member function with one single parameter
* This templated constructor can be used to initialize the slot with a member function
* @param parent parent object
* @param memberFunction member function to call
*/
template <typename U, typename F>
Slot(U* parent, F memberFunction) :
mFunction(std::bind(memberFunction, parent, std::placeholders::_1))
{ }
template <typename U>
Slot(U* parent, void(U::*memberFunction)(Args...))
{
mFunction = [parent, memberFunction](Args... args){ (parent->*memberFunction)(args...); };
}

/**
* This templated constructor can be used to initialize the slot with a member function with one single
* parameter, last argument is a signal to connect to straightaway after construction
* This templated constructor can be used to initialize the slot with a member function,
* last argument is a signal to connect to straightaway after construction
* @param parent parent object
* @param memberFunction member function to call
*/
template <typename U, typename F>
Slot(U* parent, F memberFunction, Signal<Args...>& signal) :
mFunction(std::bind(memberFunction, parent, std::placeholders::_1)) { signal.connect(*this); }
template <typename U>
Slot(U* parent, void(U::*memberFunction)(Args...), Signal<Args...>& signal)
{
mFunction = [parent, memberFunction](Args... args){ (parent->*memberFunction)(args...); };
signal.connect(*this);
}

// Disconnect slot from signals on destruction
~Slot() { disconnect(); }
Expand Down