GNOME.org
 

[gtkmm] sigc3: Use the newer libsigc++ syntax.

commit b645f4c9cb514ce9066a06038408d5a3d87e58c6
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Nov 11 13:50:40 2016 +0100

    sigc3: Use the newer libsigc++ syntax.

 gdk/src/pixbuf.hg           |    2 +-
 gtk/src/clipboard.hg        |    2 +-
 gtk/src/container.ccg       |    2 +-
 gtk/src/cssprovider.ccg     |    2 +-
 gtk/src/entrycompletion.ccg |    8 ++++----
 gtk/src/flowbox.hg          |    2 +-
 gtk/src/listbox.hg          |    2 +-
 gtk/src/printer.hg          |    2 +-
 gtk/src/printjob.hg         |    2 +-
 gtk/src/printoperation.hg   |    2 +-
 gtk/src/recentmanager.hg    |    2 +-
 gtk/src/toolbar.ccg         |   12 ++++++------
 gtk/src/toolbar.hg          |   12 ++++++------
 gtk/src/widget.ccg          |    6 +++---
 14 files changed, 29 insertions(+), 29 deletions(-)
---
diff --git a/gdk/src/pixbuf.hg b/gdk/src/pixbuf.hg
index 6801dce..1c8b7ba 100644
--- a/gdk/src/pixbuf.hg
+++ b/gdk/src/pixbuf.hg
@@ -397,7 +397,7 @@ public:
   _IGNORE(gdk_pixbuf_savev)
 
 #if 0 //TODO:
-  typedef sigc::slot<const char*, gsize> SlotSave;
+  typedef sigc::slot<const char*(gsize)> SlotSave;
 
   /** @throws TODO
    */
diff --git a/gtk/src/clipboard.hg b/gtk/src/clipboard.hg
index 66ca215..d047215 100644
--- a/gtk/src/clipboard.hg
+++ b/gtk/src/clipboard.hg
@@ -76,7 +76,7 @@ public:
   typedef sigc::slot<void(SelectionData&, guint)> SlotGet;
 
   /// For instance: void on_clear();
-  typedef sigc::slot<void> SlotClear;
+  typedef sigc::slot<void()> SlotClear;
 
  /** Virtually sets the contents of the specified clipboard by providing
   * a list of supported formats for the clipboard data and a function
diff --git a/gtk/src/container.ccg b/gtk/src/container.ccg
index 28aa4a6..2546c16 100644
--- a/gtk/src/container.ccg
+++ b/gtk/src/container.ccg
@@ -53,7 +53,7 @@ static void container_foreach_callback(GtkWidget* widget_gobj, void* data)
 static void Container_signal_remove_callback_normal(GtkContainer* self, GtkWidget* p0,void* data)
 {
   using namespace Gtk;
-  typedef sigc::slot< void,Widget* > SlotType;
+  typedef sigc::slot<void(Widget*)> 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/cssprovider.ccg b/gtk/src/cssprovider.ccg
index 665ef77..c540228 100644
--- a/gtk/src/cssprovider.ccg
+++ b/gtk/src/cssprovider.ccg
@@ -22,7 +22,7 @@ namespace
 static void CssProvider_signal_parsing_error_callback(GtkCssProvider* self, GtkCssSection* p0,const GError* 
p1,void* data)
 {
   using namespace Gtk;
-  typedef sigc::slot< void,const Glib::RefPtr<const CssSection>&,const Glib::Error& > SlotType;
+  typedef sigc::slot<void(const Glib::RefPtr<const CssSection>&,const Glib::Error&)> SlotType;
 
   auto obj = dynamic_cast<CssProvider*>(Glib::ObjectBase::_get_current_wrapper((GObject*) self));
   // Do not try to call a signal on a disassociated wrapper.
diff --git a/gtk/src/entrycompletion.ccg b/gtk/src/entrycompletion.ccg
index 1e7a052..892bde8 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/flowbox.hg b/gtk/src/flowbox.hg
index a17f021..a09242a 100644
--- a/gtk/src/flowbox.hg
+++ b/gtk/src/flowbox.hg
@@ -231,7 +231,7 @@ public:
    * @eturn A Gtk::Widget that represents @a item.
    */
   template <typename T_item>
