ekiga r7382 - in trunk/lib/engine: account/skel addressbook/call-history addressbook/ldap addressbook/skel audioinput/skel audiooutput/skel chat/skel components/opal components/resource-list components/xcap framework gui/gtk-core hal/skel presence/local-roster presence/skel protocol/skel videoinput/skel videooutput/skel
- From: jpuydt svn gnome org
- To: svn-commits-list gnome org
- Subject: ekiga r7382 - in trunk/lib/engine: account/skel addressbook/call-history addressbook/ldap addressbook/skel audioinput/skel audiooutput/skel chat/skel components/opal components/resource-list components/xcap framework gui/gtk-core hal/skel presence/local-roster presence/skel protocol/skel videoinput/skel videooutput/skel
- Date: Tue, 18 Nov 2008 20:04:12 +0000 (UTC)
Author: jpuydt
Date: Tue Nov 18 20:04:12 2008
New Revision: 7382
URL: http://svn.gnome.org/viewvc/ekiga?rev=7382&view=rev
Log:
Made all arities explicit for both sigc::signal and sigc::slot
Modified:
trunk/lib/engine/account/skel/account-core.cpp
trunk/lib/engine/account/skel/account-core.h
trunk/lib/engine/account/skel/account.h
trunk/lib/engine/account/skel/bank-impl.h
trunk/lib/engine/account/skel/bank.h
trunk/lib/engine/addressbook/call-history/history-book.h
trunk/lib/engine/addressbook/ldap/ldap-book.cpp
trunk/lib/engine/addressbook/ldap/ldap-book.h
trunk/lib/engine/addressbook/skel/book-impl.h
trunk/lib/engine/addressbook/skel/book.h
trunk/lib/engine/addressbook/skel/contact-core.cpp
trunk/lib/engine/addressbook/skel/contact-core.h
trunk/lib/engine/addressbook/skel/contact.h
trunk/lib/engine/addressbook/skel/source-impl.h
trunk/lib/engine/addressbook/skel/source.h
trunk/lib/engine/audioinput/skel/audioinput-core.cpp
trunk/lib/engine/audioinput/skel/audioinput-core.h
trunk/lib/engine/audioinput/skel/audioinput-manager.h
trunk/lib/engine/audiooutput/skel/audiooutput-core.cpp
trunk/lib/engine/audiooutput/skel/audiooutput-core.h
trunk/lib/engine/audiooutput/skel/audiooutput-manager.h
trunk/lib/engine/chat/skel/chat-core.cpp
trunk/lib/engine/chat/skel/chat-core.h
trunk/lib/engine/chat/skel/chat-manager.h
trunk/lib/engine/chat/skel/chat.h
trunk/lib/engine/chat/skel/dialect-impl.h
trunk/lib/engine/chat/skel/dialect.h
trunk/lib/engine/components/opal/opal-account.h
trunk/lib/engine/components/opal/sip-chat-simple.cpp
trunk/lib/engine/components/opal/sip-chat-simple.h
trunk/lib/engine/components/opal/sip-dialect.cpp
trunk/lib/engine/components/opal/sip-dialect.h
trunk/lib/engine/components/resource-list/rl-heap.cpp
trunk/lib/engine/components/resource-list/rl-heap.h
trunk/lib/engine/components/resource-list/rl-list.cpp
trunk/lib/engine/components/resource-list/rl-list.h
trunk/lib/engine/components/resource-list/rl-presentity.h
trunk/lib/engine/components/xcap/xcap-core.cpp
trunk/lib/engine/components/xcap/xcap-core.h
trunk/lib/engine/framework/form-request-simple.cpp
trunk/lib/engine/framework/form-request-simple.h
trunk/lib/engine/framework/gmconf-bridge.h
trunk/lib/engine/framework/lister.h
trunk/lib/engine/framework/menu-builder-tools.cpp
trunk/lib/engine/framework/menu-builder-tools.h
trunk/lib/engine/framework/menu-builder.cpp
trunk/lib/engine/framework/menu-builder.h
trunk/lib/engine/framework/personal-details.h
trunk/lib/engine/framework/reflister.h
trunk/lib/engine/framework/runtime-glib.cpp
trunk/lib/engine/framework/runtime-glib.h
trunk/lib/engine/framework/runtime.h
trunk/lib/engine/framework/services.h
trunk/lib/engine/gui/gtk-core/menu-builder-gtk.cpp
trunk/lib/engine/gui/gtk-core/menu-builder-gtk.h
trunk/lib/engine/gui/gtk-core/toolbar-builder-gtk.cpp
trunk/lib/engine/gui/gtk-core/toolbar-builder-gtk.h
trunk/lib/engine/hal/skel/hal-core.cpp
trunk/lib/engine/hal/skel/hal-core.h
trunk/lib/engine/hal/skel/hal-manager.h
trunk/lib/engine/presence/local-roster/local-presentity.h
trunk/lib/engine/presence/skel/cluster-impl.h
trunk/lib/engine/presence/skel/cluster.h
trunk/lib/engine/presence/skel/heap-impl.h
trunk/lib/engine/presence/skel/heap.h
trunk/lib/engine/presence/skel/presence-core.cpp
trunk/lib/engine/presence/skel/presence-core.h
trunk/lib/engine/presence/skel/presentity.h
trunk/lib/engine/protocol/skel/call-core.h
trunk/lib/engine/protocol/skel/call-manager.h
trunk/lib/engine/protocol/skel/call.h
trunk/lib/engine/videoinput/skel/videoinput-core.cpp
trunk/lib/engine/videoinput/skel/videoinput-core.h
trunk/lib/engine/videoinput/skel/videoinput-manager.h
trunk/lib/engine/videooutput/skel/videooutput-core.cpp
trunk/lib/engine/videooutput/skel/videooutput-core.h
trunk/lib/engine/videooutput/skel/videooutput-manager.h
Modified: trunk/lib/engine/account/skel/account-core.cpp
==============================================================================
--- trunk/lib/engine/account/skel/account-core.cpp (original)
+++ trunk/lib/engine/account/skel/account-core.cpp Tue Nov 18 20:04:12 2008
@@ -104,7 +104,7 @@
}
-void Ekiga::AccountCore::visit_banks (sigc::slot<bool, Bank &> visitor)
+void Ekiga::AccountCore::visit_banks (sigc::slot1<bool, Bank &> visitor)
{
bool go_on = true;
Modified: trunk/lib/engine/account/skel/account-core.h
==============================================================================
--- trunk/lib/engine/account/skel/account-core.h (original)
+++ trunk/lib/engine/account/skel/account-core.h Tue Nov 18 20:04:12 2008
@@ -109,31 +109,31 @@
* @param The callback (the return value means "go on" and allows
* stopping the visit)
*/
- void visit_banks (sigc::slot<bool, Bank &> visitor);
+ void visit_banks (sigc::slot1<bool, Bank &> visitor);
/** This signal is emitted when a bank has been added to the core
*/
- sigc::signal<void, Bank &> bank_added;
+ sigc::signal1<void, Bank &> bank_added;
/** This signal is emitted when a bank has been removed from the core
*/
- sigc::signal<void, Bank &> bank_removed;
+ sigc::signal1<void, Bank &> bank_removed;
/** This signal is emitted when a account has been added to one of
* the banks
*/
- sigc::signal<void, Account &> account_added;
+ sigc::signal1<void, Account &> account_added;
/** This signal is emitted when a account has been removed from one of
* the banks
*/
- sigc::signal<void, Account &> account_removed;
+ sigc::signal1<void, Account &> account_removed;
/** This signal is emitted when a account has been updated in one of
* the banks
*/
- sigc::signal<void, Account &> account_updated;
+ sigc::signal1<void, Account &> account_updated;
private:
@@ -165,7 +165,7 @@
/** This signal is emitted when the AccountCore Service has been
* updated.
*/
- sigc::signal<void> updated;
+ sigc::signal0<void> updated;
/** This chain allows the AccountCore to present forms to the user
@@ -178,14 +178,14 @@
* state is the state
* info contains information about the registration status
*/
- sigc::signal<void, const Ekiga::Account &, Ekiga::AccountCore::RegistrationState, std::string> registration_event;
+ sigc::signal3<void, const Ekiga::Account &, Ekiga::AccountCore::RegistrationState, std::string> registration_event;
/** This signal is emitted when there is a new message waiting event
* @param: account is the account
* info contains information about the indication
*/
- sigc::signal<void, const Ekiga::Account &, std::string> mwi_event;
+ sigc::signal2<void, const Ekiga::Account &, std::string> mwi_event;
/*** Account Subscriber API ***/
Modified: trunk/lib/engine/account/skel/account.h
==============================================================================
--- trunk/lib/engine/account/skel/account.h (original)
+++ trunk/lib/engine/account/skel/account.h Tue Nov 18 20:04:12 2008
@@ -171,12 +171,12 @@
/** This signal is emitted when the Account has been updated.
*/
- sigc::signal<void> updated;
+ sigc::signal0<void> updated;
/** This signal is emitted when the Account has been removed.
*/
- sigc::signal<void> removed;
+ sigc::signal0<void> removed;
/** This signal is emitted when there is a new registration event for
@@ -184,13 +184,13 @@
* @param: state is the state
* info contains information about the registration status
*/
- sigc::signal<void, Ekiga::AccountCore::RegistrationState, std::string> registration_event;
+ sigc::signal2<void, Ekiga::AccountCore::RegistrationState, std::string> registration_event;
/** This signal is emitted when there is a new message waiting indication
* @param: mwi is the message waiting indication
*/
- sigc::signal<void, std::string> mwi_event;
+ sigc::signal1<void, std::string> mwi_event;
/** This chain allows the Account to present forms to the user
Modified: trunk/lib/engine/account/skel/bank-impl.h
==============================================================================
--- trunk/lib/engine/account/skel/bank-impl.h (original)
+++ trunk/lib/engine/account/skel/bank-impl.h Tue Nov 18 20:04:12 2008
@@ -99,7 +99,7 @@
* @param The callback (the return value means "go on" and allows
* stopping the visit)
*/
- void visit_accounts (sigc::slot<bool, Account &> visitor);
+ void visit_accounts (sigc::slot1<bool, Account &> visitor);
/** Find the account with the given address of record in the Bank
* @param aor is the address of record of the Account or the host to search
@@ -222,7 +222,7 @@
template<typename T>
void
-Ekiga::BankImpl<T>::visit_accounts (sigc::slot<bool, Account &> visitor)
+Ekiga::BankImpl<T>::visit_accounts (sigc::slot1<bool, Account &> visitor)
{
Lister<T>::visit_objects (visitor);
}
Modified: trunk/lib/engine/account/skel/bank.h
==============================================================================
--- trunk/lib/engine/account/skel/bank.h (original)
+++ trunk/lib/engine/account/skel/bank.h Tue Nov 18 20:04:12 2008
@@ -63,7 +63,7 @@
* @param The callback (the return value means "go on" and allows
* stopping the visit)
*/
- virtual void visit_accounts (sigc::slot<bool, Account &> visitor) = 0;
+ virtual void visit_accounts (sigc::slot1<bool, Account &> visitor) = 0;
/** Find the account with the given address of record in the Bank
@@ -83,28 +83,28 @@
/** This signal is emitted when a account has been added.
*/
- sigc::signal<void, Account &> account_added;
+ sigc::signal1<void, Account &> account_added;
/** This signal is emitted when a account has been removed.
*/
- sigc::signal<void, Account &> account_removed;
+ sigc::signal1<void, Account &> account_removed;
/** This signal is emitted when a account has been updated.
*/
- sigc::signal<void, Account &> account_updated;
+ sigc::signal1<void, Account &> account_updated;
/** This signal is emitted when there is a new registration event
* @param: account is the account
* state is the state
* info contains information about the registration status
*/
- sigc::signal<void, const Ekiga::Account *, Ekiga::AccountCore::RegistrationState, std::string> registration_event;
+ sigc::signal3<void, const Ekiga::Account *, Ekiga::AccountCore::RegistrationState, std::string> registration_event;
/** This signal is emitted when there is a new message waiting event
* @param: account is the account
* info contains information about the indication
*/
- sigc::signal<void, const Ekiga::Account *, std::string> mwi_event;
+ sigc::signal2<void, const Ekiga::Account *, std::string> mwi_event;
/** This chain allows the BankImpl to present forms to the user
*/
Modified: trunk/lib/engine/addressbook/call-history/history-book.h
==============================================================================
--- trunk/lib/engine/addressbook/call-history/history-book.h (original)
+++ trunk/lib/engine/addressbook/call-history/history-book.h Tue Nov 18 20:04:12 2008
@@ -87,7 +87,7 @@
void clear ();
- sigc::signal<void> cleared;
+ sigc::signal0<void> cleared;
private:
Modified: trunk/lib/engine/addressbook/ldap/ldap-book.cpp
==============================================================================
--- trunk/lib/engine/addressbook/ldap/ldap-book.cpp (original)
+++ trunk/lib/engine/addressbook/ldap/ldap-book.cpp Tue Nov 18 20:04:12 2008
@@ -134,7 +134,7 @@
const std::string _authcID,
const std::string _password,
const std::string _search_string,
- sigc::slot<void, std::vector<OPENLDAP::Contact *> > _publish_results):
+ sigc::slot1<void, std::vector<OPENLDAP::Contact *> > _publish_results):
core(_core), name(_name), uri(_uri),
base(_base), scope(_scope), call_attribute(_call_attribute),
authcID(_authcID), password(_password), search_string(_search_string),
@@ -159,7 +159,7 @@
std::string error_message;
/* callback */
- sigc::slot<void, std::vector<OPENLDAP::Contact *> > publish_results;
+ sigc::slot1<void, std::vector<OPENLDAP::Contact *> > publish_results;
};
#endif
Modified: trunk/lib/engine/addressbook/ldap/ldap-book.h
==============================================================================
--- trunk/lib/engine/addressbook/ldap/ldap-book.h (original)
+++ trunk/lib/engine/addressbook/ldap/ldap-book.h Tue Nov 18 20:04:12 2008
@@ -111,7 +111,7 @@
xmlNodePtr get_node ();
- sigc::signal<void> trigger_saving;
+ sigc::signal0<void> trigger_saving;
/* public for access from C */
void on_sasl_form_submitted (bool, Ekiga::Form &);
Modified: trunk/lib/engine/addressbook/skel/book-impl.h
==============================================================================
--- trunk/lib/engine/addressbook/skel/book-impl.h (original)
+++ trunk/lib/engine/addressbook/skel/book-impl.h Tue Nov 18 20:04:12 2008
@@ -94,7 +94,7 @@
* @param The callback (the return value means "go on" and allows
* stopping the visit)
*/
- void visit_contacts (sigc::slot<bool, gmref_ptr<Contact> > visitor);
+ void visit_contacts (sigc::slot1<bool, gmref_ptr<Contact> > visitor);
protected:
@@ -160,7 +160,7 @@
template<typename ContactType>
void
-Ekiga::BookImpl<ContactType>::visit_contacts (sigc::slot<bool, gmref_ptr<Contact> > visitor)
+Ekiga::BookImpl<ContactType>::visit_contacts (sigc::slot1<bool, gmref_ptr<Contact> > visitor)
{
RefLister<ContactType>::visit_objects (visitor);
}
Modified: trunk/lib/engine/addressbook/skel/book.h
==============================================================================
--- trunk/lib/engine/addressbook/skel/book.h (original)
+++ trunk/lib/engine/addressbook/skel/book.h Tue Nov 18 20:04:12 2008
@@ -63,7 +63,7 @@
* @param The callback (the return value means "go on" and allows
* stopping the visit)
*/
- virtual void visit_contacts (sigc::slot<bool, gmref_ptr<Contact> >) = 0;
+ virtual void visit_contacts (sigc::slot1<bool, gmref_ptr<Contact> >) = 0;
/** Create the menu for that book and its actions.
@@ -108,27 +108,27 @@
/** This signal is emitted when the Book has been updated.
*/
- sigc::signal<void> updated;
+ sigc::signal0<void> updated;
/** This signal is emitted when the Book has been removed from the Source.
*/
- sigc::signal<void> removed;
+ sigc::signal0<void> removed;
/** This signal is emitted when a Contact has been added to the Book.
*/
- sigc::signal<void, gmref_ptr<Contact> > contact_added;
+ sigc::signal1<void, gmref_ptr<Contact> > contact_added;
/** This signal is emitted when a Contact has been removed from the Book.
*/
- sigc::signal<void, gmref_ptr<Contact> > contact_removed;
+ sigc::signal1<void, gmref_ptr<Contact> > contact_removed;
/** This signal is emitted when a Contact has been updated in the Book.
*/
- sigc::signal<void, gmref_ptr<Contact> > contact_updated;
+ sigc::signal1<void, gmref_ptr<Contact> > contact_updated;
/** This chain allows the Book to present forms to the user
Modified: trunk/lib/engine/addressbook/skel/contact-core.cpp
==============================================================================
--- trunk/lib/engine/addressbook/skel/contact-core.cpp (original)
+++ trunk/lib/engine/addressbook/skel/contact-core.cpp Tue Nov 18 20:04:12 2008
@@ -85,7 +85,7 @@
}
void
-Ekiga::ContactCore::visit_sources (sigc::slot<bool, gmref_ptr<Source> > visitor)
+Ekiga::ContactCore::visit_sources (sigc::slot1<bool, gmref_ptr<Source> > visitor)
{
bool go_on = true;
Modified: trunk/lib/engine/addressbook/skel/contact-core.h
==============================================================================
--- trunk/lib/engine/addressbook/skel/contact-core.h (original)
+++ trunk/lib/engine/addressbook/skel/contact-core.h Tue Nov 18 20:04:12 2008
@@ -108,43 +108,43 @@
* @param The callback (the return value means "go on" and allows
* stopping the visit)
*/
- void visit_sources (sigc::slot<bool, gmref_ptr<Source> > visitor);
+ void visit_sources (sigc::slot1<bool, gmref_ptr<Source> > visitor);
/** This signal is emitted when a Ekiga::Source has been
* added to the ContactCore Service.
*/
- sigc::signal<void, gmref_ptr<Source> > source_added;
+ sigc::signal1<void, gmref_ptr<Source> > source_added;
/** This signal is emitted when a book has been added to one of
* the sources
*/
- sigc::signal<void, gmref_ptr<Source>, gmref_ptr<Book> > book_added;
+ sigc::signal2<void, gmref_ptr<Source>, gmref_ptr<Book> > book_added;
/** This signal is emitted when a book has been removed from one of
* the sources
*/
- sigc::signal<void, gmref_ptr<Source>, gmref_ptr<Book> > book_removed;
+ sigc::signal2<void, gmref_ptr<Source>, gmref_ptr<Book> > book_removed;
/** This signal is emitted when a book has been updated in one of
* the sources
*/
- sigc::signal<void, gmref_ptr<Source>, gmref_ptr<Book> > book_updated;
+ sigc::signal2<void, gmref_ptr<Source>, gmref_ptr<Book> > book_updated;
/** This signal is emitted when a contact has been added to one of
* the book of one of the sources
*/
- sigc::signal<void, gmref_ptr<Source>, gmref_ptr<Book>, gmref_ptr<Contact> > contact_added;
+ sigc::signal3<void, gmref_ptr<Source>, gmref_ptr<Book>, gmref_ptr<Contact> > contact_added;
/** This signal is emitted when a contact has been removed from one of
* the book of one of the sources
*/
- sigc::signal<void, gmref_ptr<Source>, gmref_ptr<Book>, gmref_ptr<Contact> > contact_removed;
+ sigc::signal3<void, gmref_ptr<Source>, gmref_ptr<Book>, gmref_ptr<Contact> > contact_removed;
/** This signal is emitted when a contact has been updated in one of
* the book of one of the sources
*/
- sigc::signal<void, gmref_ptr<Source>, gmref_ptr<Book>, gmref_ptr<Contact> > contact_updated;
+ sigc::signal3<void, gmref_ptr<Source>, gmref_ptr<Book>, gmref_ptr<Contact> > contact_updated;
private:
@@ -182,7 +182,7 @@
/** This signal is emitted when the ContactCore Service has been
* updated.
*/
- sigc::signal<void> updated;
+ sigc::signal0<void> updated;
/** This chain allows the ContactCore to present forms to the user
Modified: trunk/lib/engine/addressbook/skel/contact.h
==============================================================================
--- trunk/lib/engine/addressbook/skel/contact.h (original)
+++ trunk/lib/engine/addressbook/skel/contact.h Tue Nov 18 20:04:12 2008
@@ -99,12 +99,12 @@
/** This signal is emitted when the Contact has been updated.
*/
- sigc::signal<void> updated;
+ sigc::signal0<void> updated;
/** This signal is emitted when the Contact has been removed.
*/
- sigc::signal<void> removed;
+ sigc::signal0<void> removed;
/** This chain allows the Contact to present forms to the user
*/
Modified: trunk/lib/engine/addressbook/skel/source-impl.h
==============================================================================
--- trunk/lib/engine/addressbook/skel/source-impl.h (original)
+++ trunk/lib/engine/addressbook/skel/source-impl.h Tue Nov 18 20:04:12 2008
@@ -100,7 +100,7 @@
* @param The callback (the return value means "go on" and allows
* stopping the visit)
*/
- void visit_books (sigc::slot<bool, gmref_ptr<Book> > visitor);
+ void visit_books (sigc::slot1<bool, gmref_ptr<Book> > visitor);
protected:
@@ -176,7 +176,7 @@
template<typename BookType>
void
-Ekiga::SourceImpl<BookType>::visit_books (sigc::slot<bool, gmref_ptr<Book> > visitor)
+Ekiga::SourceImpl<BookType>::visit_books (sigc::slot1<bool, gmref_ptr<Book> > visitor)
{
RefLister<BookType>::visit_objects (visitor);
}
Modified: trunk/lib/engine/addressbook/skel/source.h
==============================================================================
--- trunk/lib/engine/addressbook/skel/source.h (original)
+++ trunk/lib/engine/addressbook/skel/source.h Tue Nov 18 20:04:12 2008
@@ -57,7 +57,7 @@
* @param The callback (the return value means "go on" and allows
* stopping the visit)
*/
- virtual void visit_books (sigc::slot<bool, gmref_ptr<Book> >) = 0;
+ virtual void visit_books (sigc::slot1<bool, gmref_ptr<Book> >) = 0;
/** Create the menu for that source and its actions.
@@ -70,32 +70,32 @@
/** This signal is emitted when a Book has been added to the Source.
*/
- sigc::signal<void, gmref_ptr<Book> > book_added;
+ sigc::signal1<void, gmref_ptr<Book> > book_added;
/** This signal is emitted when a Book has been updated in the Source.
*/
- sigc::signal<void, gmref_ptr<Book> > book_updated;
+ sigc::signal1<void, gmref_ptr<Book> > book_updated;
/** This signal is emitted when a Book has been removed in the Source.
*/
- sigc::signal<void, gmref_ptr<Book> > book_removed;
+ sigc::signal1<void, gmref_ptr<Book> > book_removed;
/** This signal is emitted when a Contact has been added to a book in
* this source.
*/
- sigc::signal<void, gmref_ptr<Book>, gmref_ptr<Contact> > contact_added;
+ sigc::signal2<void, gmref_ptr<Book>, gmref_ptr<Contact> > contact_added;
/** This signal is emitted when a Contact has been removed from a book in
* this source.
*/
- sigc::signal<void, gmref_ptr<Book>, gmref_ptr<Contact> > contact_removed;
+ sigc::signal2<void, gmref_ptr<Book>, gmref_ptr<Contact> > contact_removed;
/** This signal is emitted when a Contact has been updated in a book in
* this source
*/
- sigc::signal<void, gmref_ptr<Book>, gmref_ptr<Contact> > contact_updated;
+ sigc::signal2<void, gmref_ptr<Book>, gmref_ptr<Contact> > contact_updated;
/** This chain allows the Source to present forms to the user
*/
Modified: trunk/lib/engine/audioinput/skel/audioinput-core.cpp
==============================================================================
--- trunk/lib/engine/audioinput/skel/audioinput-core.cpp (original)
+++ trunk/lib/engine/audioinput/skel/audioinput-core.cpp Tue Nov 18 20:04:12 2008
@@ -173,7 +173,7 @@
}
-void AudioInputCore::visit_managers (sigc::slot<bool, AudioInputManager &> visitor)
+void AudioInputCore::visit_managers (sigc::slot1<bool, AudioInputManager &> visitor)
{
yield = true;
PWaitAndSignal m(core_mutex);
Modified: trunk/lib/engine/audioinput/skel/audioinput-core.h
==============================================================================
--- trunk/lib/engine/audioinput/skel/audioinput-core.h (original)
+++ trunk/lib/engine/audioinput/skel/audioinput-core.h Tue Nov 18 20:04:12 2008
@@ -133,12 +133,12 @@
/** Triggers a callback for all Ekiga::AudioInputManager sources of the
* AudioInputCore service.
*/
- void visit_managers (sigc::slot<bool, AudioInputManager &> visitor);
+ void visit_managers (sigc::slot1<bool, AudioInputManager &> visitor);
/** This signal is emitted when a Ekiga::AudioInputManager has been
* added to the AudioInputCore Service.
*/
- sigc::signal<void, AudioInputManager &> manager_added;
+ sigc::signal1<void, AudioInputManager &> manager_added;
/*** AudioInput Device Management ***/
@@ -256,23 +256,23 @@
/** See audioinput-manager.h for the API
*/
- sigc::signal<void, AudioInputManager &, AudioInputDevice &, AudioInputSettings&> device_opened;
- sigc::signal<void, AudioInputManager &, AudioInputDevice &> device_closed;
- sigc::signal<void, AudioInputManager &, AudioInputDevice &, AudioInputErrorCodes> device_error;
+ sigc::signal3<void, AudioInputManager &, AudioInputDevice &, AudioInputSettings&> device_opened;
+ sigc::signal2<void, AudioInputManager &, AudioInputDevice &> device_closed;
+ sigc::signal3<void, AudioInputManager &, AudioInputDevice &, AudioInputErrorCodes> device_error;
/** This signal is emitted when an audio device input has been added to the system.
* This signal will be emitted if add_device was called with a device name and
* a manager claimed support for this device.
* @param device the audio input device that was added.
*/
- sigc::signal<void, AudioInputDevice, bool> device_added;
+ sigc::signal2<void, AudioInputDevice, bool> device_added;
/** This signal is emitted when an audio input device has been removed from the system.
* This signal will be emitted if remove_device was called with a device name and
* a manager claimed support for this device.
* @param device the audio input device that was removed.
*/
- sigc::signal<void, AudioInputDevice, bool> device_removed;
+ sigc::signal2<void, AudioInputDevice, bool> device_removed;
private:
void on_device_opened (AudioInputDevice device,
Modified: trunk/lib/engine/audioinput/skel/audioinput-manager.h
==============================================================================
--- trunk/lib/engine/audioinput/skel/audioinput-manager.h (original)
+++ trunk/lib/engine/audioinput/skel/audioinput-manager.h Tue Nov 18 20:04:12 2008
@@ -147,18 +147,18 @@
* @param device the audio input device that was opened.
* @param config the current audio input device configuration (current volume, etc.).
*/
- sigc::signal<void, AudioInputDevice, AudioInputSettings> device_opened;
+ sigc::signal2<void, AudioInputDevice, AudioInputSettings> device_opened;
/** This signal is emitted when an audio input device is closed.
* @param device the audio input device that was closed.
*/
- sigc::signal<void, AudioInputDevice> device_closed;
+ sigc::signal1<void, AudioInputDevice> device_closed;
/** This signal is emitted when an error occurs when opening a audio input device.
* @param device the audio input device that caused the error.
* @param error_code the audio input device error code.
*/
- sigc::signal<void, AudioInputDevice, AudioInputErrorCodes> device_error;
+ sigc::signal2<void, AudioInputDevice, AudioInputErrorCodes> device_error;
protected:
Modified: trunk/lib/engine/audiooutput/skel/audiooutput-core.cpp
==============================================================================
--- trunk/lib/engine/audiooutput/skel/audiooutput-core.cpp (original)
+++ trunk/lib/engine/audiooutput/skel/audiooutput-core.cpp Tue Nov 18 20:04:12 2008
@@ -100,7 +100,7 @@
manager.device_closed.connect (sigc::bind (sigc::mem_fun (this, &AudioOutputCore::on_device_closed), &manager));
}
-void AudioOutputCore::visit_managers (sigc::slot<bool, AudioOutputManager &> visitor)
+void AudioOutputCore::visit_managers (sigc::slot1<bool, AudioOutputManager &> visitor)
{
yield = true;
PWaitAndSignal m_pri(core_mutex[primary]);
Modified: trunk/lib/engine/audiooutput/skel/audiooutput-core.h
==============================================================================
--- trunk/lib/engine/audiooutput/skel/audiooutput-core.h (original)
+++ trunk/lib/engine/audiooutput/skel/audiooutput-core.h Tue Nov 18 20:04:12 2008
@@ -123,12 +123,12 @@
/** Triggers a callback for all Ekiga::AudioOutputManager sources of the
* AudioOutputCore service.
*/
- void visit_managers (sigc::slot<bool, AudioOutputManager &> visitor);
+ void visit_managers (sigc::slot1<bool, AudioOutputManager &> visitor);
/** This signal is emitted when a Ekiga::AudioOutputManager has been
* added to the AudioOutputCore Service.
*/
- sigc::signal<void, AudioOutputManager &> manager_added;
+ sigc::signal1<void, AudioOutputManager &> manager_added;
/** Get a list of all devices supported by all managers registered to the core.
@@ -299,23 +299,23 @@
/** See audiooutput-manager.h for the API
*/
- sigc::signal<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputSettings&> device_opened;
- sigc::signal<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&> device_closed;
- sigc::signal<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputErrorCodes> device_error;
+ sigc::signal4<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputSettings&> device_opened;
+ sigc::signal3<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&> device_closed;
+ sigc::signal4<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputErrorCodes> device_error;
/** This signal is emitted when an audio output device has been added to the system.
* This signal will be emitted if add_device was called with a device name and
* a manager claimed support for this device.
* @param device the audio output device that was added.
*/
- sigc::signal<void, AudioOutputDevice, bool> device_added;
+ sigc::signal2<void, AudioOutputDevice, bool> device_added;
/** This signal is emitted when an audio output device has been removed from the system.
* This signal will be emitted if remove_device was called with a device name and
* a manager claimed support for this device.
* @param device the audio output device that was removed.
*/
- sigc::signal<void, AudioOutputDevice, bool> device_removed;
+ sigc::signal2<void, AudioOutputDevice, bool> device_removed;
private:
void on_device_opened (AudioOutputPS ps,
Modified: trunk/lib/engine/audiooutput/skel/audiooutput-manager.h
==============================================================================
--- trunk/lib/engine/audiooutput/skel/audiooutput-manager.h (original)
+++ trunk/lib/engine/audiooutput/skel/audiooutput-manager.h Tue Nov 18 20:04:12 2008
@@ -151,20 +151,20 @@
* @param device the audio output device that was opened.
* @param config the current audio output device configuration (current volume, etc.).
*/
- sigc::signal<void, AudioOutputPS, AudioOutputDevice, AudioOutputSettings> device_opened;
+ sigc::signal3<void, AudioOutputPS, AudioOutputDevice, AudioOutputSettings> device_opened;
/** This signal is emitted when an audio output device is closed.
* @param prim whether the primary or secondary audio output device was closed.
* @param device the audio output device that was closed.
*/
- sigc::signal<void, AudioOutputPS, AudioOutputDevice> device_closed;
+ sigc::signal2<void, AudioOutputPS, AudioOutputDevice> device_closed;
/** This signal is emitted when an error occurs when opening an audio output device.
* @param prim whether the primary or secondary audio output device caused the error.
* @param device the audio output device that caused the error.
* @param error_code the audio output device error code.
*/
- sigc::signal<void, AudioOutputPS, AudioOutputDevice, AudioOutputErrorCodes> device_error;
+ sigc::signal3<void, AudioOutputPS, AudioOutputDevice, AudioOutputErrorCodes> device_error;
protected:
typedef struct ManagerState {
Modified: trunk/lib/engine/chat/skel/chat-core.cpp
==============================================================================
--- trunk/lib/engine/chat/skel/chat-core.cpp (original)
+++ trunk/lib/engine/chat/skel/chat-core.cpp Tue Nov 18 20:04:12 2008
@@ -50,7 +50,7 @@
}
void
-Ekiga::ChatCore::visit_dialects (sigc::slot<bool, Dialect&> visitor)
+Ekiga::ChatCore::visit_dialects (sigc::slot1<bool, Dialect&> visitor)
{
bool go_on = true;
Modified: trunk/lib/engine/chat/skel/chat-core.h
==============================================================================
--- trunk/lib/engine/chat/skel/chat-core.h (original)
+++ trunk/lib/engine/chat/skel/chat-core.h Tue Nov 18 20:04:12 2008
@@ -95,12 +95,12 @@
* @param The callback (the return value means "go on" and allows stopping
* the visit)
*/
- void visit_dialects (sigc::slot<bool, Dialect&> visitor);
+ void visit_dialects (sigc::slot1<bool, Dialect&> visitor);
/** This signal is emitted when an Ekiga::Dialect has been added to
* the ChatCore service.
*/
- sigc::signal<void, Dialect&> dialect_added;
+ sigc::signal1<void, Dialect&> dialect_added;
private:
@@ -116,7 +116,7 @@
/** This signal is emitted when the ChatCore service has been updated.
*/
- sigc::signal<void> updated;
+ sigc::signal0<void> updated;
/** This chain allows the ChatCore to present forms to the user
*/
Modified: trunk/lib/engine/chat/skel/chat-manager.h
==============================================================================
--- trunk/lib/engine/chat/skel/chat-manager.h (original)
+++ trunk/lib/engine/chat/skel/chat-manager.h Tue Nov 18 20:04:12 2008
@@ -76,26 +76,26 @@
* @param: uri : where the message could not be sent
* error : a string describing the error that occured
*/
- sigc::signal<void, const std::string, const std::string> im_failed;
+ sigc::signal2<void, const std::string, const std::string> im_failed;
/** This signal is emitted when a message has been received
* @param: display_name: the display name of the sender
* uri : the uri of the sender
* message : the message sent by the sender
*/
- sigc::signal<void, const std::string, const std::string, const std::string> im_received;
+ sigc::signal3<void, const std::string, const std::string, const std::string> im_received;
/** This signal is emitted when a message has been sent
* @param: uri : where the message has been sent
* message: the message that was sent
*/
- sigc::signal<void, const std::string, const std::string> im_sent;
+ sigc::signal2<void, const std::string, const std::string> im_sent;
/** This signal is emitted when a chat conversation should be initiated
* @param: uri : the remote party
* display_name : the display name
*/
- sigc::signal<void, const std::string, const std::string> new_chat;
+ sigc::signal2<void, const std::string, const std::string> new_chat;
};
/**
Modified: trunk/lib/engine/chat/skel/chat.h
==============================================================================
--- trunk/lib/engine/chat/skel/chat.h (original)
+++ trunk/lib/engine/chat/skel/chat.h Tue Nov 18 20:04:12 2008
@@ -110,15 +110,15 @@
/** This signal is emitted when the Chat has been updated.
*/
- sigc::signal<void> updated;
+ sigc::signal0<void> updated;
/** This signal is emitted when the user requested to see this Chat
*/
- sigc::signal<void> user_requested;
+ sigc::signal0<void> user_requested;
/** This signal is emitted when the Chat has been removed.
*/
- sigc::signal<void> removed;
+ sigc::signal0<void> removed;
/** Feed possible actions on this Chat to the given MenuBuilder
* @param A MenuBuilder object to populate.
Modified: trunk/lib/engine/chat/skel/dialect-impl.h
==============================================================================
--- trunk/lib/engine/chat/skel/dialect-impl.h (original)
+++ trunk/lib/engine/chat/skel/dialect-impl.h Tue Nov 18 20:04:12 2008
@@ -61,13 +61,13 @@
* @param: The callback (the return value means "go on" and allows
* stopping the visit)
*/
- void visit_simple_chats (sigc::slot<bool, SimpleChat&> visitor);
+ void visit_simple_chats (sigc::slot1<bool, SimpleChat&> visitor);
/** Triggers a callback for all multiple chats of the Dialect.
* @param: The callback (the return value means "go on" and allows
* stopping the visit)
*/
- void visit_multiple_chats (sigc::slot<bool, MultipleChat&> visitor);
+ void visit_multiple_chats (sigc::slot1<bool, MultipleChat&> visitor);
protected:
@@ -129,14 +129,14 @@
template<typename SimpleChatType, typename MultipleChatType>
void
-Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::visit_simple_chats (sigc::slot<bool, SimpleChat&> visitor)
+Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::visit_simple_chats (sigc::slot1<bool, SimpleChat&> visitor)
{
simple_chats.visit_objects (visitor);
}
template<typename SimpleChatType, typename MultipleChatType>
void
-Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::visit_multiple_chats (sigc::slot<bool, MultipleChat&> visitor)
+Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::visit_multiple_chats (sigc::slot1<bool, MultipleChat&> visitor)
{
multiple_chats.visit_objects (visitor);
}
Modified: trunk/lib/engine/chat/skel/dialect.h
==============================================================================
--- trunk/lib/engine/chat/skel/dialect.h (original)
+++ trunk/lib/engine/chat/skel/dialect.h Tue Nov 18 20:04:12 2008
@@ -55,13 +55,13 @@
* @param: The callback (the return value means "go on" and allows
* stopping the visit)
*/
- virtual void visit_simple_chats (sigc::slot<bool, SimpleChat&> visitor) = 0;
+ virtual void visit_simple_chats (sigc::slot1<bool, SimpleChat&> visitor) = 0;
/** Triggers a callback for all multiple chats of the Dialect.
* @param: The callback (the return value means "go on" and allows
* stopping the visit)
*/
- virtual void visit_multiple_chats (sigc::slot<bool, MultipleChat&> visitor) = 0;
+ virtual void visit_multiple_chats (sigc::slot1<bool, MultipleChat&> visitor) = 0;
/** Feed possible actions on this Dialect to the given MenuBuilder
@@ -72,12 +72,12 @@
/** This signal is emitted when an Ekiga::SimpleChat has been added to
* the dialect.
*/
- sigc::signal<void, SimpleChat&> simple_chat_added;
+ sigc::signal1<void, SimpleChat&> simple_chat_added;
/** This signal is emitted when an Ekiga::MultipleChat has been added to
* the dialect.
*/
- sigc::signal<void, MultipleChat&> multiple_chat_added;
+ sigc::signal1<void, MultipleChat&> multiple_chat_added;
/** This chain allows the Dialect to present forms to the user.
*/
Modified: trunk/lib/engine/components/opal/opal-account.h
==============================================================================
--- trunk/lib/engine/components/opal/opal-account.h (original)
+++ trunk/lib/engine/components/opal/opal-account.h Tue Nov 18 20:04:12 2008
@@ -107,7 +107,7 @@
const std::string as_string () const;
- sigc::signal<void> trigger_saving;
+ sigc::signal0<void> trigger_saving;
private:
void on_edit_form_submitted (bool submitted,
Modified: trunk/lib/engine/components/opal/sip-chat-simple.cpp
==============================================================================
--- trunk/lib/engine/components/opal/sip-chat-simple.cpp (original)
+++ trunk/lib/engine/components/opal/sip-chat-simple.cpp Tue Nov 18 20:04:12 2008
@@ -42,7 +42,7 @@
SIP::SimpleChat::SimpleChat (Ekiga::ServiceCore& core_,
std::string name,
std::string uri_,
- sigc::slot<bool, std::string> sender_)
+ sigc::slot1<bool, std::string> sender_)
: core(core_), sender(sender_), uri(uri_)
{
presentity = gmref_ptr<Ekiga::URIPresentity> (new Ekiga::URIPresentity (core, name, uri,
Modified: trunk/lib/engine/components/opal/sip-chat-simple.h
==============================================================================
--- trunk/lib/engine/components/opal/sip-chat-simple.h (original)
+++ trunk/lib/engine/components/opal/sip-chat-simple.h Tue Nov 18 20:04:12 2008
@@ -49,7 +49,7 @@
SimpleChat (Ekiga::ServiceCore& core,
std::string name,
std::string uri,
- sigc::slot<bool, std::string> sender_);
+ sigc::slot1<bool, std::string> sender_);
~SimpleChat ();
@@ -74,7 +74,7 @@
private:
Ekiga::ServiceCore& core;
- sigc::slot<bool, std::string> sender;
+ sigc::slot1<bool, std::string> sender;
std::list<Ekiga::ChatObserver*> observers;
gmref_ptr<Ekiga::Presentity> presentity;
std::string uri;
Modified: trunk/lib/engine/components/opal/sip-dialect.cpp
==============================================================================
--- trunk/lib/engine/components/opal/sip-dialect.cpp (original)
+++ trunk/lib/engine/components/opal/sip-dialect.cpp Tue Nov 18 20:04:12 2008
@@ -40,7 +40,7 @@
#include "sip-dialect.h"
SIP::Dialect::Dialect (Ekiga::ServiceCore& core_,
- sigc::slot<bool, std::string, std::string> sender_)
+ sigc::slot2<bool, std::string, std::string> sender_)
: core(core_), sender(sender_)
{
}
Modified: trunk/lib/engine/components/opal/sip-dialect.h
==============================================================================
--- trunk/lib/engine/components/opal/sip-dialect.h (original)
+++ trunk/lib/engine/components/opal/sip-dialect.h Tue Nov 18 20:04:12 2008
@@ -48,7 +48,7 @@
public:
Dialect (Ekiga::ServiceCore& core_,
/* the strings are : uri then msg */
- sigc::slot<bool, std::string, std::string> sender_);
+ sigc::slot2<bool, std::string, std::string> sender_);
~Dialect ();
@@ -68,7 +68,7 @@
private:
Ekiga::ServiceCore& core;
/* the strings are : uri then msg */
- sigc::slot<bool, std::string, std::string> sender;
+ sigc::slot2<bool, std::string, std::string> sender;
SimpleChat* open_chat_with (std::string uri,
std::string name,
Modified: trunk/lib/engine/components/resource-list/rl-heap.cpp
==============================================================================
--- trunk/lib/engine/components/resource-list/rl-heap.cpp (original)
+++ trunk/lib/engine/components/resource-list/rl-heap.cpp Tue Nov 18 20:04:12 2008
@@ -183,7 +183,7 @@
}
void
-RL::Heap::visit_presentities (sigc::slot<bool, Ekiga::Presentity&> visitor)
+RL::Heap::visit_presentities (sigc::slot1<bool, Ekiga::Presentity&> visitor)
{
bool go_on = true;
Modified: trunk/lib/engine/components/resource-list/rl-heap.h
==============================================================================
--- trunk/lib/engine/components/resource-list/rl-heap.h (original)
+++ trunk/lib/engine/components/resource-list/rl-heap.h Tue Nov 18 20:04:12 2008
@@ -73,7 +73,7 @@
const std::string get_name () const;
- void visit_presentities (sigc::slot<bool, Ekiga::Presentity&> visitor);
+ void visit_presentities (sigc::slot1<bool, Ekiga::Presentity&> visitor);
bool populate_menu (Ekiga::MenuBuilder& builder);
@@ -88,7 +88,7 @@
void push_status (const std::string uri,
const std::string status);
- sigc::signal<void> trigger_saving;
+ sigc::signal0<void> trigger_saving;
private:
Modified: trunk/lib/engine/components/resource-list/rl-list.cpp
==============================================================================
--- trunk/lib/engine/components/resource-list/rl-list.cpp (original)
+++ trunk/lib/engine/components/resource-list/rl-list.cpp Tue Nov 18 20:04:12 2008
@@ -89,13 +89,13 @@
std::string display_name;
/* make the world know what we have */
- bool visit_presentities (sigc::slot<bool, Ekiga::Presentity&> visitor);
+ bool visit_presentities (sigc::slot1<bool, Ekiga::Presentity&> visitor);
void publish () const;
- sigc::signal<void, gmref_ptr<Entry> > entry_added;
- sigc::signal<void, gmref_ptr<Entry> > entry_updated;
- sigc::signal<void, gmref_ptr<Entry> > entry_removed;
+ sigc::signal1<void, gmref_ptr<Entry> > entry_added;
+ sigc::signal1<void, gmref_ptr<Entry> > entry_updated;
+ sigc::signal1<void, gmref_ptr<Entry> > entry_removed;
/* data for its children */
@@ -153,7 +153,7 @@
}
bool
-RL::List::visit_presentities (sigc::slot<bool, Ekiga::Presentity&> visitor)
+RL::List::visit_presentities (sigc::slot1<bool, Ekiga::Presentity&> visitor)
{
return impl->visit_presentities (visitor);
}
@@ -387,7 +387,7 @@
}
bool
-RL::ListImpl::visit_presentities (sigc::slot<bool, Ekiga::Presentity&> visitor)
+RL::ListImpl::visit_presentities (sigc::slot1<bool, Ekiga::Presentity&> visitor)
{
bool go_on = true;
Modified: trunk/lib/engine/components/resource-list/rl-list.h
==============================================================================
--- trunk/lib/engine/components/resource-list/rl-list.h (original)
+++ trunk/lib/engine/components/resource-list/rl-list.h Tue Nov 18 20:04:12 2008
@@ -70,13 +70,13 @@
const std::string status);
/* make the world know what we have */
- bool visit_presentities (sigc::slot<bool, Ekiga::Presentity&> visitor);
+ bool visit_presentities (sigc::slot1<bool, Ekiga::Presentity&> visitor);
void publish () const;
- sigc::signal<void, gmref_ptr<Entry> > entry_added;
- sigc::signal<void, gmref_ptr<Entry> > entry_updated;
- sigc::signal<void, gmref_ptr<Entry> > entry_removed;
+ sigc::signal1<void, gmref_ptr<Entry> > entry_added;
+ sigc::signal1<void, gmref_ptr<Entry> > entry_updated;
+ sigc::signal1<void, gmref_ptr<Entry> > entry_removed;
/* this method orders the list to get rid of all its children */
void flush ();
Modified: trunk/lib/engine/components/resource-list/rl-presentity.h
==============================================================================
--- trunk/lib/engine/components/resource-list/rl-presentity.h (original)
+++ trunk/lib/engine/components/resource-list/rl-presentity.h Tue Nov 18 20:04:12 2008
@@ -78,7 +78,7 @@
bool populate_menu (Ekiga::MenuBuilder &);
- sigc::signal<void> trigger_reload;
+ sigc::signal0<void> trigger_reload;
private:
Modified: trunk/lib/engine/components/xcap/xcap-core.cpp
==============================================================================
--- trunk/lib/engine/components/xcap/xcap-core.cpp (original)
+++ trunk/lib/engine/components/xcap/xcap-core.cpp Tue Nov 18 20:04:12 2008
@@ -53,13 +53,13 @@
~CoreImpl ();
void read (gmref_ptr<XCAP::Path> path,
- sigc::slot<void,bool,std::string> callback);
+ sigc::slot2<void,bool,std::string> callback);
void write (gmref_ptr<Path>,
const std::string content_type,
const std::string content,
- sigc::slot<void,std::string> callback);
+ sigc::slot1<void,std::string> callback);
void erase (gmref_ptr<Path>,
- sigc::slot<void,std::string> callback);
+ sigc::slot1<void,std::string> callback);
/* public to be used by C callbacks */
@@ -103,7 +103,7 @@
{
XCAP::CoreImpl* core;
gmref_ptr<XCAP::Path> path;
- sigc::slot<void,bool, std::string> callback;
+ sigc::slot2<void,bool, std::string> callback;
bool is_read;
};
@@ -187,7 +187,7 @@
void
XCAP::CoreImpl::read (gmref_ptr<Path> path,
- sigc::slot<void, bool, std::string> callback)
+ sigc::slot2<void, bool, std::string> callback)
{
SoupSession* session = NULL;
SoupMessage* message = NULL;
@@ -217,7 +217,7 @@
XCAP::CoreImpl::write (gmref_ptr<Path> path,
const std::string content_type,
const std::string content,
- sigc::slot<void,std::string> callback)
+ sigc::slot1<void,std::string> callback)
{
SoupSession* session = NULL;
SoupMessage* message = NULL;
@@ -249,7 +249,7 @@
void
XCAP::CoreImpl::erase (gmref_ptr<Path> path,
- sigc::slot<void,std::string> callback)
+ sigc::slot1<void,std::string> callback)
{
SoupSession* session = NULL;
SoupMessage* message = NULL;
@@ -289,7 +289,7 @@
void
XCAP::Core::read (gmref_ptr<XCAP::Path> path,
- sigc::slot<void, bool,std::string> callback)
+ sigc::slot2<void, bool,std::string> callback)
{
std::cout << "XCAP trying to read " << path->to_uri () << std::endl;
impl->read (path, callback);
@@ -299,7 +299,7 @@
XCAP::Core::write (gmref_ptr<Path> path,
const std::string content_type,
const std::string content,
- sigc::slot<void,std::string> callback)
+ sigc::slot1<void,std::string> callback)
{
std::cout << "XCAP trying to write"
<< " (" << content_type << "):"
@@ -311,7 +311,7 @@
void
XCAP::Core::erase (gmref_ptr<Path> path,
- sigc::slot<void,std::string> callback)
+ sigc::slot1<void,std::string> callback)
{
std::cout << "XCAP trying to erase " << path->to_uri () << std::endl;
impl->erase (path, callback);
Modified: trunk/lib/engine/components/xcap/xcap-core.h
==============================================================================
--- trunk/lib/engine/components/xcap/xcap-core.h (original)
+++ trunk/lib/engine/components/xcap/xcap-core.h Tue Nov 18 20:04:12 2008
@@ -62,7 +62,7 @@
* error message.
*/
void read (gmref_ptr<Path>,
- sigc::slot<void,bool,std::string> callback);
+ sigc::slot2<void,bool,std::string> callback);
/* the callback gets only a string :
* - if the string is empty, all went well ;
@@ -71,14 +71,14 @@
void write (gmref_ptr<Path>,
const std::string content_type,
const std::string content,
- sigc::slot<void,std::string> callback);
+ sigc::slot1<void,std::string> callback);
/* the callback gets only a string :
* - if the string is empty, all went well ;
* - if it's not, then it's the error message.
*/
void erase (gmref_ptr<Path>,
- sigc::slot<void,std::string> callback);
+ sigc::slot1<void,std::string> callback);
/* implementation of the Ekiga::Service api */
Modified: trunk/lib/engine/framework/form-request-simple.cpp
==============================================================================
--- trunk/lib/engine/framework/form-request-simple.cpp (original)
+++ trunk/lib/engine/framework/form-request-simple.cpp Tue Nov 18 20:04:12 2008
@@ -37,7 +37,7 @@
#include "form-request-simple.h"
-Ekiga::FormRequestSimple::FormRequestSimple (sigc::slot<void, bool, Form&> callback_): callback(callback_)
+Ekiga::FormRequestSimple::FormRequestSimple (sigc::slot2<void, bool, Form&> callback_): callback(callback_)
{
// nothing
}
Modified: trunk/lib/engine/framework/form-request-simple.h
==============================================================================
--- trunk/lib/engine/framework/form-request-simple.h (original)
+++ trunk/lib/engine/framework/form-request-simple.h Tue Nov 18 20:04:12 2008
@@ -59,7 +59,7 @@
* the request was cancelled ;
* - a form, which contains the submitted answer (or is empty otherwise)
*/
- FormRequestSimple (sigc::slot<void, bool, Form&> callback_);
+ FormRequestSimple (sigc::slot2<void, bool, Form&> callback_);
~FormRequestSimple ();
@@ -70,7 +70,7 @@
private:
bool answered;
- sigc::slot<void,bool,Form&> callback;
+ sigc::slot2<void,bool,Form&> callback;
};
Modified: trunk/lib/engine/framework/gmconf-bridge.h
==============================================================================
--- trunk/lib/engine/framework/gmconf-bridge.h (original)
+++ trunk/lib/engine/framework/gmconf-bridge.h Tue Nov 18 20:04:12 2008
@@ -93,7 +93,7 @@
* @param key is the GmConf key whose value changed
* @param entry is the new GmConf entry
*/
- sigc::signal<void, std::string /*key*/, GmConfEntry * /*entry*/> property_changed;
+ sigc::signal2<void, std::string /*key*/, GmConfEntry * /*entry*/> property_changed;
protected :
Ekiga::Service & service;
Modified: trunk/lib/engine/framework/lister.h
==============================================================================
--- trunk/lib/engine/framework/lister.h (original)
+++ trunk/lib/engine/framework/lister.h Tue Nov 18 20:04:12 2008
@@ -89,7 +89,7 @@
* @param The callback (the return value means "go on" and allows
* stopping the visit)
*/
- void visit_objects (sigc::slot<bool, ObjectType &> visitor);
+ void visit_objects (sigc::slot1<bool, ObjectType &> visitor);
/** Returns a const iterator to the first object of the collection.
*/
@@ -133,9 +133,9 @@
/** Signals emitted by this object
*
*/
- sigc::signal<void, ObjectType &> object_added;
- sigc::signal<void, ObjectType &> object_removed;
- sigc::signal<void, ObjectType &> object_updated;
+ sigc::signal1<void, ObjectType &> object_added;
+ sigc::signal1<void, ObjectType &> object_removed;
+ sigc::signal1<void, ObjectType &> object_updated;
private:
@@ -199,7 +199,7 @@
template<typename ObjectType>
void
-Ekiga::Lister<ObjectType>::visit_objects (sigc::slot<bool, ObjectType &> visitor)
+Ekiga::Lister<ObjectType>::visit_objects (sigc::slot1<bool, ObjectType &> visitor)
{
bool go_on = true;
for (unsigned int ii = 0;
Modified: trunk/lib/engine/framework/menu-builder-tools.cpp
==============================================================================
--- trunk/lib/engine/framework/menu-builder-tools.cpp (original)
+++ trunk/lib/engine/framework/menu-builder-tools.cpp Tue Nov 18 20:04:12 2008
@@ -47,7 +47,7 @@
void
Ekiga::ShortMenuBuilder::add_action (const std::string icon,
const std::string label,
- sigc::slot<void> callback)
+ sigc::slot0<void> callback)
{
if (active)
builder.add_action (icon, label, callback);
@@ -78,7 +78,7 @@
void
Ekiga::TriggerMenuBuilder::add_action (const std::string /*icon*/,
const std::string /*label*/,
- sigc::slot<void> callback)
+ sigc::slot0<void> callback)
{
if (active) {
@@ -108,7 +108,7 @@
TemporaryMenuBuilderHelperAction (const std::string icon_,
const std::string label_,
- sigc::slot<void> callback_):
+ sigc::slot0<void> callback_):
icon(icon_), label(label_), callback(callback_)
{
}
@@ -123,7 +123,7 @@
std::string icon;
std::string label;
- sigc::slot<void> callback;
+ sigc::slot0<void> callback;
};
class TemporaryMenuBuilderHelperSeparator:
@@ -178,7 +178,7 @@
void
Ekiga::TemporaryMenuBuilder::add_action (const std::string icon,
const std::string label,
- sigc::slot<void> callback)
+ sigc::slot0<void> callback)
{
TemporaryMenuBuilderHelperAction* helper = NULL;
Modified: trunk/lib/engine/framework/menu-builder-tools.h
==============================================================================
--- trunk/lib/engine/framework/menu-builder-tools.h (original)
+++ trunk/lib/engine/framework/menu-builder-tools.h Tue Nov 18 20:04:12 2008
@@ -83,7 +83,7 @@
void add_action (const std::string icon,
const std::string label,
- sigc::slot<void> callback);
+ sigc::slot0<void> callback);
void add_separator ();
@@ -117,7 +117,7 @@
void add_action (const std::string icon,
const std::string label,
- sigc::slot<void> callback);
+ sigc::slot0<void> callback);
int size () const;
@@ -171,7 +171,7 @@
void add_action (const std::string icon,
const std::string label,
- sigc::slot<void> callback);
+ sigc::slot0<void> callback);
void add_separator ();
Modified: trunk/lib/engine/framework/menu-builder.cpp
==============================================================================
--- trunk/lib/engine/framework/menu-builder.cpp (original)
+++ trunk/lib/engine/framework/menu-builder.cpp Tue Nov 18 20:04:12 2008
@@ -44,7 +44,7 @@
void
Ekiga::MenuBuilder::add_action (const std::string /*icon*/,
const std::string /*label*/,
- sigc::slot<void> /*callback*/)
+ sigc::slot0<void> /*callback*/)
{
// nothing
}
Modified: trunk/lib/engine/framework/menu-builder.h
==============================================================================
--- trunk/lib/engine/framework/menu-builder.h (original)
+++ trunk/lib/engine/framework/menu-builder.h Tue Nov 18 20:04:12 2008
@@ -79,7 +79,7 @@
virtual void add_action (const std::string icon,
const std::string label,
- sigc::slot<void> callback);
+ sigc::slot0<void> callback);
virtual void add_separator ();
Modified: trunk/lib/engine/framework/personal-details.h
==============================================================================
--- trunk/lib/engine/framework/personal-details.h (original)
+++ trunk/lib/engine/framework/personal-details.h Tue Nov 18 20:04:12 2008
@@ -65,7 +65,7 @@
virtual void set_presence_info (const std::string presence,
const std::string status) = 0;
- sigc::signal<void> updated;
+ sigc::signal0<void> updated;
};
};
Modified: trunk/lib/engine/framework/reflister.h
==============================================================================
--- trunk/lib/engine/framework/reflister.h (original)
+++ trunk/lib/engine/framework/reflister.h Tue Nov 18 20:04:12 2008
@@ -55,7 +55,7 @@
virtual ~RefLister ();
- void visit_objects (sigc::slot<bool, gmref_ptr<ObjectType> > visitor);
+ void visit_objects (sigc::slot1<bool, gmref_ptr<ObjectType> > visitor);
void add_object (gmref_ptr<ObjectType> obj);
@@ -69,9 +69,9 @@
iterator begin ();
iterator end ();
- sigc::signal<void, gmref_ptr<ObjectType> > object_added;
- sigc::signal<void, gmref_ptr<ObjectType> > object_removed;
- sigc::signal<void, gmref_ptr<ObjectType> > object_updated;
+ sigc::signal1<void, gmref_ptr<ObjectType> > object_added;
+ sigc::signal1<void, gmref_ptr<ObjectType> > object_removed;
+ sigc::signal1<void, gmref_ptr<ObjectType> > object_updated;
private:
container_type objects;
@@ -87,7 +87,7 @@
template<typename ObjectType>
void
-Ekiga::RefLister<ObjectType>::visit_objects (sigc::slot<bool, gmref_ptr<ObjectType> > visitor)
+Ekiga::RefLister<ObjectType>::visit_objects (sigc::slot1<bool, gmref_ptr<ObjectType> > visitor)
{
bool go_on = true;
for (typename container_type::iterator iter = objects.begin ();
Modified: trunk/lib/engine/framework/runtime-glib.cpp
==============================================================================
--- trunk/lib/engine/framework/runtime-glib.cpp (original)
+++ trunk/lib/engine/framework/runtime-glib.cpp Tue Nov 18 20:04:12 2008
@@ -41,12 +41,12 @@
struct message
{
- message (sigc::slot<void> _action,
+ message (sigc::slot0<void> _action,
unsigned int _seconds): action(_action),
seconds(_seconds)
{}
- sigc::slot<void> action;
+ sigc::slot0<void> action;
unsigned int seconds;
};
@@ -153,7 +153,7 @@
}
void
-Ekiga::GlibRuntime::run_in_main (sigc::slot<void> action,
+Ekiga::GlibRuntime::run_in_main (sigc::slot0<void> action,
unsigned int seconds)
{
g_async_queue_push (queue, (gpointer)(new struct message (action, seconds)));
Modified: trunk/lib/engine/framework/runtime-glib.h
==============================================================================
--- trunk/lib/engine/framework/runtime-glib.h (original)
+++ trunk/lib/engine/framework/runtime-glib.h Tue Nov 18 20:04:12 2008
@@ -62,7 +62,7 @@
void quit ();
- void run_in_main (sigc::slot<void> action,
+ void run_in_main (sigc::slot0<void> action,
unsigned int seconds);
private:
Modified: trunk/lib/engine/framework/runtime.h
==============================================================================
--- trunk/lib/engine/framework/runtime.h (original)
+++ trunk/lib/engine/framework/runtime.h Tue Nov 18 20:04:12 2008
@@ -42,13 +42,13 @@
#include "services.h"
template<typename data_type>
-static void emit_signal_in_main_helper1 (sigc::signal<void, data_type> sign,
+static void emit_signal_in_main_helper1 (sigc::signal1<void, data_type> sign,
data_type data)
{
sign.emit (data);
}
-static void emit_signal_in_main_helper (sigc::signal<void> sign)
+static void emit_signal_in_main_helper (sigc::signal0<void> sign)
{
sign.emit ();
@@ -83,17 +83,17 @@
virtual void quit () = 0;
- virtual void run_in_main (sigc::slot<void> action,
+ virtual void run_in_main (sigc::slot0<void> action,
unsigned int seconds = 0) = 0;
- void emit_signal_in_main (sigc::signal<void> sign)
+ void emit_signal_in_main (sigc::signal0<void> sign)
{
run_in_main (sigc::bind (sigc::ptr_fun (emit_signal_in_main_helper), sign));
}
template<typename data_type>
- void emit_signal_in_main (sigc::signal<void, data_type> sign,
+ void emit_signal_in_main (sigc::signal1<void, data_type> sign,
data_type data)
{
run_in_main (sigc::bind (sigc::ptr_fun (emit_signal_in_main_helper1<data_type>), sign, data));
Modified: trunk/lib/engine/framework/services.h
==============================================================================
--- trunk/lib/engine/framework/services.h (original)
+++ trunk/lib/engine/framework/services.h Tue Nov 18 20:04:12 2008
@@ -78,7 +78,7 @@
void dump (std::ostream &stream) const;
- sigc::signal<void, gmref_ptr<Service> > service_added;
+ sigc::signal1<void, gmref_ptr<Service> > service_added;
private:
Modified: trunk/lib/engine/gui/gtk-core/menu-builder-gtk.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-core/menu-builder-gtk.cpp (original)
+++ trunk/lib/engine/gui/gtk-core/menu-builder-gtk.cpp Tue Nov 18 20:04:12 2008
@@ -41,10 +41,10 @@
struct Action
{
- Action (sigc::slot<void> _callback): callback (_callback)
+ Action (sigc::slot0<void> _callback): callback (_callback)
{}
- sigc::slot<void> callback;
+ sigc::slot0<void> callback;
};
static void
@@ -73,7 +73,7 @@
void
MenuBuilderGtk::add_action (const std::string icon,
const std::string label,
- const sigc::slot<void> callback)
+ const sigc::slot0<void> callback)
{
GtkWidget *item = NULL;
GtkWidget *image = NULL;
Modified: trunk/lib/engine/gui/gtk-core/menu-builder-gtk.h
==============================================================================
--- trunk/lib/engine/gui/gtk-core/menu-builder-gtk.h (original)
+++ trunk/lib/engine/gui/gtk-core/menu-builder-gtk.h Tue Nov 18 20:04:12 2008
@@ -55,7 +55,7 @@
void add_action (const std::string icon,
const std::string label,
- const sigc::slot<void> callback);
+ const sigc::slot0<void> callback);
void add_separator ();
Modified: trunk/lib/engine/gui/gtk-core/toolbar-builder-gtk.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-core/toolbar-builder-gtk.cpp (original)
+++ trunk/lib/engine/gui/gtk-core/toolbar-builder-gtk.cpp Tue Nov 18 20:04:12 2008
@@ -41,10 +41,10 @@
struct Action
{
- Action (sigc::slot<void> _callback): callback (_callback)
+ Action (sigc::slot0<void> _callback): callback (_callback)
{}
- sigc::slot<void> callback;
+ sigc::slot0<void> callback;
};
static void
@@ -71,7 +71,7 @@
void
ToolbarBuilderGtk::add_action (const std::string icon,
const std::string label,
- sigc::slot<void> callback)
+ sigc::slot0<void> callback)
{
Action *action = new Action (callback);
GtkToolItem *item = NULL;
Modified: trunk/lib/engine/gui/gtk-core/toolbar-builder-gtk.h
==============================================================================
--- trunk/lib/engine/gui/gtk-core/toolbar-builder-gtk.h (original)
+++ trunk/lib/engine/gui/gtk-core/toolbar-builder-gtk.h Tue Nov 18 20:04:12 2008
@@ -54,7 +54,7 @@
void add_action (const std::string icon,
const std::string label,
- sigc::slot<void> callback);
+ sigc::slot0<void> callback);
void add_separator ();
Modified: trunk/lib/engine/hal/skel/hal-core.cpp
==============================================================================
--- trunk/lib/engine/hal/skel/hal-core.cpp (original)
+++ trunk/lib/engine/hal/skel/hal-core.cpp Tue Nov 18 20:04:12 2008
@@ -73,7 +73,7 @@
}
-void HalCore::visit_managers (sigc::slot<bool, HalManager &> visitor)
+void HalCore::visit_managers (sigc::slot1<bool, HalManager &> visitor)
{
bool go_on = true;
Modified: trunk/lib/engine/hal/skel/hal-core.h
==============================================================================
--- trunk/lib/engine/hal/skel/hal-core.h (original)
+++ trunk/lib/engine/hal/skel/hal-core.h Tue Nov 18 20:04:12 2008
@@ -108,29 +108,29 @@
* @param The callback (the return value means "go on" and allows
* stopping the visit)
*/
- void visit_managers (sigc::slot<bool, HalManager &> visitor);
+ void visit_managers (sigc::slot1<bool, HalManager &> visitor);
/** This signal is emitted when an Ekiga::HalManager has been
* added to the HalCore Service.
*/
- sigc::signal<void, HalManager &> manager_added;
+ sigc::signal1<void, HalManager &> manager_added;
/*** API to act on HAL events ***/
/** See hal-manager.h for the API
*/
- sigc::signal<void, const std::string &, const std::string &, unsigned, HalManager*> videoinput_device_added;
- sigc::signal<void, const std::string &, const std::string &, unsigned, HalManager*> videoinput_device_removed;
+ sigc::signal4<void, const std::string &, const std::string &, unsigned, HalManager*> videoinput_device_added;
+ sigc::signal4<void, const std::string &, const std::string &, unsigned, HalManager*> videoinput_device_removed;
- sigc::signal<void, const std::string &, const std::string &, HalManager*> audioinput_device_added;
- sigc::signal<void, const std::string &, const std::string &, HalManager*> audioinput_device_removed;
+ sigc::signal3<void, const std::string &, const std::string &, HalManager*> audioinput_device_added;
+ sigc::signal3<void, const std::string &, const std::string &, HalManager*> audioinput_device_removed;
- sigc::signal<void, const std::string &, const std::string &, HalManager*> audiooutput_device_added;
- sigc::signal<void, const std::string &, const std::string &, HalManager*> audiooutput_device_removed;
+ sigc::signal3<void, const std::string &, const std::string &, HalManager*> audiooutput_device_added;
+ sigc::signal3<void, const std::string &, const std::string &, HalManager*> audiooutput_device_removed;
- sigc::signal<void, const std::string &, const std::string &, HalManager*> network_interface_up;
- sigc::signal<void, const std::string &, const std::string &, HalManager*> network_interface_down;
+ sigc::signal3<void, const std::string &, const std::string &, HalManager*> network_interface_up;
+ sigc::signal3<void, const std::string &, const std::string &, HalManager*> network_interface_down;
private:
Modified: trunk/lib/engine/hal/skel/hal-manager.h
==============================================================================
--- trunk/lib/engine/hal/skel/hal-manager.h (original)
+++ trunk/lib/engine/hal/skel/hal-manager.h Tue Nov 18 20:04:12 2008
@@ -75,50 +75,50 @@
* @param device the device name.
* @param capabilities source-dependent device capabilites (e.g. V4L1 or V4L2 for video4linux).
*/
- sigc::signal<void, std::string, std::string, unsigned> videoinput_device_added;
+ sigc::signal3<void, std::string, std::string, unsigned> videoinput_device_added;
/** This signal is emitted when a video input device is removed from the system.
* @param source the video input framework (e.g. video4linux, etc.).
* @param device the device name.
* @param capabilities source-dependent device capabilites (e.g. V4L1 or V4L2 for video4linux).
*/
- sigc::signal<void, std::string, std::string, unsigned> videoinput_device_removed;
+ sigc::signal3<void, std::string, std::string, unsigned> videoinput_device_removed;
/** This signal is emitted when an audio input device is added to the system.
* @param source the audio input framework (e.g. alsa, oss, etc.).
* @param device the device name.
*/
- sigc::signal<void, std::string, std::string> audioinput_device_added;
+ sigc::signal2<void, std::string, std::string> audioinput_device_added;
/** This signal is emitted when an audio input device is removed from the system.
* @param source the audio input framework (e.g. alsa, oss, etc.).
* @param device the device name.
*/
- sigc::signal<void, std::string, std::string> audioinput_device_removed;
+ sigc::signal2<void, std::string, std::string> audioinput_device_removed;
/** This signal is emitted when an audio output device is added to the system.
* @param source the audio output framework (e.g. alsa, oss, etc.).
* @param device the device name.
*/
- sigc::signal<void, std::string, std::string> audiooutput_device_added;
+ sigc::signal2<void, std::string, std::string> audiooutput_device_added;
/** This signal is emitted when an audio output device is removed from the system.
* @param source the audio output framework (e.g. alsa, oss, etc.).
* @param device the device name.
*/
- sigc::signal<void, std::string, std::string> audiooutput_device_removed;
+ sigc::signal2<void, std::string, std::string> audiooutput_device_removed;
/** This signal is emitted when a network device comes up.
* @param interface_name the interface name (e.g. eth0, etc.).
* @param ip4_address the IPv4 address (e.g. "192.168.0.1").
*/
- sigc::signal<void, std::string, std::string> network_interface_up;
+ sigc::signal2<void, std::string, std::string> network_interface_up;
/** This signal is emitted when a network device goes down.
* @param interface_name the interface name (e.g. eth0, etc.).
* @param ip4_address the IPv4 address (e.g. "192.168.0.1").
*/
- sigc::signal<void, std::string, std::string> network_interface_down;
+ sigc::signal2<void, std::string, std::string> network_interface_down;
};
/**
Modified: trunk/lib/engine/presence/local-roster/local-presentity.h
==============================================================================
--- trunk/lib/engine/presence/local-roster/local-presentity.h (original)
+++ trunk/lib/engine/presence/local-roster/local-presentity.h Tue Nov 18 20:04:12 2008
@@ -147,7 +147,7 @@
* This signal makes the Local::Heap know that the XML tree changed
* and hence should be saved
*/
- sigc::signal<void> trigger_saving;
+ sigc::signal0<void> trigger_saving;
private:
Modified: trunk/lib/engine/presence/skel/cluster-impl.h
==============================================================================
--- trunk/lib/engine/presence/skel/cluster-impl.h (original)
+++ trunk/lib/engine/presence/skel/cluster-impl.h Tue Nov 18 20:04:12 2008
@@ -80,7 +80,7 @@
virtual ~ClusterImpl ();
- void visit_heaps (sigc::slot<bool, gmref_ptr<Heap> > visitor);
+ void visit_heaps (sigc::slot1<bool, gmref_ptr<Heap> > visitor);
protected:
@@ -123,7 +123,7 @@
template<typename HeapType>
void
-Ekiga::ClusterImpl<HeapType>::visit_heaps (sigc::slot<bool, gmref_ptr<Heap> > visitor)
+Ekiga::ClusterImpl<HeapType>::visit_heaps (sigc::slot1<bool, gmref_ptr<Heap> > visitor)
{
RefLister<HeapType>::visit_objects (visitor);
}
Modified: trunk/lib/engine/presence/skel/cluster.h
==============================================================================
--- trunk/lib/engine/presence/skel/cluster.h (original)
+++ trunk/lib/engine/presence/skel/cluster.h Tue Nov 18 20:04:12 2008
@@ -59,7 +59,7 @@
/** Get the list of Heaps by visiting them with a callback.
* @param The callback used to know about heaps.
*/
- virtual void visit_heaps (sigc::slot<bool, gmref_ptr<Heap> >) = 0;
+ virtual void visit_heaps (sigc::slot1<bool, gmref_ptr<Heap> >) = 0;
/** Populates a menu with the actions possible on the Cluster.
* @param The builder to populate.
@@ -70,16 +70,16 @@
* from the Cluster.
* @param The Heap in question.
*/
- sigc::signal<void, gmref_ptr<Heap> > heap_added;
- sigc::signal<void, gmref_ptr<Heap> > heap_removed;
+ sigc::signal1<void, gmref_ptr<Heap> > heap_added;
+ sigc::signal1<void, gmref_ptr<Heap> > heap_removed;
/** Those signals are forwarded from the given Heap
* @param The Heap in question.
*/
- sigc::signal<void, gmref_ptr<Heap> > heap_updated;
- sigc::signal<void, gmref_ptr<Heap> , gmref_ptr<Presentity> > presentity_added;
- sigc::signal<void, gmref_ptr<Heap> , gmref_ptr<Presentity> > presentity_updated;
- sigc::signal<void, gmref_ptr<Heap> , gmref_ptr<Presentity> > presentity_removed;
+ sigc::signal1<void, gmref_ptr<Heap> > heap_updated;
+ sigc::signal2<void, gmref_ptr<Heap> , gmref_ptr<Presentity> > presentity_added;
+ sigc::signal2<void, gmref_ptr<Heap> , gmref_ptr<Presentity> > presentity_updated;
+ sigc::signal2<void, gmref_ptr<Heap> , gmref_ptr<Presentity> > presentity_removed;
/** This chain allows the Cluster to present forms to the user.
*/
Modified: trunk/lib/engine/presence/skel/heap-impl.h
==============================================================================
--- trunk/lib/engine/presence/skel/heap-impl.h (original)
+++ trunk/lib/engine/presence/skel/heap-impl.h Tue Nov 18 20:04:12 2008
@@ -78,7 +78,7 @@
~HeapImpl ();
- void visit_presentities (sigc::slot<bool, gmref_ptr<Presentity> > visitor);
+ void visit_presentities (sigc::slot1<bool, gmref_ptr<Presentity> > visitor);
//const_iterator begin () const;
@@ -119,7 +119,7 @@
template<typename PresentityType>
void
-Ekiga::HeapImpl<PresentityType>::visit_presentities (sigc::slot<bool, gmref_ptr<Presentity> > visitor)
+Ekiga::HeapImpl<PresentityType>::visit_presentities (sigc::slot1<bool, gmref_ptr<Presentity> > visitor)
{
RefLister<PresentityType>::visit_objects (visitor);
}
Modified: trunk/lib/engine/presence/skel/heap.h
==============================================================================
--- trunk/lib/engine/presence/skel/heap.h (original)
+++ trunk/lib/engine/presence/skel/heap.h Tue Nov 18 20:04:12 2008
@@ -68,7 +68,7 @@
* @param The callback user to know about presentities (the return value
* means "go on" and allows stopping the visit)
*/
- virtual void visit_presentities (sigc::slot<bool, gmref_ptr<Presentity> >) = 0;
+ virtual void visit_presentities (sigc::slot1<bool, gmref_ptr<Presentity> >) = 0;
/** Populates a menu with the actions possible on the Heap.
* @param The builder to populate.
@@ -89,23 +89,23 @@
/** This signal is emitted when the Heap has been updated.
*/
- sigc::signal<void> updated;
+ sigc::signal0<void> updated;
/** This signal is emitted when the Heap has been removed.
*/
- sigc::signal<void> removed;
+ sigc::signal0<void> removed;
/** This signal is emitted when a Presentity has been added to the Heap.
*/
- sigc::signal<void, gmref_ptr<Presentity> > presentity_added;
+ sigc::signal1<void, gmref_ptr<Presentity> > presentity_added;
/** This signal is emitted when a Presentity has been updated in the Heap.
*/
- sigc::signal<void, gmref_ptr<Presentity> > presentity_updated;
+ sigc::signal1<void, gmref_ptr<Presentity> > presentity_updated;
/** This signal is emitted when a Presentity has been removed from the Heap.
*/
- sigc::signal<void, gmref_ptr<Presentity> > presentity_removed;
+ sigc::signal1<void, gmref_ptr<Presentity> > presentity_removed;
/** This chain allows the Heap to present forms to the user
*/
Modified: trunk/lib/engine/presence/skel/presence-core.cpp
==============================================================================
--- trunk/lib/engine/presence/skel/presence-core.cpp (original)
+++ trunk/lib/engine/presence/skel/presence-core.cpp Tue Nov 18 20:04:12 2008
@@ -70,7 +70,7 @@
}
void
-Ekiga::PresenceCore::visit_clusters (sigc::slot<bool, gmref_ptr<Cluster> > visitor)
+Ekiga::PresenceCore::visit_clusters (sigc::slot1<bool, gmref_ptr<Cluster> > visitor)
{
bool go_on = true;
for (std::set<gmref_ptr<Cluster> >::iterator iter = clusters.begin ();
@@ -245,7 +245,7 @@
{
bool result = false;
- for (std::set<sigc::slot<bool, std::string> >::const_iterator iter
+ for (std::set<sigc::slot1<bool, std::string> >::const_iterator iter
= uri_testers.begin ();
iter != uri_testers.end () && result == false;
iter++)
@@ -255,7 +255,7 @@
}
void
-Ekiga::PresenceCore::add_supported_uri (sigc::slot<bool,std::string> tester)
+Ekiga::PresenceCore::add_supported_uri (sigc::slot1<bool,std::string> tester)
{
uri_testers.insert (tester);
}
Modified: trunk/lib/engine/presence/skel/presence-core.h
==============================================================================
--- trunk/lib/engine/presence/skel/presence-core.h (original)
+++ trunk/lib/engine/presence/skel/presence-core.h Tue Nov 18 20:04:12 2008
@@ -97,8 +97,8 @@
* presence information about an uri it was required to handle.
* The information is given as a pair of strings (uri, data).
*/
- sigc::signal<void, std::string, std::string> presence_received;
- sigc::signal<void, std::string, std::string> status_received;
+ sigc::signal2<void, std::string, std::string> presence_received;
+ sigc::signal2<void, std::string, std::string> status_received;
};
class PresencePublisher: public virtual GmRefCounted
@@ -174,27 +174,27 @@
* @param The callback (the return value means "go on" and allows
* stopping the visit)
*/
- void visit_clusters (sigc::slot<bool, gmref_ptr<Cluster> > visitor);
+ void visit_clusters (sigc::slot1<bool, gmref_ptr<Cluster> > visitor);
/** This signal is emitted when an Ekiga::Cluster has been added
* to the PresenceCore Service.
*/
- sigc::signal<void, gmref_ptr<Cluster> > cluster_added;
+ sigc::signal1<void, gmref_ptr<Cluster> > cluster_added;
/** Those signals are forwarding the heap_added, heap_updated
* and heap_removed from the given Cluster.
*
*/
- sigc::signal<void, gmref_ptr<Cluster> , gmref_ptr<Heap> > heap_added;
- sigc::signal<void, gmref_ptr<Cluster> , gmref_ptr<Heap> > heap_updated;
- sigc::signal<void, gmref_ptr<Cluster> , gmref_ptr<Heap> > heap_removed;
+ sigc::signal2<void, gmref_ptr<Cluster> , gmref_ptr<Heap> > heap_added;
+ sigc::signal2<void, gmref_ptr<Cluster> , gmref_ptr<Heap> > heap_updated;
+ sigc::signal2<void, gmref_ptr<Cluster> , gmref_ptr<Heap> > heap_removed;
/** Those signals are forwarding the presentity_added, presentity_updated
* and presentity_removed from the given Heap of the given Cluster.
*/
- sigc::signal<void, gmref_ptr<Cluster> , gmref_ptr<Heap> , gmref_ptr<Presentity> > presentity_added;
- sigc::signal<void, gmref_ptr<Cluster> , gmref_ptr<Heap> , gmref_ptr<Presentity> > presentity_updated;
- sigc::signal<void, gmref_ptr<Cluster> , gmref_ptr<Heap> , gmref_ptr<Presentity> > presentity_removed;
+ sigc::signal3<void, gmref_ptr<Cluster> , gmref_ptr<Heap> , gmref_ptr<Presentity> > presentity_added;
+ sigc::signal3<void, gmref_ptr<Cluster> , gmref_ptr<Heap> , gmref_ptr<Presentity> > presentity_updated;
+ sigc::signal3<void, gmref_ptr<Cluster> , gmref_ptr<Heap> , gmref_ptr<Presentity> > presentity_removed;
private:
@@ -255,8 +255,8 @@
/** Those signals are emitted whenever information has been received
* about an uri ; the information is a pair of strings (uri, information).
*/
- sigc::signal<void, std::string, std::string> presence_received;
- sigc::signal<void, std::string, std::string> status_received;
+ sigc::signal2<void, std::string, std::string> presence_received;
+ sigc::signal2<void, std::string, std::string> status_received;
private:
@@ -304,11 +304,11 @@
/** Adds an uri tester to the PresenceCore
* @param The tester
*/
- void add_supported_uri (sigc::slot<bool,std::string> tester);
+ void add_supported_uri (sigc::slot1<bool,std::string> tester);
private:
- std::set<sigc::slot<bool, std::string> > uri_testers;
+ std::set<sigc::slot1<bool, std::string> > uri_testers;
/*** Misc ***/
public:
Modified: trunk/lib/engine/presence/skel/presentity.h
==============================================================================
--- trunk/lib/engine/presence/skel/presentity.h (original)
+++ trunk/lib/engine/presence/skel/presentity.h Tue Nov 18 20:04:12 2008
@@ -94,11 +94,11 @@
/** This signal is emitted when the Presentity has been updated.
*/
- sigc::signal<void> updated;
+ sigc::signal0<void> updated;
/** This signal is emitted when the Presentity has been removed.
*/
- sigc::signal<void> removed;
+ sigc::signal0<void> removed;
/** This chain allows the Presentity to present forms to the user
*/
Modified: trunk/lib/engine/protocol/skel/call-core.h
==============================================================================
--- trunk/lib/engine/protocol/skel/call-core.h (original)
+++ trunk/lib/engine/protocol/skel/call-core.h Tue Nov 18 20:04:12 2008
@@ -125,7 +125,7 @@
/** This signal is emitted when a Ekiga::CallManager has been
* added to the CallCore Service.
*/
- sigc::signal<void, gmref_ptr<CallManager> > manager_added;
+ sigc::signal1<void, gmref_ptr<CallManager> > manager_added;
/*** Call Management ***/
@@ -140,21 +140,21 @@
/** See call.h for the API
*/
- sigc::signal<void, gmref_ptr<CallManager> , gmref_ptr<Call> > ringing_call;
- sigc::signal<void, gmref_ptr<CallManager> , gmref_ptr<Call> > setup_call;
- sigc::signal<void, gmref_ptr<CallManager> , gmref_ptr<Call> > missed_call;
- sigc::signal<void, gmref_ptr<CallManager> , gmref_ptr<Call>, std::string> cleared_call;
- sigc::signal<void, gmref_ptr<CallManager> , gmref_ptr<Call> > established_call;
- sigc::signal<void, gmref_ptr<CallManager> , gmref_ptr<Call> > held_call;
- sigc::signal<void, gmref_ptr<CallManager> , gmref_ptr<Call> > retrieved_call;
- sigc::signal<void, gmref_ptr<CallManager> , gmref_ptr<Call>, std::string, Call::StreamType, bool> stream_opened;
- sigc::signal<void, gmref_ptr<CallManager> , gmref_ptr<Call>, std::string, Call::StreamType, bool> stream_closed;
- sigc::signal<void, gmref_ptr<CallManager> , gmref_ptr<Call>, std::string, Call::StreamType> stream_paused;
- sigc::signal<void, gmref_ptr<CallManager> , gmref_ptr<Call>, std::string, Call::StreamType> stream_resumed;
+ sigc::signal2<void, gmref_ptr<CallManager> , gmref_ptr<Call> > ringing_call;
+ sigc::signal2<void, gmref_ptr<CallManager> , gmref_ptr<Call> > setup_call;
+ sigc::signal2<void, gmref_ptr<CallManager> , gmref_ptr<Call> > missed_call;
+ sigc::signal3<void, gmref_ptr<CallManager> , gmref_ptr<Call>, std::string> cleared_call;
+ sigc::signal2<void, gmref_ptr<CallManager> , gmref_ptr<Call> > established_call;
+ sigc::signal2<void, gmref_ptr<CallManager> , gmref_ptr<Call> > held_call;
+ sigc::signal2<void, gmref_ptr<CallManager> , gmref_ptr<Call> > retrieved_call;
+ sigc::signal5<void, gmref_ptr<CallManager> , gmref_ptr<Call>, std::string, Call::StreamType, bool> stream_opened;
+ sigc::signal5<void, gmref_ptr<CallManager> , gmref_ptr<Call>, std::string, Call::StreamType, bool> stream_closed;
+ sigc::signal4<void, gmref_ptr<CallManager> , gmref_ptr<Call>, std::string, Call::StreamType> stream_paused;
+ sigc::signal4<void, gmref_ptr<CallManager> , gmref_ptr<Call>, std::string, Call::StreamType> stream_resumed;
/*** Misc ***/
- sigc::signal<void, gmref_ptr<CallManager> > manager_ready;
- sigc::signal<void> ready;
+ sigc::signal1<void, gmref_ptr<CallManager> > manager_ready;
+ sigc::signal0<void> ready;
/** This chain allows the CallCore to report errors to the user
*/
Modified: trunk/lib/engine/protocol/skel/call-manager.h
==============================================================================
--- trunk/lib/engine/protocol/skel/call-manager.h (original)
+++ trunk/lib/engine/protocol/skel/call-manager.h Tue Nov 18 20:04:12 2008
@@ -96,7 +96,7 @@
/** This signal is emitted when a Ekiga::CallProtocolManager has been
* added to the CallManager.
*/
- sigc::signal<void, gmref_ptr<CallProtocolManager> > manager_added;
+ sigc::signal1<void, gmref_ptr<CallProtocolManager> > manager_added;
/*
@@ -199,7 +199,7 @@
/*
* MISC
*/
- sigc::signal<void> ready;
+ sigc::signal0<void> ready;
private:
std::set<gmref_ptr<CallProtocolManager> > managers;
Modified: trunk/lib/engine/protocol/skel/call.h
==============================================================================
--- trunk/lib/engine/protocol/skel/call.h (original)
+++ trunk/lib/engine/protocol/skel/call.h Tue Nov 18 20:04:12 2008
@@ -200,69 +200,69 @@
/* Signal emitted when the call is established
*/
- sigc::signal<void> established;
+ sigc::signal0<void> established;
/* Signal emitted when an established call is cleared
* @param: a string describing why the call was cleared
*/
- sigc::signal<void, std::string> cleared;
+ sigc::signal1<void, std::string> cleared;
/* Signal emitted when the call is missed, ie cleared
* without having been established
*/
- sigc::signal<void> missed;
+ sigc::signal0<void> missed;
/* Signal emitted when the call is forwarded
*/
- sigc::signal<void> forwarded;
+ sigc::signal0<void> forwarded;
/* Signal emitted when the call is held
*/
- sigc::signal<void> held;
+ sigc::signal0<void> held;
/* Signal emitted when the call is retrieved
*/
- sigc::signal<void> retrieved;
+ sigc::signal0<void> retrieved;
/* Signal emitted when the call is being setup
*/
- sigc::signal<void> setup;
+ sigc::signal0<void> setup;
/* Signal emitted when the remote party is ringing
*/
- sigc::signal<void> ringing;
+ sigc::signal0<void> ringing;
/* Signal emitted when a stream is opened
* @param the stream name
* @param the stream type
* @param transmission or reception
*/
- sigc::signal<void, std::string, StreamType, bool> stream_opened;
+ sigc::signal3<void, std::string, StreamType, bool> stream_opened;
/* Signal emitted when a stream is closed
* @param the stream name
* @param the stream type
* @param transmission or reception
*/
- sigc::signal<void, std::string, StreamType, bool> stream_closed;
+ sigc::signal3<void, std::string, StreamType, bool> stream_closed;
/* Signal emitted when a transmitted stream is paused
* @param the stream name
* @param the stream type
* @param transmission or reception
*/
- sigc::signal<void, std::string, StreamType> stream_paused;
+ sigc::signal2<void, std::string, StreamType> stream_paused;
/* Signal emitted when a transmitted stream is resumed
* @param the stream name
* @param the stream type
* @param transmission or reception
*/
- sigc::signal<void, std::string, StreamType> stream_resumed;
+ sigc::signal2<void, std::string, StreamType> stream_resumed;
/** This signal is emitted when the Call is removed.
*/
- sigc::signal<void> removed;
+ sigc::signal0<void> removed;
};
Modified: trunk/lib/engine/videoinput/skel/videoinput-core.cpp
==============================================================================
--- trunk/lib/engine/videoinput/skel/videoinput-core.cpp (original)
+++ trunk/lib/engine/videoinput/skel/videoinput-core.cpp Tue Nov 18 20:04:12 2008
@@ -183,7 +183,7 @@
}
-void VideoInputCore::visit_managers (sigc::slot<bool, VideoInputManager &> visitor)
+void VideoInputCore::visit_managers (sigc::slot1<bool, VideoInputManager &> visitor)
{
PWaitAndSignal m(core_mutex);
bool go_on = true;
Modified: trunk/lib/engine/videoinput/skel/videoinput-core.h
==============================================================================
--- trunk/lib/engine/videoinput/skel/videoinput-core.h (original)
+++ trunk/lib/engine/videoinput/skel/videoinput-core.h Tue Nov 18 20:04:12 2008
@@ -138,12 +138,12 @@
/** Triggers a callback for all Ekiga::VideoInputManager sources of the
* VideoInputCore service.
*/
- void visit_managers (sigc::slot<bool, VideoInputManager &> visitor);
+ void visit_managers (sigc::slot1<bool, VideoInputManager &> visitor);
/** This signal is emitted when a Ekiga::VideoInputManager has been
* added to the VideoInputCore Service.
*/
- sigc::signal<void, VideoInputManager &> manager_added;
+ sigc::signal1<void, VideoInputManager &> manager_added;
/*** VideoInput Device Management ***/
@@ -274,23 +274,23 @@
/** See videoinput-manager.h for the API
*/
- sigc::signal<void, VideoInputManager &, VideoInputDevice &, VideoInputSettings&> device_opened;
- sigc::signal<void, VideoInputManager &, VideoInputDevice &> device_closed;
- sigc::signal<void, VideoInputManager &, VideoInputDevice &, VideoInputErrorCodes> device_error;
+ sigc::signal3<void, VideoInputManager &, VideoInputDevice &, VideoInputSettings&> device_opened;
+ sigc::signal2<void, VideoInputManager &, VideoInputDevice &> device_closed;
+ sigc::signal3<void, VideoInputManager &, VideoInputDevice &, VideoInputErrorCodes> device_error;
/** This signal is emitted when a video input has been added to the system.
* This signal will be emitted if add_device was called with a device name and
* a manager claimed support for this device.
* @param device the video input device that was added.
*/
- sigc::signal<void, VideoInputDevice, bool> device_added;
+ sigc::signal2<void, VideoInputDevice, bool> device_added;
/** This signal is emitted when a video input has been removed from the system.
* This signal will be emitted if remove_device was called with a device name and
* a manager claimed support for this device.
* @param device the video input device that was removed.
*/
- sigc::signal<void, VideoInputDevice, bool> device_removed;
+ sigc::signal2<void, VideoInputDevice, bool> device_removed;
private:
void on_device_opened (VideoInputDevice device,
Modified: trunk/lib/engine/videoinput/skel/videoinput-manager.h
==============================================================================
--- trunk/lib/engine/videoinput/skel/videoinput-manager.h (original)
+++ trunk/lib/engine/videoinput/skel/videoinput-manager.h Tue Nov 18 20:04:12 2008
@@ -158,18 +158,18 @@
* @param device the video input device that was opened.
* @param config the current video input device configuration (current brightness, colour, etc.).
*/
- sigc::signal<void, VideoInputDevice, VideoInputSettings> device_opened;
+ sigc::signal2<void, VideoInputDevice, VideoInputSettings> device_opened;
/** This signal is emitted when a video input device is closed.
* @param device the video input device that was closed.
*/
- sigc::signal<void, VideoInputDevice> device_closed;
+ sigc::signal1<void, VideoInputDevice> device_closed;
/** This signal is emitted when an error occurs when opening a video input device.
* @param device the video input device that caused the error.
* @param error_code the video input device error code.
*/
- sigc::signal<void, VideoInputDevice, VideoInputErrorCodes> device_error;
+ sigc::signal2<void, VideoInputDevice, VideoInputErrorCodes> device_error;
protected:
typedef struct ManagerState {
Modified: trunk/lib/engine/videooutput/skel/videooutput-core.cpp
==============================================================================
--- trunk/lib/engine/videooutput/skel/videooutput-core.cpp (original)
+++ trunk/lib/engine/videooutput/skel/videooutput-core.cpp Tue Nov 18 20:04:12 2008
@@ -95,7 +95,7 @@
}
-void VideoOutputCore::visit_managers (sigc::slot<bool, VideoOutputManager &> visitor)
+void VideoOutputCore::visit_managers (sigc::slot1<bool, VideoOutputManager &> visitor)
{
bool go_on = true;
Modified: trunk/lib/engine/videooutput/skel/videooutput-core.h
==============================================================================
--- trunk/lib/engine/videooutput/skel/videooutput-core.h (original)
+++ trunk/lib/engine/videooutput/skel/videooutput-core.h Tue Nov 18 20:04:12 2008
@@ -110,12 +110,12 @@
/** Triggers a callback for all Ekiga::VideoOutputManager sources of the
* VideoOutputCore service.
*/
- void visit_managers (sigc::slot<bool, VideoOutputManager &> visitor);
+ void visit_managers (sigc::slot1<bool, VideoOutputManager &> visitor);
/** This signal is emitted when a Ekiga::VideoOutputManager has been
* added to the VideoOutputCore Service.
*/
- sigc::signal<void, VideoOutputManager &> manager_added;
+ sigc::signal1<void, VideoOutputManager &> manager_added;
/*** Videooutput Management ***/
@@ -164,11 +164,11 @@
/** See videooutput-manager.h for the API
*/
- sigc::signal<void, VideoOutputManager &, VideoOutputAccel, VideoOutputMode, unsigned, bool> device_opened;
- sigc::signal<void, VideoOutputManager &> device_closed;
- sigc::signal<void, VideoOutputManager &, VideoOutputErrorCodes> device_error;
- sigc::signal<void, VideoOutputManager &, VideoOutputFSToggle> fullscreen_mode_changed;
- sigc::signal<void, VideoOutputManager &, unsigned, unsigned> size_changed;
+ sigc::signal5<void, VideoOutputManager &, VideoOutputAccel, VideoOutputMode, unsigned, bool> device_opened;
+ sigc::signal1<void, VideoOutputManager &> device_closed;
+ sigc::signal2<void, VideoOutputManager &, VideoOutputErrorCodes> device_error;
+ sigc::signal2<void, VideoOutputManager &, VideoOutputFSToggle> fullscreen_mode_changed;
+ sigc::signal3<void, VideoOutputManager &, unsigned, unsigned> size_changed;
private:
Modified: trunk/lib/engine/videooutput/skel/videooutput-manager.h
==============================================================================
--- trunk/lib/engine/videooutput/skel/videooutput-manager.h (original)
+++ trunk/lib/engine/videooutput/skel/videooutput-manager.h Tue Nov 18 20:04:12 2008
@@ -105,16 +105,16 @@
* @param zoom the initial zoom level when de device was opened.
* @param both_streams if a frame from both local and remote stream has been received.
*/
- sigc::signal<void, VideoOutputAccel, VideoOutputMode, unsigned, bool> device_opened;
+ sigc::signal4<void, VideoOutputAccel, VideoOutputMode, unsigned, bool> device_opened;
/** This signal is emitted when a video output device is closed.
*/
- sigc::signal<void> device_closed;
+ sigc::signal0<void> device_closed;
/** This signal is emitted when an error occurs when opening a video output device.
* @param error_code the video output device error code.
*/
- sigc::signal<void, VideoOutputErrorCodes> device_error;
+ sigc::signal1<void, VideoOutputErrorCodes> device_error;
/** This signal is emitted when a manager switches autonomously into or out of fullscreen mode.
* Some managers like DX and XV allow the user to switch between FS
@@ -124,7 +124,7 @@
* or when it is being zoomed in or out.
* @param toggle VO_FS_ON or VO_FS_OFF depending on whether FS was activated or deactivated.
*/
- sigc::signal<void, VideoOutputFSToggle> fullscreen_mode_changed;
+ sigc::signal1<void, VideoOutputFSToggle> fullscreen_mode_changed;
/** This signal is emitted the video output size has changed.
* This signal is called whenever the size of the widget carrying the video signal
@@ -133,7 +133,7 @@
* @param width the new width of the widget.
* @param height the new height of the widget.
*/
- sigc::signal<void, unsigned, unsigned> size_changed;
+ sigc::signal2<void, unsigned, unsigned> size_changed;
protected:
virtual void get_display_info (DisplayInfo &) { };
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
