all repos — fluxbox @ ae252c62cb2714dc3d7f1fbdfa81e19cee3828fd

custom fork of the fluxbox windowmanager 

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

I do this to avoid compiler ambiguity between the two versions of connect()
Pavel Labath pavelo@centrum.sk
commit

ae252c62cb2714dc3d7f1fbdfa81e19cee3828fd

parent

05b5974e62fc2ae23262a4930206be8342b148fb

1 files changed, 7 insertions(+), 7 deletions(-)

jump to
M src/FbTk/Signal.hh → src/FbTk/Signal.hh 
@@ -144,7 +144,7 @@ new SlotImpl<Functor, void, Arg1, Arg2, Arg3>(functor)
                     ));
     }
 
-    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 @@ new SlotImpl<Functor, void, Arg1, Arg2>(functor)
                     ));
     }
 
-    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 @@ new SlotImpl<Functor, void, Arg1>(functor)
                     ));
     }
 
-    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 @@ new SlotImpl<Functor, void>(functor)
                     ));
     }
 
-    SlotID connect(const RefCount<FbTk::Slot<void> > &slot) {
+    SlotID connectSlot(const RefCount<FbTk::Slot<void> > &slot) {
         return SignalHolder::connect(slot);
     }
 };

@@ -243,15 +243,15 @@ /// Starts tracking a signal.
     /// @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