-  using SlotCreateWidget = sigc::slot<Gtk::Widget*, const Glib::RefPtr<T_item>&>;
+  using SlotCreateWidget = sigc::slot<Gtk::Widget*(const Glib::RefPtr<T_item>&)>;
 
   /** Binds a Gio::ListModel.
    *
diff --git a/gtk/src/listbox.hg b/gtk/src/listbox.hg
index 87453e8..0409c29 100644
--- a/gtk/src/listbox.hg
+++ b/gtk/src/listbox.hg
@@ -264,7 +264,7 @@ public:
    * @eturn A Gtk::Widget that represents @a item.
    */
   template <typename T_item>
-  using SlotCreateWidget = sigc::slot<Gtk::Widget*, const Glib::RefPtr<T_item>&>;
+  using SlotCreateWidget = sigc::slot<Gtk::Widget*(const Glib::RefPtr<T_item>&)>;
 
   /** Binds a Gio::ListModel.
    *
diff --git a/gtk/src/printer.hg b/gtk/src/printer.hg
index 46822bf..615ac66 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 cf0379c..9e51a2f 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 7f8e6c8..9c973f8 100644
--- a/gtk/src/printoperation.hg
+++ b/gtk/src/printoperation.hg
@@ -218,7 +218,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/recentmanager.hg b/gtk/src/recentmanager.hg
index 5780d23..3a7d287 100644
--- a/gtk/src/recentmanager.hg
+++ b/gtk/src/recentmanager.hg
@@ -129,7 +129,7 @@ public:
 
   //TODO: Who needs this typedef? Remove when we can break API?
   /// For instance, void on_changed();
-  typedef sigc::slot<void> SlotChanged;
+  typedef sigc::slot<void()> SlotChanged;
 
   _WRAP_SIGNAL(void changed(), "changed")
 
diff --git a/gtk/src/toolbar.ccg b/gtk/src/toolbar.ccg
index 0805264..4292f5e 100644
--- a/gtk/src/toolbar.ccg
+++ b/gtk/src/toolbar.ccg
@@ -27,13 +27,13 @@
 namespace Gtk
 {
 
-void Toolbar::insert(ToolButton& item, int pos, const sigc::slot<void>& clicked_slot)
+void Toolbar::insert(ToolButton& item, int pos, const sigc::slot<void()>& clicked_slot)
 {
   item.signal_clicked().connect(clicked_slot);
   gtk_toolbar_insert(gobj(), (GtkToolItem*)((item).gobj()), pos);
 }
 
-void Toolbar::insert(ToggleToolButton& item, int pos, const sigc::slot<void>& toggled_slot)
+void Toolbar::insert(ToggleToolButton& item, int pos, const sigc::slot<void()>& toggled_slot)
 {
   item.signal_toggled().connect(toggled_slot);
   gtk_toolbar_insert(gobj(), (GtkToolItem*)((item).gobj()), pos);
@@ -44,13 +44,13 @@ void Toolbar::append(ToolItem& item)
   gtk_toolbar_insert(gobj(), (item).gobj(), -1 /* See GTK+ docs */);
 }
 
-void Toolbar::append(ToolButton& item, const sigc::slot<void>& clicked_slot)
+void Toolbar::append(ToolButton& item, const sigc::slot<void()>& clicked_slot)
 {
   item.signal_clicked().connect(clicked_slot);
   gtk_toolbar_insert(gobj(), (GtkToolItem*)((item).gobj()), -1 /* See GTK+ docs */);
 }
 
-void Toolbar::append(ToggleToolButton& item, const sigc::slot<void>& toggled_slot)
+void Toolbar::append(ToggleToolButton& item, const sigc::slot<void()>& toggled_slot)
 {
   item.signal_toggled().connect(toggled_slot);
   gtk_toolbar_insert(gobj(), (GtkToolItem*)((item).gobj()), -1 /* See GTK+ docs */);
@@ -61,13 +61,13 @@ void Toolbar::prepend(ToolItem& item)
   gtk_toolbar_insert(gobj(), (item).gobj(), 0 /* See GTK+ docs */);
 }
 
