diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-08-02 09:58:41 (GMT) |
---|---|---|
committer | Pavel Labath <pavelo@centrum.sk> | 2011-09-14 17:39:11 (GMT) |
commit | ae252c62cb2714dc3d7f1fbdfa81e19cee3828fd (patch) | |
tree | 32fa9947a975c7904ca0491fe226c7ce09a02351 | |
parent | 05b5974e62fc2ae23262a4930206be8342b148fb (diff) | |
download | fluxbox_pavel-ae252c62cb2714dc3d7f1fbdfa81e19cee3828fd.zip fluxbox_pavel-ae252c62cb2714dc3d7f1fbdfa81e19cee3828fd.tar.bz2 |
Rename Signal::connect function taking an already-constructed slot to connectSlot
I do this to avoid compiler ambiguity between the two versions of connect()
-rw-r--r-- | src/FbTk/Signal.hh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/FbTk/Signal.hh b/src/FbTk/Signal.hh index 7de3893..6480690 100644 --- a/src/FbTk/Signal.hh +++ b/src/FbTk/Signal.hh | |||
@@ -144,7 +144,7 @@ public: | |||
144 | )); | 144 | )); |
145 | } | 145 | } |
146 | 146 | ||
147 | SlotID connect(const RefCount<FbTk::Slot<void, Arg1, Arg2, Arg3> > &slot) { | 147 | SlotID connectSlot(const RefCount<FbTk::Slot<void, Arg1, Arg2, Arg3> > &slot) { |
148 | return SignalHolder::connect(slot); | 148 | return SignalHolder::connect(slot); |
149 | } | 149 | } |
150 | }; | 150 | }; |
@@ -169,7 +169,7 @@ public: | |||
169 | )); | 169 | )); |
170 | } | 170 | } |
171 | 171 | ||
172 | SlotID connect(const RefCount<FbTk::Slot<void, Arg1, Arg2> > &slot) { | 172 | SlotID connectSlot(const RefCount<FbTk::Slot<void, Arg1, Arg2> > &slot) { |
173 | return SignalHolder::connect(slot); | 173 | return SignalHolder::connect(slot); |
174 | } | 174 | } |
175 | }; | 175 | }; |
@@ -194,7 +194,7 @@ public: | |||
194 | )); | 194 | )); |
195 | } | 195 | } |
196 | 196 | ||
197 | SlotID connect(const RefCount<FbTk::Slot<void, Arg1> > &slot) { | 197 | SlotID connectSlot(const RefCount<FbTk::Slot<void, Arg1> > &slot) { |
198 | return SignalHolder::connect(slot); | 198 | return SignalHolder::connect(slot); |
199 | } | 199 | } |
200 | }; | 200 | }; |
@@ -219,7 +219,7 @@ public: | |||
219 | )); | 219 | )); |
220 | } | 220 | } |
221 | 221 | ||
222 | SlotID connect(const RefCount<FbTk::Slot<void> > &slot) { | 222 | SlotID connectSlot(const RefCount<FbTk::Slot<void> > &slot) { |
223 | return SignalHolder::connect(slot); | 223 | return SignalHolder::connect(slot); |
224 | } | 224 | } |
225 | }; | 225 | }; |
@@ -243,15 +243,15 @@ public: | |||
243 | /// @return A tracking ID | 243 | /// @return A tracking ID |
244 | template<typename Arg1, typename Arg2, typename Arg3, typename Functor> | 244 | template<typename Arg1, typename Arg2, typename Arg3, typename Functor> |
245 | TrackID join(Signal<Arg1, Arg2, Arg3> &sig, const Functor &functor) { | 245 | TrackID join(Signal<Arg1, Arg2, Arg3> &sig, const Functor &functor) { |
246 | return join(sig, RefCount<Slot<void, Arg1, Arg2, Arg3> >( | 246 | return joinSlot(sig, RefCount<Slot<void, Arg1, Arg2, Arg3> >( |
247 | new SlotImpl<Functor, void, Arg1, Arg2, Arg3>(functor) | 247 | new SlotImpl<Functor, void, Arg1, Arg2, Arg3>(functor) |
248 | )); | 248 | )); |
249 | } | 249 | } |
250 | 250 | ||
251 | template<typename Arg1, typename Arg2, typename Arg3> | 251 | template<typename Arg1, typename Arg2, typename Arg3> |
252 | TrackID | 252 | TrackID |
253 | join(Signal<Arg1, Arg2, Arg3> &sig, const RefCount<Slot<void, Arg1, Arg2, Arg3> > &slot) { | 253 | joinSlot(Signal<Arg1, Arg2, Arg3> &sig, const RefCount<Slot<void, Arg1, Arg2, Arg3> > &slot) { |
254 | ValueType value = ValueType(&sig, sig.connect(slot)); | 254 | ValueType value = ValueType(&sig, sig.connectSlot(slot)); |
255 | std::pair<TrackID, bool> ret = m_connections.insert(value); | 255 | std::pair<TrackID, bool> ret = m_connections.insert(value); |
256 | if ( !ret.second ) { | 256 | if ( !ret.second ) { |
257 | // failed to insert this functor | 257 | // failed to insert this functor |