[gtkmm/sigc3v2: 3/4] sigc3: Use the newer sigc::slot<R(Args...)> syntax.

From: Murray Cumming <murrayc src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtkmm/sigc3v2: 3/4] sigc3: Use the newer sigc::slot<R(Args...)> syntax.
Date: Wed, 6 Jul 2016 12:25:30 +0000 (UTC)
commit e8582ad870e46e8828f898706e951b9c5d8955ef
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Jul 6 12:34:00 2016 +0200

    sigc3: Use the newer sigc::slot<R(Args...)> syntax.

 gdk/src/pixbuf.hg           |    4 ++--
 gdk/src/seat.hg             |    2 +-
 gtk/src/assistant.hg        |    2 +-
 gtk/src/calendar.hg         |    2 +-
 gtk/src/cellarea.hg         |    4 ++--
 gtk/src/celllayout.hg       |    2 +-
 gtk/src/clipboard.hg        |   14 +++++++-------
 gtk/src/colorselection.hg   |    2 +-
 gtk/src/container.hg        |    2 +-
 gtk/src/entrycompletion.ccg |    8 ++++----
 gtk/src/entrycompletion.hg  |    2 +-
 gtk/src/filefilter.hg       |    2 +-
 gtk/src/flowbox.hg          |    6 +++---
 gtk/src/fontchooser.hg      |    2 +-
 gtk/src/iconview.hg         |    2 +-
 gtk/src/listbox.hg          |    8 ++++----
 gtk/src/main.hg             |    4 ++--
 gtk/src/menu.hg             |    2 +-
 gtk/src/printer.hg          |    2 +-
 gtk/src/printjob.hg         |    2 +-
 gtk/src/printoperation.hg   |    2 +-
 gtk/src/printsettings.hg    |    2 +-
 gtk/src/recentchooser.hg    |    2 +-
 gtk/src/recentfilter.hg     |    2 +-
 gtk/src/textbuffer.hg       |    4 ++--
 gtk/src/texttagtable.hg     |    2 +-
 gtk/src/treemodel.hg        |    6 +++---
 gtk/src/treemodelfilter.hg  |    4 ++--
 gtk/src/treeselection.hg    |    8 ++++----
 gtk/src/treesortable.hg     |    2 +-
 gtk/src/treeview.hg         |   14 +++++++-------
 gtk/src/treeviewcolumn.hg   |    4 ++--
 gtk/src/widget.ccg          |    2 +-
 33 files changed, 64 insertions(+), 64 deletions(-)
---
diff --git a/gdk/src/pixbuf.hg b/gdk/src/pixbuf.hg
index 0cbf5a4..4834730 100644
--- a/gdk/src/pixbuf.hg
+++ b/gdk/src/pixbuf.hg
@@ -119,7 +119,7 @@ protected:
 
 
 public:
-  typedef sigc::slot<void, const guint8*> SlotDestroyData;
+  typedef sigc::slot<void(const guint8*)> SlotDestroyData;
 
   /** Transfers image data from a #GdkWindow and converts it to an RGB(A)
    * representation inside a Gdk::Pixbuf. In other words, copies
@@ -396,7 +396,7 @@ public:
   _IGNORE(gdk_pixbuf_savev)
 
 #if 0 //TODO:
-  typedef sigc::slot<const char* buf, gsize> SlotSave;
+  typedef sigc::slot<const char*, gsize> SlotSave;
 
   /** @throws TODO
    */
diff --git a/gdk/src/seat.hg b/gdk/src/seat.hg
index 191cd35..e623f13 100644
--- a/gdk/src/seat.hg
+++ b/gdk/src/seat.hg
@@ -52,7 +52,7 @@ public:
    *
    * @newin{3,20}
    */
