made use of new callback.h syntax

diff --git a/src/rxvt.h b/src/rxvt.h
index fe13899f83201672d53e3fdf87b3f93fb91bd38b..58d9326f3b4d0b7897208b24c835b27822801482 100644 (file)
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -775,8 +775,8 @@ enum {
 # define XPMClearArea(a, b, c, d, e, f, g)
 #endif
 
-typedef callback1<void, const char *> log_callback;
-typedef callback1<int, int> getfd_callback;
+typedef callback<void (const char *)> log_callback;
+typedef callback<int (int)> getfd_callback;
 
 #define SET_LOCALE(locale) rxvt_set_locale (locale)
 extern bool rxvt_set_locale (const char *locale) NOTHROW;

diff --git a/src/rxvttoolkit.h b/src/rxvttoolkit.h
index a15f6d2c49b11611bc46f697d089669ff6190a68..d6893f5182de12bd56785e84c574fb4da9958d74 100644 (file)
--- a/src/rxvttoolkit.h
+++ b/src/rxvttoolkit.h
@@ -1,4 +1,4 @@
-/*--------------------------------*-C-*---------------------------------*
+/*----------------------------------------------------------------------*
  * File:       rxvttoolkit.h - provide toolkit-functionality for rxvt.
  *----------------------------------------------------------------------*
  *
@@ -236,10 +236,10 @@ struct rxvt_display : refcounted {
 };
 
 #ifdef USE_XIM
-struct im_watcher : watcher, callback0<void> {
-  template<class O1, class O2>
-  im_watcher (O1 *object, void (O2::*method) ())
-  : callback0<void> (object,method)
+struct im_watcher : watcher, callback<void (void)> {
+  template<class O, class M>
+  im_watcher (O object, M method)
+  : callback<void (void)> (object, method)
   { }
 
   void start (rxvt_display *display)
@@ -253,12 +253,12 @@ struct im_watcher : watcher, callback0<void> {
 };
 #endif
 
-struct xevent_watcher : watcher, callback1<void, XEvent &> {
+struct xevent_watcher : watcher, callback<void (XEvent &)> {
   Window window;
 
-  template<class O1, class O2>
-  xevent_watcher (O1 *object, void (O2::*method) (XEvent &))
-  : callback1<void, XEvent &> (object,method)
+  template<class O, class M>
+  xevent_watcher (O object, M method)
+  : callback<void (XEvent &)> (object, method)
   { }
 
   void start (rxvt_display *display, Window window)