minor example code cleanup

3 files changed, 15 insertions, 10 deletions

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 657b11dd..1eccdfab 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,5 +1,4 @@
-example_dirs = \
-markup 
+example_dirs = markup thread
 
 # These use gtkmm stuff:
 # thread
diff --git a/examples/thread/dispatcher.cc b/examples/thread/dispatcher.cc
index 27a262ae..3971be8c 100644
--- a/examples/thread/dispatcher.cc
+++ b/examples/thread/dispatcher.cc
@@ -27,13 +27,15 @@ public:
   virtual ~ThreadProgress();
 
   void launch();
-  SigC::Signal1<void, ThreadProgress*>& signal_finished();
+
+  typedef SigC::Signal1<void, ThreadProgress*> type_signal_finished;
+  type_signal_finished& signal_finished();
   int id() const;
 
 private:
   unsigned int        progress_;
   Glib::Dispatcher    signal_increment_;
-  SigC::Signal1<void, ThreadProgress*>	signal_finished_;
+  type_signal_finished signal_finished_;
   int                 id_;
   Glib::Mutex&        cout_mutex_;
 
@@ -41,6 +43,7 @@ private:
   void thread_function();
 };
 
+//TODO: Rename to avoid confusion with Glib::Dispatcher.
 class Dispatcher : public SigC::Object
 {
 public:
@@ -74,7 +77,7 @@ void ThreadProgress::launch()
   Glib::Thread::create(SigC::slot_class(*this, &ThreadProgress::thread_function), false);
 }
 
-SigC::Signal1<void, ThreadProgress*>& ThreadProgress::signal_finished()
+ThreadProgress::type_signal_finished& ThreadProgress::signal_finished()
 {
   return signal_finished_;
 }
@@ -109,7 +112,7 @@ void ThreadProgress::thread_function()
     Glib::usleep(usecs);
 
     // Tell the thread to increment the progress value.
-    signal_increment_();
+    signal_increment_.emit();
   }
 }
 
diff --git a/examples/thread/dispatcher2.cc b/examples/thread/dispatcher2.cc
index 0174fe64..70e65ab5 100644
--- a/examples/thread/dispatcher2.cc
+++ b/examples/thread/dispatcher2.cc
@@ -39,7 +39,9 @@ public:
   void launch();
   void signal_finished_emit();
   void print() const;
-  static SigC::Signal0<void>& signal_end();
+
+  typedef SigC::Signal0<void> type_signal_end;
+  static type_signal_end& signal_end();
 
 private:
   unsigned int      time_;
@@ -50,7 +52,7 @@ private:
   Glib::Cond        startup_cond_;
   Glib::Thread*     thread_;
   
-  static SigC::Signal0<void> signal_end_;
+  static type_signal_end signal_end_;
 
   void timer_increment();
   bool timeout_handler();
@@ -58,6 +60,7 @@ private:
   void thread_function();
 };
 
+//TODO: Rename to avoid confusion with Glib::Dispatcher. murrayc
 class Dispatcher : public SigC::Object
 {
 public:
@@ -182,8 +185,8 @@ void ThreadTimer::thread_function()
   mainloop->run();
 }
 
-// static
-SigC::Signal0<void> ThreadTimer::signal_end_;
+// initialize static member:
+ThreadTimer::type_signal_end ThreadTimer::signal_end_;
 
 Dispatcher::Dispatcher()
 :