-void Toolbar::prepend(ToolButton& item, const sigc::slot<void>& clicked_slot)
+void Toolbar::prepend(ToolButton& item, const sigc::slot<void()>& clicked_slot)
 {
   item.signal_clicked().connect(clicked_slot);
   gtk_toolbar_insert(gobj(), (GtkToolItem*)((item).gobj()), 0 /* See GTK+ docs */);
 }
 
-void Toolbar::prepend(ToggleToolButton& item, const sigc::slot<void>& toggled_slot)
+void Toolbar::prepend(ToggleToolButton& item, const sigc::slot<void()>& toggled_slot)
 {
   item.signal_toggled().connect(toggled_slot);
   gtk_toolbar_insert(gobj(), (GtkToolItem*)((item).gobj()), 0 /* See GTK+ docs */);
diff --git a/gtk/src/toolbar.hg b/gtk/src/toolbar.hg
index 40e8a9b..c8962d9 100644
--- a/gtk/src/toolbar.hg
+++ b/gtk/src/toolbar.hg
@@ -47,16 +47,16 @@ public:
   _CTOR_DEFAULT()
 
   _WRAP_METHOD(void insert(ToolItem& item, int pos), gtk_toolbar_insert)
-  void insert(ToolButton& item, int pos, const sigc::slot<void>& clicked_slot);
-  void insert(ToggleToolButton& item, int pos, const sigc::slot<void>& toggled_slot);
+  void insert(ToolButton& item, int pos, const sigc::slot<void()>& clicked_slot);
+  void insert(ToggleToolButton& item, int pos, const sigc::slot<void()>& toggled_slot);
 
   void append(ToolItem& item);
-  void append(ToolButton& item, const sigc::slot<void>& clicked_slot);
-  void append(ToggleToolButton& item, const sigc::slot<void>& toggled_slot);
+  void append(ToolButton& item, const sigc::slot<void()>& clicked_slot);
+  void append(ToggleToolButton& item, const sigc::slot<void()>& toggled_slot);
 
   void prepend(ToolItem& item);
-  void prepend(ToolButton& item, const sigc::slot<void>& clicked_slot);
-  void prepend(ToggleToolButton& item, const sigc::slot<void>& toggled_slot);
+  void prepend(ToolButton& item, const sigc::slot<void()>& clicked_slot);
+  void prepend(ToggleToolButton& item, const sigc::slot<void()>& toggled_slot);
 
   _WRAP_METHOD(int get_item_index(const ToolItem& item) const, gtk_toolbar_get_item_index)
   _WRAP_METHOD(int get_n_items() const, gtk_toolbar_get_n_items)
diff --git a/gtk/src/widget.ccg b/gtk/src/widget.ccg
index 0e2de4e..30ac2ee 100644
--- a/gtk/src/widget.ccg
+++ b/gtk/src/widget.ccg
@@ -46,7 +46,7 @@ void Widget_signal_hide_callback(GObject* self, void* data)
     try
     {
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
-        (*static_cast<sigc::slot<void>*>(slot))();
+        (*static_cast<sigc::slot<void()>*>(slot))();
     }
     catch(...)
     {
@@ -60,7 +60,7 @@ void Widget_signal_hide_callback(GObject* self, void* data)
 static void Widget_signal_drag_data_get_callback(GtkWidget* self, GdkDragContext* p0,GtkSelectionData* 
p1,guint p2,guint p3,void* data)
 {
   using namespace Gtk;
-  typedef sigc::slot< void,const Glib::RefPtr<Gdk::DragContext>&,SelectionData&,guint,guint > SlotType;
+  typedef sigc::slot<void(const Glib::RefPtr<Gdk::DragContext>&,SelectionData&,guint,guint)> SlotType;
 
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
@@ -83,7 +83,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]