[glibmm] Examples: Use libsigc++ 2.9/10 and its slot/signal<R(Args...)> syntax.



commit a1740f7fe821c0a376005aa512fc8bbca4a6b1c3
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Mar 31 12:15:53 2016 +0200

    Examples: Use libsigc++ 2.9/10 and its slot/signal<R(Args...)> syntax.
    
    The older libsigc++ syntax is deprecated.

 configure.ac                          |    2 +-
 examples/iochannel_stream/fdstream.cc |    4 ++--
 examples/iochannel_stream/fdstream.h  |    4 ++--
 examples/thread/dispatcher.cc         |    6 +++---
 examples/thread/dispatcher2.cc        |    4 ++--
 tests/glibmm_refptr_sigc_bind/main.cc |    4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7245404..a0ccfd7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,7 @@ AS_IF([test "x$enable_static" = xyes],
 
 glibreq='2.0 >= 2.48.0'
 
-GLIBMM_MODULES="sigc++-2.0 >= 2.8.0 glib-$glibreq gobject-$glibreq gmodule-$glibreq"
+GLIBMM_MODULES="sigc++-2.0 >= 2.9.1 glib-$glibreq gobject-$glibreq gmodule-$glibreq"
 GIOMM_MODULES="$GLIBMM_MODULES gio-$glibreq"
 test "x$glibmm_host_windows" = xyes || GIOMM_MODULES="$GIOMM_MODULES gio-unix-$glibreq"
 
diff --git a/examples/iochannel_stream/fdstream.cc b/examples/iochannel_stream/fdstream.cc
index 1c4ff95..51b6c3e 100644
--- a/examples/iochannel_stream/fdstream.cc
+++ b/examples/iochannel_stream/fdstream.cc
@@ -66,7 +66,7 @@ fdstreambuf::detach_fd()
 
 void
 fdstreambuf::connect(
-  const sigc::slot<bool, Glib::IOCondition>& callback, Glib::IOCondition condition)
+  const sigc::slot<bool(Glib::IOCondition)>& callback, Glib::IOCondition condition)
 {
   Glib::signal_io().connect(callback, iochannel_, condition);
 }
@@ -315,7 +315,7 @@ fdstream::close()
 }
 
 void
-fdstream::connect(const sigc::slot<bool, Glib::IOCondition>& callback, Glib::IOCondition condition)
+fdstream::connect(const sigc::slot<bool(Glib::IOCondition)>& callback, Glib::IOCondition condition)
 {
   buf.connect(callback, condition);
 }
diff --git a/examples/iochannel_stream/fdstream.h b/examples/iochannel_stream/fdstream.h
index 824f96e..1928344 100644
--- a/examples/iochannel_stream/fdstream.h
+++ b/examples/iochannel_stream/fdstream.h
@@ -72,7 +72,7 @@ public:
   void create_iochannel(int fd, bool manage);
   void detach_fd();
   void close_iochannel();
-  void connect(const sigc::slot<bool, Glib::IOCondition>& callback, Glib::IOCondition condition);
+  void connect(const sigc::slot<bool(Glib::IOCondition)>& callback, Glib::IOCondition condition);
   fdstream_error get_error() const;
 
 protected:
@@ -106,7 +106,7 @@ public:
   void detach();
 
   void close();
-  void connect(const sigc::slot<bool, Glib::IOCondition>& callback, Glib::IOCondition condition);
+  void connect(const sigc::slot<bool(Glib::IOCondition)>& callback, Glib::IOCondition condition);
   fdstream_error get_error() const;
 
 private:
diff --git a/examples/thread/dispatcher.cc b/examples/thread/dispatcher.cc
index ae9e084..ecd18a7 100644
--- a/examples/thread/dispatcher.cc
+++ b/examples/thread/dispatcher.cc
@@ -38,7 +38,7 @@ public:
   void join();
   bool unfinished() const;
 
-  sigc::signal<void>& signal_finished();
+  sigc::signal<void()>& signal_finished();
 
 private:
   enum
@@ -53,7 +53,7 @@ private:
   int id_;
   unsigned int progress_;
   Glib::Dispatcher signal_increment_;
-  sigc::signal<void> signal_finished_;
+  sigc::signal<void()> signal_finished_;
 
   void progress_increment();
   void thread_function();
@@ -121,7 +121,7 @@ ThreadProgress::unfinished() const
   return (progress_ < ITERATIONS);
 }
 
-sigc::signal<void>&
+sigc::signal<void()>&
 ThreadProgress::signal_finished()
 {
   return signal_finished_;
diff --git a/examples/thread/dispatcher2.cc b/examples/thread/dispatcher2.cc
index dbe176c..d56c5e7 100644
--- a/examples/thread/dispatcher2.cc
+++ b/examples/thread/dispatcher2.cc
@@ -41,7 +41,7 @@ public:
   void signal_finished_emit();
   void print() const;
 
-  using type_signal_end = sigc::signal<void>;
+  using type_signal_end = sigc::signal<void()>;
   static type_signal_end& signal_end();
 
 private:
@@ -128,7 +128,7 @@ ThreadTimer::print() const
   std::cout << time_ << " seconds since start" << std::endl;
 }
 
-sigc::signal<void>&
+sigc::signal<void()>&
 ThreadTimer::signal_end()
 {
   return signal_end_;
diff --git a/tests/glibmm_refptr_sigc_bind/main.cc b/tests/glibmm_refptr_sigc_bind/main.cc
index 826b915..0ca5b94 100644
--- a/tests/glibmm_refptr_sigc_bind/main.cc
+++ b/tests/glibmm_refptr_sigc_bind/main.cc
@@ -22,10 +22,10 @@ public:
 
   void emit_sig1(int n) { sig1.emit(n); }
 
-  sigc::signal<void, int>& signal_sig1() { return sig1; }
+  sigc::signal<void(int)>& signal_sig1() { return sig1; }
 
 private:
-  sigc::signal<void, int> sig1;
+  sigc::signal<void(int)> sig1;
   int ref_count;
 };
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]