nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Signal::connect now also accepts an already-constructed Slot

Browse source 
This way we can use Commands as signal handlers out-of-the-box.
This commit is contained in:
Pavel Labath 2011-07-09 23:57:32 +02:00
parent bca20c5db4
commit d338e6c003
1 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/FbTk/Signal.hh
View file

@ -143,6 +143,10 @@ public:
new SlotImpl<Functor, void, Arg1, Arg2, Arg3>(functor)
));
}
SlotID connect(const RefCount<FbTk::Slot<void, Arg1, Arg2, Arg3> > &slot) {
return SignalHolder::connect(slot);
}
};
/// Specialization for two arguments.
@ -164,6 +168,10 @@ public:
new SlotImpl<Functor, void, Arg1, Arg2>(functor)
));
}
SlotID connect(const RefCount<FbTk::Slot<void, Arg1, Arg2> > &slot) {
return SignalHolder::connect(slot);
}
};
/// Specialization for one argument.
@ -185,6 +193,10 @@ public:
new SlotImpl<Functor, void, Arg1>(functor)
));
}
SlotID connect(const RefCount<FbTk::Slot<void, Arg1> > &slot) {
return SignalHolder::connect(slot);
}
};
/// Specialization for no arguments.
@ -206,6 +218,10 @@ public:
new SlotImpl<Functor, void>(functor)
));
}
SlotID connect(const RefCount<FbTk::Slot<void> > &slot) {
return SignalHolder::connect(slot);
}
};
/**
@ -225,9 +241,17 @@ public:
/// Starts tracking a signal.
/// @return A tracking ID
template <typename Signal, typename Functor>
TrackID join(Signal& sig, const Functor& functor) {
ValueType value = ValueType(&sig, sig.connect(functor));
template<typename Arg1, typename Arg2, typename Arg3, typename Functor>
TrackID join(Signal<Arg1, Arg2, Arg3> &sig, const Functor &functor) {
return join(sig, RefCount<Slot<void, Arg1, Arg2, Arg3> >(
new SlotImpl<Functor, void, Arg1, Arg2, Arg3>(functor)
));
}
template<typename Arg1, typename Arg2, typename Arg3>
TrackID
join(Signal<Arg1, Arg2, Arg3> &sig, const RefCount<Slot<void, Arg1, Arg2, Arg3> > &slot) {
ValueType value = ValueType(&sig, sig.connect(slot));
std::pair<TrackID, bool> ret = m_connections.insert(value);
if ( !ret.second ) {
// failed to insert this functor