-  typedef sigc::slot<void, const Glib::RefPtr<Window>&> SlotGrabPrepare;
+  typedef sigc::slot<void(const Glib::RefPtr<Window>&)> SlotGrabPrepare;
 
   _WRAP_METHOD(GrabStatus grab(const Glib::RefPtr<Window>& window,
                SeatCapabilities capabilities,
diff --git a/gtk/src/assistant.hg b/gtk/src/assistant.hg
index 4add455..4680d71 100644
--- a/gtk/src/assistant.hg
+++ b/gtk/src/assistant.hg
@@ -56,7 +56,7 @@ public:
   _WRAP_METHOD(int insert_page(Widget& page, int position), gtk_assistant_insert_page)
   _WRAP_METHOD(void remove_page(int page_num), gtk_assistant_remove_page)
 
-  typedef sigc::slot<int, int /* current_page */> SlotForwardPage;
+  typedef sigc::slot<int(int /* current_page */)> SlotForwardPage;
 
   void set_forward_page_func(const SlotForwardPage& slot);
   _IGNORE(gtk_assistant_set_forward_page_func)
diff --git a/gtk/src/calendar.hg b/gtk/src/calendar.hg
index 1729286..c66e674 100644
--- a/gtk/src/calendar.hg
+++ b/gtk/src/calendar.hg
@@ -90,7 +90,7 @@ public:
    *
    * @newin{2,14}
    */
-  typedef sigc::slot<Glib::ustring, guint, guint, guint> SlotDetails;
+  typedef sigc::slot<Glib::ustring(guint, guint, guint)> SlotDetails;
 
   /** Installs a function which provides Pango markup with detail information
    * for each day. Examples for such details are holidays or appointments. That
diff --git a/gtk/src/cellarea.hg b/gtk/src/cellarea.hg
index 0f2cce9..a3de4f5 100644
--- a/gtk/src/cellarea.hg
+++ b/gtk/src/cellarea.hg
@@ -117,7 +117,7 @@ public:
    *
    * @newin{3,4}
    */
-  typedef sigc::slot<bool, CellRenderer*> SlotForeach;
+  typedef sigc::slot<bool(CellRenderer*)> SlotForeach;
 
   /** Calls the @a slot for every CellRenderer in the CellArea.
    *
@@ -139,7 +139,7 @@ public:
    *
    * @newin{3,4}
    */
-  typedef sigc::slot<bool, CellRenderer*, const Gdk::Rectangle&, const Gdk::Rectangle&> SlotForeachAlloc;
+  typedef sigc::slot<bool(CellRenderer*, const Gdk::Rectangle&, const Gdk::Rectangle&)> SlotForeachAlloc;
 
   /** Calls the @a slot for every CellRenderer in the CellArea
    * with the allocated rectangle inside the @a cell_area rectangle.
diff --git a/gtk/src/celllayout.hg b/gtk/src/celllayout.hg
index a65fbf2..655c468 100644
--- a/gtk/src/celllayout.hg
+++ b/gtk/src/celllayout.hg
@@ -83,7 +83,7 @@ public:
   void add_attribute(CellRenderer& cell, const Glib::ustring& attribute, const TreeModelColumnBase& column);
 
   //For instance, void on_cell_data(const TreeModel::const_iterator& iter)
-  typedef sigc::slot<void, const TreeModel::const_iterator&> SlotCellData;
+  typedef sigc::slot<void(const TreeModel::const_iterator&)> SlotCellData;
 
   void set_cell_data_func(CellRenderer& cell, const SlotCellData& slot);
   _IGNORE(gtk_cell_layout_set_cell_data_func)
diff --git a/gtk/src/clipboard.hg b/gtk/src/clipboard.hg
index 106c0f4..3e6b13b 100644
--- a/gtk/src/clipboard.hg
+++ b/gtk/src/clipboard.hg
@@ -73,7 +73,7 @@ public:
   _WRAP_METHOD(Glib::RefPtr<const Gdk::Display> get_display() const, gtk_clipboard_get_display, refreturn, 
constversion)
 
   /// For instance: void on_get(Gtk::SelectionData& selection_data, guint info);
-  typedef sigc::slot<void, SelectionData&, guint> SlotGet;
+  typedef sigc::slot<void(SelectionData&, guint)> SlotGet;
 
   /// For instance: void on_clear();
   typedef sigc::slot<void> SlotClear;
@@ -120,7 +120,7 @@ public:
   _WRAP_METHOD(void set_image(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf), gtk_clipboard_set_image)
 
   /// For instance: void on_received(const SelectionData& selection_data);
-  typedef sigc::slot<void, const SelectionData&> SlotReceived;
+  typedef sigc::slot<void(const SelectionData&)> SlotReceived;
 
   /** Requests the contents of clipboard as the given target.
    * When the results of the result are later received the supplied callback
@@ -137,7 +137,7 @@ public:
   _IGNORE(gtk_clipboard_request_contents)
 
   /// For instance: void on_text_received(const Glib::ustring& text);
-  typedef sigc::slot<void, const Glib::ustring&> SlotTextReceived;
+  typedef sigc::slot<void(const Glib::ustring&)> SlotTextReceived;
 
   /** Requests the contents of the clipboard as text. When the text is
    * later received, it will be converted to UTF-8 if necessary, and
@@ -156,7 +156,7 @@ public:
   _IGNORE(gtk_clipboard_request_text)
 
   /// For instance: void on_rich_text_received(const Glib::ustring& format, const std::string& text);
-  typedef sigc::slot<void, const Glib::ustring&, const std::string&> SlotRichTextReceived;
+  typedef sigc::slot<void(const Glib::ustring&, const std::string&)> SlotRichTextReceived;
 
   /** Requests the contents of the clipboard as rich text. When the rich text is later received,
    * @a slot will be called.
@@ -175,7 +175,7 @@ public:
 
 
   /// For instance: void on_uris_received(const std::vector<Glib::ustring>& uris);
-  typedef sigc::slot<void, const std::vector<Glib::ustring>&> SlotUrisReceived;
+  typedef sigc::slot<void(const std::vector<Glib::ustring>&)> SlotUrisReceived;
 
  /** Requests the contents of the clipboard as URIs. When the URIs are
   * later received @a slot will be called.
@@ -194,7 +194,7 @@ public:
 
 
   /// For instance: void on_image_received(const Glib::RefPtr<Gdk::Pixbuf>& text);
-  typedef sigc::slot<void, const Glib::RefPtr<Gdk::Pixbuf>&> SlotImageReceived;
+  typedef sigc::slot<void(const Glib::RefPtr<Gdk::Pixbuf>&)> SlotImageReceived;
 
   /** Requests the contents of the clipboard as image. When the image is
    * later received, it will be converted to a Gdk::Pixbuf.
@@ -215,7 +215,7 @@ public:
   _IGNORE(gtk_clipboard_request_image)
 
   /// For instance: void on_targets_received(const std::vector<Glib::ustring>& targets);
-  typedef sigc::slot<void, const std::vector<Glib::ustring>&> SlotTargetsReceived;
+  typedef sigc::slot<void(const std::vector<Glib::ustring>&)> SlotTargetsReceived;
 
   /** Requests the contents of the clipboard as list of supported targets.
    * When the list is later received, callback will be called.
diff --git a/gtk/src/colorselection.hg b/gtk/src/colorselection.hg
index 5e35068..56ce1be 100644
--- a/gtk/src/colorselection.hg
+++ b/gtk/src/colorselection.hg
@@ -80,7 +80,7 @@ public:
   static std::vector<Gdk::Color> palette_from_string(const Glib::ustring& str);
   static Glib::ustring palette_to_string(const std::vector<Gdk::Color>& colors);
 
-  typedef sigc::slot<void, const Glib::RefPtr<Gdk::Screen>&,
+  typedef sigc::slot<void(const Glib::RefPtr<Gdk::Screen)>&,
                             const std::vector<Gdk::Color>&> SlotChangePaletteHook;
 
   static SlotChangePaletteHook set_change_palette_hook(const SlotChangePaletteHook& slot);
diff --git a/gtk/src/container.hg b/gtk/src/container.hg
index 881b8f3..d196b14 100644
--- a/gtk/src/container.hg
+++ b/gtk/src/container.hg
@@ -101,7 +101,7 @@ public:
   /** For instance,
    * void on_foreach(Gtk::Widget* widget);
    */
-  typedef sigc::slot<void, Widget&> ForeachSlot;
+  typedef sigc::slot<void(Widget&)> ForeachSlot;
 
   /** Operate on contained items.
    *
diff --git a/gtk/src/entrycompletion.ccg b/gtk/src/entrycompletion.ccg
index 1d73262..1e7a052 100644
--- a/gtk/src/entrycompletion.ccg
+++ b/gtk/src/entrycompletion.ccg
@@ -100,7 +100,7 @@ namespace //anonymous
 static gboolean Widget_signal_match_selected_callback(GtkEntryCompletion* self, GtkTreeModel* c_model, 
GtkTreeIter* c_iter, void* data)
 {
   using namespace Gtk;
-  typedef sigc::slot< bool, const TreeModel::iterator& > SlotType;
+  typedef sigc::slot< bool(const TreeModel::iterator& )> SlotType;
 
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
@@ -128,7 +128,7 @@ static gboolean Widget_signal_match_selected_callback(GtkEntryCompletion* self,
 static gboolean Widget_signal_match_selected_notify_callback(GtkEntryCompletion* self, GtkTreeModel* 
c_model, GtkTreeIter* c_iter, void* data)
 {
   using namespace Gtk;
-  typedef sigc::slot< void, const TreeModel::iterator& > SlotType;
+  typedef sigc::slot< void(const TreeModel::iterator& )> SlotType;
 
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
@@ -164,7 +164,7 @@ const Glib::SignalProxyInfo EntryCompletion_signal_match_selected_info =
 static gboolean Widget_signal_cursor_on_match_callback(GtkEntryCompletion* self, GtkTreeModel* c_model, 
GtkTreeIter* c_iter, void* data)
 {
   using namespace Gtk;
-  typedef sigc::slot< bool, const TreeModel::iterator& > SlotType;
+  typedef sigc::slot< bool(const TreeModel::iterator& )> SlotType;
 
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
@@ -192,7 +192,7 @@ static gboolean Widget_signal_cursor_on_match_callback(GtkEntryCompletion* self,
 static gboolean Widget_signal_cursor_on_match_notify_callback(GtkEntryCompletion* self, GtkTreeModel* 
c_model, GtkTreeIter* c_iter, void* data)
 {
   using namespace Gtk;
-  typedef sigc::slot< void, const TreeModel::iterator& > SlotType;
+  typedef sigc::slot< void(const TreeModel::iterator& )> SlotType;
 
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
diff --git a/gtk/src/entrycompletion.hg b/gtk/src/entrycompletion.hg
index 8d8b3dc..671cfee 100644
--- a/gtk/src/entrycompletion.hg
+++ b/gtk/src/entrycompletion.hg
@@ -88,7 +88,7 @@ public:
   void unset_model();
 
   /// For example, bool on_match(const Glib::ustring& key, const TreeModel::const_iterator& iter);
-  typedef sigc::slot<bool, const Glib::ustring&, const TreeModel::const_iterator&> SlotMatch;
+  typedef sigc::slot<bool(const Glib::ustring&, const TreeModel::const_iterator&)> SlotMatch;
 
   void set_match_func(const SlotMatch& slot);
   _IGNORE(gtk_entry_completion_set_match_func)
diff --git a/gtk/src/filefilter.hg b/gtk/src/filefilter.hg
index 4115c17..210390e 100644
--- a/gtk/src/filefilter.hg
+++ b/gtk/src/filefilter.hg
@@ -68,7 +68,7 @@ public:
   };
 
   /// For instance, bool on_custom(const Gtk::FileFilter::Info& filter_info);
-  typedef sigc::slot<bool, const Info&> SlotCustom;
+  typedef sigc::slot<bool(const Info&)> SlotCustom;
 
   void add_custom(FileFilterFlags needed, const SlotCustom& slot);
   _IGNORE(gtk_file_filter_add_custom)
diff --git a/gtk/src/flowbox.hg b/gtk/src/flowbox.hg
index c562730..a17f021 100644
--- a/gtk/src/flowbox.hg
+++ b/gtk/src/flowbox.hg
@@ -79,7 +79,7 @@ public:
    *
    * @newin{3,12}
    */
-  typedef sigc::slot<void, FlowBox*, FlowBoxChild*> SlotSelectedForeach;
+  typedef sigc::slot<void(FlowBox*, FlowBoxChild*)> SlotSelectedForeach;
 
   /** For instance: bool on_filter(FlowBoxChild* child);
    *
@@ -93,7 +93,7 @@ public:
    *
    * @newin{3,12}
    */
-  typedef sigc::slot<bool, FlowBoxChild*> SlotFilter;
+  typedef sigc::slot<bool(FlowBoxChild*)> SlotFilter;
 
   /** For instance: int on_sort(FlowBoxChild* child1, FlowBoxChild* child2)
    *
@@ -109,7 +109,7 @@ public:
    *
    * @newin{3,12}
    */
-  typedef sigc::slot<int, FlowBoxChild*, FlowBoxChild*> SlotSort;
+  typedef sigc::slot<int(FlowBoxChild*, FlowBoxChild*)> SlotSort;
 
   _WRAP_METHOD(void set_homogeneous(bool homogeneous = true), gtk_flow_box_set_homogeneous)
   _WRAP_METHOD(bool get_homogeneous() const, gtk_flow_box_get_homogeneous)
diff --git a/gtk/src/fontchooser.hg b/gtk/src/fontchooser.hg
index ad3a012..9bfd411 100644
--- a/gtk/src/fontchooser.hg
+++ b/gtk/src/fontchooser.hg
@@ -88,7 +88,7 @@ public:
    *
    * @newin{3,4}
    */
-  typedef sigc::slot<bool, const Glib::RefPtr<const Pango::FontFamily>&, const Glib::RefPtr<const 
Pango::FontFace>&> SlotFontFilter;
+  typedef sigc::slot<bool(const Glib::RefPtr<const Pango::FontFamily>&, const Glib::RefPtr<const 
Pango::FontFace>&)> SlotFontFilter;
 
   /** Adds a filter function that decides which fonts to display in the font chooser.
    *
diff --git a/gtk/src/iconview.hg b/gtk/src/iconview.hg
index dd1589d..b8b910b 100644
--- a/gtk/src/iconview.hg
+++ b/gtk/src/iconview.hg
@@ -152,7 +152,7 @@ public:
   /** For instance,
    * void on_foreach(const Gtk::TreeModel::Path& path);
    */
-  typedef sigc::slot<void, const TreeModel::Path&> SlotForeach;
+  typedef sigc::slot<void(const TreeModel::Path&)> SlotForeach;
 
   /** Calls a function for each selected icon. Note that the model or
   * selection cannot be modified from within this function.
diff --git a/gtk/src/listbox.hg b/gtk/src/listbox.hg
index 9652bb9..851bb88 100644
--- a/gtk/src/listbox.hg
+++ b/gtk/src/listbox.hg
@@ -70,7 +70,7 @@ public:
    *
    * @newin{3,10}
    */
-  typedef sigc::slot<bool, ListBoxRow*> SlotFilter;
+  typedef sigc::slot<bool(ListBoxRow*)> SlotFilter;
 
   /** For instance: int on_sort(ListBoxRow* row1, ListBoxRow* row2);
    *
@@ -83,7 +83,7 @@ public:
    *
    * @newin{3,10}
    */
-  typedef sigc::slot<int, ListBoxRow*, ListBoxRow*> SlotSort;
+  typedef sigc::slot<int(ListBoxRow*, ListBoxRow*)> SlotSort;
 
   /** For instance: void on_update_header(ListBoxRow* row, ListBoxRow* before);
    *
@@ -97,7 +97,7 @@ public:
    *
    * @newin{3,10}
    */
-  typedef sigc::slot<void, ListBoxRow*, ListBoxRow*> SlotUpdateHeader;
+  typedef sigc::slot<void(ListBoxRow*, ListBoxRow*)> SlotUpdateHeader;
 
   _WRAP_METHOD(void prepend(Widget& child), gtk_list_box_prepend)
   _WRAP_METHOD(void insert(Widget& child, int position), gtk_list_box_insert)
@@ -143,7 +143,7 @@ public:
   /** For instance,
    * void on_foreach(ListBoxRow* row);
    */
-  typedef sigc::slot<void, ListBoxRow*> SlotForeach;
+  typedef sigc::slot<void(ListBoxRow*)> SlotForeach;
 
   void selected_foreach(const SlotForeach& slot);
   _IGNORE(gtk_list_box_selected_foreach)
diff --git a/gtk/src/main.hg b/gtk/src/main.hg
index 5622887..30b1c41 100644
--- a/gtk/src/main.hg
+++ b/gtk/src/main.hg
@@ -48,7 +48,7 @@ class Window;
 class KeySnooperSig
 {
 public:
-  typedef sigc::slot<int, Widget*, GdkEventKey*> SlotType;
+  typedef sigc::slot<int(Widget*, GdkEventKey*)> SlotType;
 
   sigc::connection connect(const SlotType& slot);
 
@@ -253,7 +253,7 @@ _DEPRECATE_IFDEF_START
    * Allows you to channel keypresses to a signal handler
    * without registering with the widget.
    *
-   * @return KeySnooperSig A Signal to which you can connect a sigc::slot< int, Widget *, GdkEventKey * >
+   * @return KeySnooperSig A Signal to which you can connect a sigc::slot< int(Widget *, GdkEventKey * )>
    *
    * It is the responsibility of the snooper to pass the keypress
    * to the widget, however, care must be taken that the keypress is
diff --git a/gtk/src/menu.hg b/gtk/src/menu.hg
index 9c7093d..8db90a3 100644
--- a/gtk/src/menu.hg
+++ b/gtk/src/menu.hg
@@ -65,7 +65,7 @@ public:
   /** For instance,
    * void on_popup_menu_position(int& x, int& y, bool& push_in);
    */
-  typedef sigc::slot<void, int&, int&, bool&> SlotPositionCalc;
+  typedef sigc::slot<void(int&, int&, bool&)> SlotPositionCalc;
 
   void popup(MenuShell& parent_menu_shell, MenuItem& parent_menu_item, const SlotPositionCalc& slot, guint 
button, guint32 activate_time, const Glib::RefPtr<Gdk::Device>& device = Glib::RefPtr<Gdk::Device>());
   _IGNORE(gtk_menu_popup, gtk_menu_popup_for_device)
diff --git a/gtk/src/printer.hg b/gtk/src/printer.hg
index 89f9d7c..46822bf 100644
--- a/gtk/src/printer.hg
+++ b/gtk/src/printer.hg
@@ -122,7 +122,7 @@ inline bool operator!=(const Glib::RefPtr<Printer>& lhs, const Glib::RefPtr<Prin
  *
  * @relates Gtk::Printer
  */
-typedef sigc::slot< bool, const Glib::RefPtr<Printer>& > SlotPrinterEnumerator;
+typedef sigc::slot< bool(const Glib::RefPtr<Printer>& )> SlotPrinterEnumerator;
 
 /** Calls a function for all Printers. If the callback returns true, the enumeration is stopped.
  * @param slot A function to call for each printer
diff --git a/gtk/src/printjob.hg b/gtk/src/printjob.hg
index c178938..cf0379c 100644
--- a/gtk/src/printjob.hg
+++ b/gtk/src/printjob.hg
@@ -74,7 +74,7 @@ public:
    *
    * @throws exception
    */
-  typedef sigc::slot< void, const Glib::RefPtr<PrintJob>& > SlotPrintJobComplete;
+  typedef sigc::slot< void(const Glib::RefPtr<PrintJob>& )> SlotPrintJobComplete;
 
   /** Sends the print job off to the printer.
    * @param slot A function to call when the job completes or an error occurs.
diff --git a/gtk/src/printoperation.hg b/gtk/src/printoperation.hg
index 288b60a..d0138bb 100644
--- a/gtk/src/printoperation.hg
+++ b/gtk/src/printoperation.hg
@@ -219,7 +219,7 @@ public:
   /** For example,
    * void on_setup_done(const Glib::RefPtr<PageSetup>& page_setup);
    */
-  typedef sigc::slot< void, const Glib::RefPtr<PageSetup>& > SlotPrintSetupDone;
+  typedef sigc::slot< void(const Glib::RefPtr<PageSetup>& )> SlotPrintSetupDone;
 
   /** Runs a page setup dialog, letting the user modify the values from page_setup.
    *
diff --git a/gtk/src/printsettings.hg b/gtk/src/printsettings.hg
index 61f5976..fb42ba4 100644
--- a/gtk/src/printsettings.hg
+++ b/gtk/src/printsettings.hg
@@ -182,7 +182,7 @@ public:
   /** For example,
    * void on_foreach_setting(const Glib::ustring& key, const Glib::ustring& value);
    */
-  typedef sigc::slot<void, const Glib::ustring&, const Glib::ustring&> SlotForeach;
+  typedef sigc::slot<void(const Glib::ustring&, const Glib::ustring&)> SlotForeach;
 
   /** Calls a function for each print setting.
   * @param slot The callback to call for each print setting.
diff --git a/gtk/src/recentchooser.hg b/gtk/src/recentchooser.hg
index c6fdb4e..90afd91 100644
--- a/gtk/src/recentchooser.hg
+++ b/gtk/src/recentchooser.hg
@@ -79,7 +79,7 @@ public:
    * equal and 1 if a compares after b.
    * For instance, int on_sort_compare(const Glib::RefPtr<Gtk::RecentInfo>& a, const Gtk::RecentInfo& b);
    */
-  typedef sigc::slot<int, const Glib::RefPtr<RecentInfo>&, const Glib::RefPtr<RecentInfo>&> SlotCompare;
+  typedef sigc::slot<int(const Glib::RefPtr<RecentInfo>&, const Glib::RefPtr<RecentInfo>&)> SlotCompare;
   _IGNORE(gtk_recent_chooser_set_sort_func)
 
   /** Sets the comparison function used when sorting the list of recently
diff --git a/gtk/src/recentfilter.hg b/gtk/src/recentfilter.hg
index a741e39..bf1321b 100644
--- a/gtk/src/recentfilter.hg
+++ b/gtk/src/recentfilter.hg
@@ -94,7 +94,7 @@ public:
   };
 
   /// For instance, bool on_custom(const Gtk::RecentFilter::Info& filter_info);
-  typedef sigc::slot<bool, const Info&> SlotCustom;
+  typedef sigc::slot<bool(const Info&)> SlotCustom;
 
   void add_custom(RecentFilterFlags needed, const SlotCustom& slot);
   _IGNORE(gtk_recent_filter_add_custom)
diff --git a/gtk/src/textbuffer.hg b/gtk/src/textbuffer.hg
index 07df192..8c59989 100644
--- a/gtk/src/textbuffer.hg
+++ b/gtk/src/textbuffer.hg
@@ -495,7 +495,7 @@ public:
    * @param[out] length The length of the serialized data.
    * @return A newly-allocated array of guint8 which contains the serialized data, or <tt>0</tt> if an error 
occurred.
    */
- typedef sigc::slot<guint8*, const Glib::RefPtr<TextBuffer>&, const iterator&, const iterator&, gsize&> 
SlotSerialize;
+ typedef sigc::slot<guint8*(const Glib::RefPtr<TextBuffer>&, const iterator&, const iterator&, gsize&)> 
SlotSerialize;
 
   /** For instance,<br>
    * bool on_deserialize(const Glib::RefPtr<TextBuffer>& content_buffer, iterator& iter, const guint8* data, 
gsize length, bool create_tags);
@@ -511,7 +511,7 @@ public:
    *        derived from Glib::Error, the exception will be propagated out from
    *        the calling deserialize() method.
    */
-  typedef sigc::slot<bool, const Glib::RefPtr<TextBuffer>&, iterator&, const guint8*, gsize, bool> 
SlotDeserialize;
+  typedef sigc::slot<bool(const Glib::RefPtr<TextBuffer>&, iterator&, const guint8*, gsize, bool)> 
SlotDeserialize;
 
   /** This function registers a rich text serialization @a slot along with
    * its @a mime_type with this TextBuffer.
diff --git a/gtk/src/texttagtable.hg b/gtk/src/texttagtable.hg
index c6b22ca..956ff30 100644
--- a/gtk/src/texttagtable.hg
+++ b/gtk/src/texttagtable.hg
@@ -50,7 +50,7 @@ public:
   _WRAP_METHOD(Glib::RefPtr<TextTag> lookup(const Glib::ustring& name), gtk_text_tag_table_lookup, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const TextTag> lookup(const Glib::ustring& name) const, 
gtk_text_tag_table_lookup, refreturn, constversion)
 
-  typedef sigc::slot<void, const Glib::RefPtr<TextTag>&> SlotForEach;
+  typedef sigc::slot<void(const Glib::RefPtr<TextTag>&)> SlotForEach;
   void foreach(const SlotForEach& slot);
   _IGNORE(gtk_text_tag_table_foreach)
 
diff --git a/gtk/src/treemodel.hg b/gtk/src/treemodel.hg
index 55faf7f..c6babc6 100644
--- a/gtk/src/treemodel.hg
+++ b/gtk/src/treemodel.hg
@@ -141,7 +141,7 @@ public:
    *
    * If the callback function returns true, then the tree ceases to be walked, and foreach() returns.
    */
-  typedef sigc::slot<bool, const TreeModel::iterator&> SlotForeachIter;
+  typedef sigc::slot<bool(const TreeModel::iterator&)> SlotForeachIter;
 
   /** Calls a callback slot on each node in the model in a depth-first fashion.
    * If the callback function returns true, then the tree ceases to be walked, and foreach() returns.
@@ -155,7 +155,7 @@ public:
    *
    * If the callback function returns true, then the tree ceases to be walked, and foreach() returns.
    */
-  typedef sigc::slot<bool, const TreeModel::Path&> SlotForeachPath;
+  typedef sigc::slot<bool(const TreeModel::Path&)> SlotForeachPath;
 
   /** Calls a callback slot on each node in the model in a depth-first fashion.
    * If the callback function returns true, then the tree ceases to be walked, and foreach() returns.
@@ -169,7 +169,7 @@ public:
    *
    * If the callback function returns true, then the tree ceases to be walked, and foreach() returns.
    */
-  typedef sigc::slot<bool, const TreeModel::Path&, const TreeModel::iterator&> SlotForeachPathAndIter;
+  typedef sigc::slot<bool(const TreeModel::Path&, const TreeModel::iterator&)> SlotForeachPathAndIter;
 
   /** Calls a callback slot on each node in the model in a depth-first fashion.
    * If the callback function returns true, then the tree ceases to be walked, and foreach() returns.
diff --git a/gtk/src/treemodelfilter.hg b/gtk/src/treemodelfilter.hg
index b008eac..6757b55 100644
--- a/gtk/src/treemodelfilter.hg
+++ b/gtk/src/treemodelfilter.hg
@@ -65,7 +65,7 @@ public:
    * bool on_visible(const TreeModel::const_iterator& iter);
    * This should return true if the given row should be visible and false otherwise.
    */
-  typedef sigc::slot<bool, const TreeModel::const_iterator&> SlotVisible;
+  typedef sigc::slot<bool(const TreeModel::const_iterator&)> SlotVisible;
 
   /** Sets the "visible" callback used when filtering the filter.
    * The callback function should return true if the given row should be visible and false otherwise.
@@ -85,7 +85,7 @@ public:
    * value is an output parameter in which you must store the value to be used in the parent model's row,
    * column is the column in the parent row whose row value you must provide in the value output paramater.
    */
-  typedef sigc::slot<void, const Gtk::TreeModel::iterator& /* iter */, Glib::ValueBase& /* value */, int /* 
column */> SlotModify;
+  typedef sigc::slot<void(const Gtk::TreeModel::iterator& /* iter */, Glib::ValueBase& /* value */, int /* 
column */)> SlotModify;
 
   /** Specify columns that will be provided by this model, and a callback that will provide data for these
    * columns based on data in the columns of the child model.
diff --git a/gtk/src/treeselection.hg b/gtk/src/treeselection.hg
index 32aa45f..d55e77d 100644
--- a/gtk/src/treeselection.hg
+++ b/gtk/src/treeselection.hg
@@ -72,7 +72,7 @@ public:
    * The select function should return true if the state of the node may be toggled,
    * and false if the state of the node should be left unchanged.
    */
-  typedef sigc::slot<bool, const Glib::RefPtr<TreeModel>&, const TreeModel::Path&, bool> SlotSelect;
+  typedef sigc::slot<bool(const Glib::RefPtr<TreeModel>&, const TreeModel::Path&, bool)> SlotSelect;
 
   /** Sets the selection callback slot. If set, this function is called before any node is selected or 
unselected,
    * giving some control over which nodes are selected.
@@ -143,7 +143,7 @@ public:
    * Note that you cannot modify the tree or selection from within the callback function.
    * As a result, get_selected_rows() might be more useful.
    */
-  typedef sigc::slot<void, const TreeModel::iterator&> SlotForeachIter;
+  typedef sigc::slot<void(const TreeModel::iterator&)> SlotForeachIter;
 
   /** Calls a callback slot for each selected node.
    * Note that you cannot modify the tree or selection from within the callback function.
@@ -159,7 +159,7 @@ public:
    * Note that you cannot modify the tree or selection from within the callback function.
    * As a result, get_selected_rows() might be more useful.
    */
-  typedef sigc::slot<void, const TreeModel::Path&> SlotForeachPath;
+  typedef sigc::slot<void(const TreeModel::Path&)> SlotForeachPath;
 
   /** Calls a callback slot for each selected node.
    * Note that you cannot modify the tree or selection from within the callback function.
@@ -176,7 +176,7 @@ public:
    * Note that you cannot modify the tree or selection from within the callback function.
    * As a result, get_selected_rows() might be more useful.
    */
-  typedef sigc::slot<void, const TreeModel::Path&, const TreeModel::iterator&> SlotForeachPathAndIter;
+  typedef sigc::slot<void(const TreeModel::Path&, const TreeModel::iterator&)> SlotForeachPathAndIter;
 
   /** Calls a callback slot for each selected node.
    * Note that you cannot modify the tree or selection from within the callback function.
diff --git a/gtk/src/treesortable.hg b/gtk/src/treesortable.hg
index bbca930..0d21fa8 100644
--- a/gtk/src/treesortable.hg
+++ b/gtk/src/treesortable.hg
@@ -68,7 +68,7 @@ public:
   /** This callback should return -1 if a compares before b, 0 if they compare equal, 1 if a compares after 
b.
    * For instance, int on_sort_compare(const Gtk::TreeModel::iterator& a, const Gtk::TreeModel::iterator& b);
    */
-  typedef sigc::slot<int, const Gtk::TreeModel::iterator&, const Gtk::TreeModel::iterator&> SlotCompare;
+  typedef sigc::slot<int(const Gtk::TreeModel::iterator&, const Gtk::TreeModel::iterator&)> SlotCompare;
 
   _IGNORE(gtk_tree_sortable_set_sort_func, gtk_tree_sortable_set_default_sort_func)
 
diff --git a/gtk/src/treeview.hg b/gtk/src/treeview.hg
index 67793e4..9a86d83 100644
--- a/gtk/src/treeview.hg
+++ b/gtk/src/treeview.hg
@@ -343,7 +343,7 @@ _DEPRECATE_IFDEF_END
    * and the two view Columns determining the drop spot. If either of the view Column arguments for the drop 
spot
    * are 0, then they indicate an edge.
    */
-  typedef sigc::slot<bool, TreeView*, TreeViewColumn*,  TreeViewColumn*, TreeViewColumn*> SlotColumnDrop;
+  typedef sigc::slot<bool(TreeView*, TreeViewColumn*,  TreeViewColumn*, TreeViewColumn*)> SlotColumnDrop;
 
   /** Sets a callback slot for determining where a column may be dropped when dragged.
    * This function is called on every column pair in turn at the beginning of a column drag to determine 
where a
@@ -456,7 +456,7 @@ _DEPRECATE_IFDEF_END
   /** For example,
    * void on_map_expanded_rows(TreeView* tree_view, const TreeModel::Path& path);
    */
-  typedef sigc::slot<void, TreeView*, const TreeModel::Path&> SlotMapping;
+  typedef sigc::slot<void(TreeView*, const TreeModel::Path&)> SlotMapping;
 
   /** Calls the callback slot on all expanded rows.
    * @param slot A callback function to be called.
@@ -658,7 +658,7 @@ _DEPRECATE_IFDEF_END
   _WRAP_METHOD(void set_search_column(int column), gtk_tree_view_set_search_column)
 
   ///void on_search_equal(const Glib::RefPtr<TreeModel>& model, int column, const Glib::ustring& key, const 
TreeModel::iterator& iter)
-  typedef sigc::slot<bool, const Glib::RefPtr<TreeModel>&, int, const Glib::ustring&, const 
TreeModel::iterator&> SlotSearchEqual;
+  typedef sigc::slot<bool(const Glib::RefPtr<TreeModel>&, int, const Glib::ustring&, const 
TreeModel::iterator&)> SlotSearchEqual;
   //SlotSearchEqual get_search_equal_func();
   _IGNORE(gtk_tree_view_get_search_equal_func)
 
@@ -674,7 +674,7 @@ _DEPRECATE_IFDEF_END
   _WRAP_METHOD(void set_search_entry(Entry& entry), gtk_tree_view_set_search_entry)
 
   ///void on_search_position(Gtk::Widget* search_dialog)
-  typedef sigc::slot<void, Gtk::Widget* /* search_dialog */> SlotSearchPosition;
+  typedef sigc::slot<void(Gtk::Widget* /* search_dialog */)> SlotSearchPosition;
   void set_search_position_func(const SlotSearchPosition& slot);
   _IGNORE(gtk_tree_view_get_search_position_func, gtk_tree_view_set_search_position_func)
 
@@ -705,7 +705,7 @@ _DEPRECATE_IFDEF_END
    * For instance,
    * bool on_row_separator(const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::iterator& iter);
    */
-  typedef sigc::slot<bool, const Glib::RefPtr<TreeModel>&, const TreeModel::iterator&> SlotRowSeparator;
+  typedef sigc::slot<bool(const Glib::RefPtr<TreeModel>&, const TreeModel::iterator&)> SlotRowSeparator;
 
   /** Sets the row separator function, which is used to determine whether a row should be drawn as a 
separator.
    */
@@ -1014,7 +1014,7 @@ void _connect_auto_store_editable_signal_handler(Gtk::TreeView* this_p, Gtk::Cel
 
     //Connect to the appropriate signal, sending the model_column too
 
-    sigc::slot<void, const Glib::ustring&, int> slot_temp =
+    sigc::slot<void(const Glib::ustring&, int)> slot_temp =
       sigc::bind<-1>(
         sigc::mem_fun(*this_p, &Gtk::TreeView::_auto_store_on_cellrenderer_toggle_edited_with_model),
         this_p->get_model()
@@ -1105,7 +1105,7 @@ void _connect_auto_store_editable_signal_handler(Gtk::TreeView* this_p, Gtk::Cel
     //Some compilers (IRIX MipsPro) don't like us to give the pointer to a template function directly to 
sigc::ptr_fun():
     typedef void (*type_func)(const Glib::ustring&, const Glib::ustring&, int, const 
Glib::RefPtr<Gtk::TreeModel>&);
     type_func func = &(Gtk::TreeView_Private::_auto_store_on_cellrenderer_text_edited_string<ColumnType>);
-    sigc::slot<void, const Glib::ustring&, const Glib::ustring&, int, const Glib::RefPtr<Gtk::TreeModel>&> 
theslot  =
+    sigc::slot<void(const Glib::ustring&, const Glib::ustring&, int, const Glib::RefPtr<Gtk::TreeModel>&)> 
theslot  =
       sigc::ptr_fun(func);
 
     //We use bind<-1> twice here, instead of using bind() once, because some compilers need the extra hint.
diff --git a/gtk/src/treeviewcolumn.hg b/gtk/src/treeviewcolumn.hg
index 3a70273..0cab4f7 100644
--- a/gtk/src/treeviewcolumn.hg
+++ b/gtk/src/treeviewcolumn.hg
@@ -123,7 +123,7 @@ _DEPRECATE_IFDEF_START
    *
    * @deprecated Use SlotTreeCellData instead.
    */
-  typedef sigc::slot<void, CellRenderer*, const Gtk::TreeModel::iterator&> SlotCellData;
+  typedef sigc::slot<void(CellRenderer*, const Gtk::TreeModel::iterator&)> SlotCellData;
 _DEPRECATE_IFDEF_END
 
   /** For instance,
@@ -132,7 +132,7 @@ _DEPRECATE_IFDEF_END
    * This function is used instead of the standard attributes mapping for setting the column value, and 
should set the
    * value of the column's cell renderer as appropriate.
    */
-  typedef sigc::slot<void, CellRenderer*, const Gtk::TreeModel::iterator&> SlotTreeCellData;
+  typedef sigc::slot<void(CellRenderer*, const Gtk::TreeModel::iterator&)> SlotTreeCellData;
 
   /** Sets the slot callback to use for the column.
    * This callback function is used instead of the standard attributes mapping for setting the column value, 
and should set the
diff --git a/gtk/src/widget.ccg b/gtk/src/widget.ccg
index 6840b50..be6f8de 100644
--- a/gtk/src/widget.ccg
+++ b/gtk/src/widget.ccg
@@ -84,7 +84,7 @@ static void Widget_signal_drag_data_get_callback(GtkWidget* self, GdkDragContext
 static void Widget_signal_selection_get_callback(GtkWidget* self, GtkSelectionData* p0,guint p1,guint 
p2,void* data)
 {
   using namespace Gtk;
-  typedef sigc::slot< void, SelectionData&, guint, guint > SlotType;
+  typedef sigc::slot< void(SelectionData&, guint, guint )> SlotType;
 
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]