projects / packages / xmms2.git / blame
| Commit | Line | Data |
|---|---|---|
| 0ebba67d JB |
1 | --- xmms2-0.6DrMattDestruction/src/include/xmmsclient/xmmsclient++/signal.h.orig 2009-04-21 19:51:11.000000000 +0200 |
| 2 | +++ xmms2-0.6DrMattDestruction/src/include/xmmsclient/xmmsclient++/signal.h 2023-06-22 18:59:11.362344508 +0200 | |
| 3 | @@ -18,7 +18,7 @@ | |
| 4 | #define XMMSCLIENTPP_SIGNAL_H | |
| 5 | ||
| 6 | #include <xmmsclient/xmmsclient.h> | |
| 7 | -#include <boost/signal.hpp> | |
| 8 | +#include <boost/signals2.hpp> | |
| 9 | #include <string> | |
| 10 | #include <list> | |
| 11 | #include <iostream> | |
| 12 | @@ -33,7 +33,7 @@ namespace Xmms | |
| 13 | class Coll; | |
| 14 | } | |
| 15 | ||
| 16 | - typedef boost::signal< bool( const std::string& ) > error_sig; | |
| 17 | + typedef boost::signals2::signal< bool( const std::string& ) > error_sig; | |
| 18 | ||
| 19 | /** @class SignalInterface | |
| 20 | * This is here only to unify all Signal classes so that they can be | |
| 21 | @@ -54,7 +54,7 @@ namespace Xmms | |
| 22 | template< typename T > | |
| 23 | struct Signal : public SignalInterface | |
| 24 | { | |
| 25 | - typedef boost::signal< bool( const T& ) > signal_t; | |
| 26 | + typedef boost::signals2::signal< bool( const T& ) > signal_t; | |
| 27 | ||
| 28 | error_sig error_signal; | |
| 29 | signal_t signal; | |
| 30 | @@ -67,7 +67,7 @@ namespace Xmms | |
| 31 | template<> | |
| 32 | struct Signal< void > : public SignalInterface | |
| 33 | { | |
| 34 | - typedef boost::signal< bool() > signal_t; | |
| 35 | + typedef boost::signals2::signal< bool() > signal_t; | |
| 36 | ||
| 37 | error_sig error_signal; | |
| 38 | signal_t signal; | |
| 39 | @@ -212,7 +212,7 @@ namespace Xmms | |
| 40 | inline bool | |
| 41 | callSignal( const Signal< void >* sig, xmmsv_t*& /* val */) | |
| 42 | { | |
| 43 | - return sig->signal(); | |
| 44 | + return *sig->signal(); | |
| 45 | } | |
| 46 | ||
| 47 | /** Called on the notifier udata when an xmmsc_result_t is freed. | |
| 48 | @@ -244,7 +244,7 @@ namespace Xmms | |
| 49 | ||
| 50 | std::string error( buf ); | |
| 51 | if( !data->error_signal.empty() ) { | |
| 52 | - ret = data->error_signal( error ); | |
| 53 | + ret = *data->error_signal( error ); | |
| 54 | } | |
| 55 | ||
| 56 | } | |
| 57 | @@ -257,7 +257,7 @@ namespace Xmms | |
| 58 | catch( std::exception& e ) { | |
| 59 | ||
| 60 | if( !data->error_signal.empty() ) { | |
| 61 | - ret = data->error_signal( e.what() ); | |
| 62 | + ret = *data->error_signal( e.what() ); | |
| 63 | } | |
| 64 | ||
| 65 | } | |
| 66 | @@ -272,7 +272,7 @@ namespace Xmms | |
| 67 | return ret; | |
| 68 | } | |
| 69 | ||
| 70 | - typedef boost::signal< void() > DisconnectCallback; | |
| 71 | + typedef boost::signals2::signal< void() > DisconnectCallback; | |
| 72 | ||
| 73 | void disconnect_callback( void* userdata ); | |
| 74 | /** @endcond INTERNAL */ | |
| 75 | --- xmms2-0.6DrMattDestruction/src/include/xmmsclient/xmmsclient++/helpers.h.orig 2009-04-21 19:51:11.000000000 +0200 | |
| 76 | +++ xmms2-0.6DrMattDestruction/src/include/xmmsclient/xmmsclient++/helpers.h 2023-06-22 18:21:32.241241299 +0200 | |
| 77 | @@ -26,7 +26,7 @@ | |
| 78 | ||
| 79 | #include <boost/bind.hpp> | |
| 80 | #include <boost/function.hpp> | |
| 81 | -#include <boost/signal.hpp> | |
| 82 | +#include <boost/signals2.hpp> | |
| 83 | #include <boost/type_traits/remove_pointer.hpp> | |
| 84 | ||
| 85 | #include <string> |