diff options
| author | Murray Cumming <murrayc@usa.net> | 2004-02-10 14:26:07 +0000 |
|---|---|---|
| committer | Murray Cumming <murrayc@src.gnome.org> | 2004-02-10 14:26:07 +0000 |
| commit | fc8dea9ce4bcf8963ccf0022c2493143406e3fc9 (patch) | |
| tree | 919c768fb9ed0f6c0f6c27b2acd687bc0bbfe387 /glib/glibmm/dispatcher.cc | |
| parent | 81738d5465fee36af441e6a0cbe5ffcd1b874f8b (diff) | |
| download | glibmm-fc8dea9ce4bcf8963ccf0022c2493143406e3fc9.tar.gz | |
glibmm now uses libsigc++ 2 instead of libsigc++ 1.2. See bug #125061 for
2004-02-10 Murray Cumming <murrayc@usa.net>
* glibmm now uses libsigc++ 2 instead of libsigc++ 1.2. See bug
#125061 for more details. We must update CHANGES later.
Diffstat (limited to 'glib/glibmm/dispatcher.cc')
| -rw-r--r-- | glib/glibmm/dispatcher.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/glib/glibmm/dispatcher.cc b/glib/glibmm/dispatcher.cc index cc104b83..8d698687 100644 --- a/glib/glibmm/dispatcher.cc +++ b/glib/glibmm/dispatcher.cc @@ -23,7 +23,6 @@ #include <glibmm/fileutils.h> #include <glibmm/main.h> #include <glibmm/thread.h> -#include <sigc++/class_slot.h> #include <fcntl.h> #include <cerrno> @@ -192,7 +191,7 @@ private: #else FD_TYPE fd_sender_; #endif /* G_OS_WIN32 */ - SigC::Connection conn_io_handler_; + sigc::connection conn_io_handler_; void create_pipe(); bool pipe_io_handler(Glib::IOCondition condition); @@ -223,11 +222,11 @@ DispatchNotifier::DispatchNotifier(const Glib::RefPtr<MainContext>& context) { #ifdef G_OS_WIN32 conn_io_handler_ = context_->signal_io().connect( - SigC::slot_class(*this, &DispatchNotifier::pipe_io_handler), + sigc::mem_fun(*this, &DispatchNotifier::pipe_io_handler), GPOINTER_TO_INT(fd_receiver_), Glib::IO_IN); #else conn_io_handler_ = context_->signal_io().connect( - SigC::slot_class(*this, &DispatchNotifier::pipe_io_handler), + sigc::mem_fun(*this, &DispatchNotifier::pipe_io_handler), fd_receiver_, Glib::IO_IN); #endif /* G_OS_WIN32 */ } @@ -244,7 +243,7 @@ DispatchNotifier::DispatchNotifier(const Glib::RefPtr<MainContext>& context) DispatchNotifier::~DispatchNotifier() { - // Disconnect manually because we're using SigC::slot_class(). + // Disconnect manually because we don't inherit from sigc::trackable conn_io_handler_.disconnect(); #ifndef G_OS_WIN32 @@ -465,7 +464,7 @@ void Dispatcher::operator()() emit(); } -SigC::Connection Dispatcher::connect(const SigC::Slot0<void>& slot) +sigc::connection Dispatcher::connect(const sigc::slot<void>& slot) { return signal_.connect(slot); } |