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

Rename Signal::connect function taking an already-constructed slot to connectSlot

Browse source 
I do this to avoid compiler ambiguity between the two versions of connect()
This commit is contained in:
Pavel Labath 2011-08-02 11:58:41 +02:00
parent 05b5974e62
commit ae252c62cb
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/FbTk/Signal.hh
View file

@ -144,7 +144,7 @@ public:
));
}
SlotID connect(const RefCount<FbTk::Slot<void, Arg1, Arg2, Arg3> > &slot) {
SlotID connectSlot(const RefCount<FbTk::Slot<void, Arg1, Arg2, Arg3> > &slot) {
return SignalHolder::connect(slot);
}
};
@ -169,7 +169,7 @@ public:
));
}
SlotID connect(const RefCount<FbTk::Slot<void, Arg1, Arg2> > &slot) {
SlotID connectSlot(const RefCount<FbTk::Slot<void, Arg1, Arg2> > &slot) {
return SignalHolder::connect(slot);
}
};
@ -194,7 +194,7 @@ public:
));
}
SlotID connect(const RefCount<FbTk::Slot<void, Arg1> > &slot) {
SlotID connectSlot(const RefCount<FbTk::Slot<void, Arg1> > &slot) {
return SignalHolder::connect(slot);
}
};
@ -219,7 +219,7 @@ public:
));
}
SlotID connect(const RefCount<FbTk::Slot<void> > &slot) {
SlotID connectSlot(const RefCount<FbTk::Slot<void> > &slot) {
return SignalHolder::connect(slot);
}
};
@ -243,15 +243,15 @@ public:
/// @return A tracking ID
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> >(
return joinSlot(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));
joinSlot(Signal<Arg1, Arg2, Arg3> &sig, const RefCount<Slot<void, Arg1, Arg2, Arg3> > &slot) {
ValueType value = ValueType(&sig, sig.connectSlot(slot));
std::pair<TrackID, bool> ret = m_connections.insert(value);
if ( !ret.second ) {
// failed to insert this functor