93 lines
5.8 KiB
Diff
93 lines
5.8 KiB
Diff
|
Index: libsigc++-2.0.18/sigc++/signal.h
|
||
|
|
===================================================================
|
||
|
|
--- libsigc++-2.0.18.orig/sigc++/signal.h 2007-08-13 13:18:01.000000000 +0200
|
||
|
|
+++ libsigc++-2.0.18/sigc++/signal.h 2007-10-12 11:28:34.000000000 +0200
|
||
|
|
@@ -1660,8 +1660,8 @@ class signal0
|
||
|
|
public:
|
||
|
|
typedef internal::signal_emit0<T_return, T_accumulator> emitter_type;
|
||
|
|
typedef typename emitter_type::result_type result_type;
|
||
|
|
- typedef slot<T_return> slot_type;
|
||
|
|
- typedef slot_list<slot_type> slot_list_type;
|
||
|
|
+ typedef sigc::slot<T_return> slot_type;
|
||
|
|
+ typedef sigc::slot_list<slot_type> slot_list_type;
|
||
|
|
typedef typename slot_list_type::iterator iterator;
|
||
|
|
typedef typename slot_list_type::const_iterator const_iterator;
|
||
|
|
typedef typename slot_list_type::reverse_iterator reverse_iterator;
|
||
|
|
@@ -1769,8 +1769,8 @@ class signal1
|
||
|
|
public:
|
||
|
|
typedef internal::signal_emit1<T_return, T_arg1, T_accumulator> emitter_type;
|
||
|
|
typedef typename emitter_type::result_type result_type;
|
||
|
|
- typedef slot<T_return, T_arg1> slot_type;
|
||
|
|
- typedef slot_list<slot_type> slot_list_type;
|
||
|
|
+ typedef sigc::slot<T_return, T_arg1> slot_type;
|
||
|
|
+ typedef sigc::slot_list<slot_type> slot_list_type;
|
||
|
|
typedef typename slot_list_type::iterator iterator;
|
||
|
|
typedef typename slot_list_type::const_iterator const_iterator;
|
||
|
|
typedef typename slot_list_type::reverse_iterator reverse_iterator;
|
||
|
|
@@ -1880,8 +1880,8 @@ class signal2
|
||
|
|
public:
|
||
|
|
typedef internal::signal_emit2<T_return, T_arg1,T_arg2, T_accumulator> emitter_type;
|
||
|
|
typedef typename emitter_type::result_type result_type;
|
||
|
|
- typedef slot<T_return, T_arg1,T_arg2> slot_type;
|
||
|
|
- typedef slot_list<slot_type> slot_list_type;
|
||
|
|
+ typedef sigc::slot<T_return, T_arg1,T_arg2> slot_type;
|
||
|
|
+ typedef sigc::slot_list<slot_type> slot_list_type;
|
||
|
|
typedef typename slot_list_type::iterator iterator;
|
||
|
|
typedef typename slot_list_type::const_iterator const_iterator;
|
||
|
|
typedef typename slot_list_type::reverse_iterator reverse_iterator;
|
||
|
|
@@ -1993,8 +1993,8 @@ class signal3
|
||
|
|
public:
|
||
|
|
typedef internal::signal_emit3<T_return, T_arg1,T_arg2,T_arg3, T_accumulator> emitter_type;
|
||
|
|
typedef typename emitter_type::result_type result_type;
|
||
|
|
- typedef slot<T_return, T_arg1,T_arg2,T_arg3> slot_type;
|
||
|
|
- typedef slot_list<slot_type> slot_list_type;
|
||
|
|
+ typedef sigc::slot<T_return, T_arg1,T_arg2,T_arg3> slot_type;
|
||
|
|
+ typedef sigc::slot_list<slot_type> slot_list_type;
|
||
|
|
typedef typename slot_list_type::iterator iterator;
|
||
|
|
typedef typename slot_list_type::const_iterator const_iterator;
|
||
|
|
typedef typename slot_list_type::reverse_iterator reverse_iterator;
|
||
|
|
@@ -2108,8 +2108,8 @@ class signal4
|
||
|
|
public:
|
||
|
|
typedef internal::signal_emit4<T_return, T_arg1,T_arg2,T_arg3,T_arg4, T_accumulator> emitter_type;
|
||
|
|
typedef typename emitter_type::result_type result_type;
|
||
|
|
- typedef slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4> slot_type;
|
||
|
|
- typedef slot_list<slot_type> slot_list_type;
|
||
|
|
+ typedef sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4> slot_type;
|
||
|
|
+ typedef sigc::slot_list<slot_type> slot_list_type;
|
||
|
|
typedef typename slot_list_type::iterator iterator;
|
||
|
|
typedef typename slot_list_type::const_iterator const_iterator;
|
||
|
|
typedef typename slot_list_type::reverse_iterator reverse_iterator;
|
||
|
|
@@ -2225,8 +2225,8 @@ class signal5
|
||
|
|
public:
|
||
|
|
typedef internal::signal_emit5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, T_accumulator> emitter_type;
|
||
|
|
typedef typename emitter_type::result_type result_type;
|
||
|
|
- typedef slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5> slot_type;
|
||
|
|
- typedef slot_list<slot_type> slot_list_type;
|
||
|
|
+ typedef sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5> slot_type;
|
||
|
|
+ typedef sigc::slot_list<slot_type> slot_list_type;
|
||
|
|
typedef typename slot_list_type::iterator iterator;
|
||
|
|
typedef typename slot_list_type::const_iterator const_iterator;
|
||
|
|
typedef typename slot_list_type::reverse_iterator reverse_iterator;
|
||
|
|
@@ -2344,8 +2344,8 @@ class signal6
|
||
|
|
public:
|
||
|
|
typedef internal::signal_emit6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, T_accumulator> emitter_type;
|
||
|
|
typedef typename emitter_type::result_type result_type;
|
||
|
|
- typedef slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6> slot_type;
|
||
|
|
- typedef slot_list<slot_type> slot_list_type;
|
||
|
|
+ typedef sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6> slot_type;
|
||
|
|
+ typedef sigc::slot_list<slot_type> slot_list_type;
|
||
|
|
typedef typename slot_list_type::iterator iterator;
|
||
|
|
typedef typename slot_list_type::const_iterator const_iterator;
|
||
|
|
typedef typename slot_list_type::reverse_iterator reverse_iterator;
|
||
|
|
@@ -2465,8 +2465,8 @@ class signal7
|
||
|
|
public:
|
||
|
|
typedef internal::signal_emit7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, T_accumulator> emitter_type;
|
||
|
|
typedef typename emitter_type::result_type result_type;
|
||
|
|
- typedef slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7> slot_type;
|
||
|
|
- typedef slot_list<slot_type> slot_list_type;
|
||
|
|
+ typedef sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7> slot_type;
|
||
|
|
+ typedef sigc::slot_list<slot_type> slot_list_type;
|
||
|
|
typedef typename slot_list_type::iterator iterator;
|
||
|
|
typedef typename slot_list_type::const_iterator const_iterator;
|
||
|
|
typedef typename slot_list_type::reverse_iterator reverse_iterator;
|