diff options
author | christos <christos@pkgsrc.org> | 2003-09-30 23:03:59 +0000 |
---|---|---|
committer | christos <christos@pkgsrc.org> | 2003-09-30 23:03:59 +0000 |
commit | c9c2ea2a0a698f7b57c7d4438b50844698e4c11d (patch) | |
tree | 1ac13a211c4350b6bc8e29933929ce5199f6f030 | |
parent | 122f3dac0a77fea492ec0f8873cc1a8357ec0157 (diff) | |
download | pkgsrc-c9c2ea2a0a698f7b57c7d4438b50844698e4c11d.tar.gz |
g++-3.x compliance. std namespaces, etc.
-rw-r--r-- | sysutils/xosview/patches/patch-ae | 47 | ||||
-rw-r--r-- | sysutils/xosview/patches/patch-ai | 21 | ||||
-rw-r--r-- | sysutils/xosview/patches/patch-aj | 21 | ||||
-rw-r--r-- | sysutils/xosview/patches/patch-ak | 42 | ||||
-rw-r--r-- | sysutils/xosview/patches/patch-al | 32 | ||||
-rw-r--r-- | sysutils/xosview/patches/patch-am | 112 | ||||
-rw-r--r-- | sysutils/xosview/patches/patch-an | 28 | ||||
-rw-r--r-- | sysutils/xosview/patches/patch-ao | 62 | ||||
-rw-r--r-- | sysutils/xosview/patches/patch-aq | 169 |
9 files changed, 521 insertions, 13 deletions
diff --git a/sysutils/xosview/patches/patch-ae b/sysutils/xosview/patches/patch-ae index 770538f12d8..35382f0f7e7 100644 --- a/sysutils/xosview/patches/patch-ae +++ b/sysutils/xosview/patches/patch-ae @@ -1,14 +1,35 @@ -$NetBSD: patch-ae,v 1.7 2000/07/13 15:48:49 agc Exp $ +$NetBSD: patch-ae,v 1.8 2003/09/30 23:03:59 christos Exp $ -*** bsd/cpumeter.cc.orig Tue Feb 16 14:09:22 1999 ---- bsd/cpumeter.cc Thu Jul 13 16:19:09 2000 -*************** -*** 16,19 **** ---- 16,22 ---- - // - #include <sys/dkstat.h> // For CPUSTATES #define. BCG -+ #if defined(XOSVIEW_NETBSD) && !defined(CPUSTATES) -+ #include <sys/sched.h> -+ #endif - #include <stdlib.h> // For use of atoi BCG - #include "general.h" +--- bsd/cpumeter.cc.orig 1999-02-16 09:09:22.000000000 -0500 ++++ bsd/cpumeter.cc 2003-09-30 18:34:41.000000000 -0400 +@@ -15,6 +15,9 @@ + // $Id: patch-ae,v 1.8 2003/09/30 23:03:59 christos Exp $ + // + #include <sys/dkstat.h> // For CPUSTATES #define. BCG ++#if defined(XOSVIEW_NETBSD) && !defined(CPUSTATES) ++#include <sys/sched.h> ++#endif + #include <stdlib.h> // For use of atoi BCG + #include "general.h" + #include "cpumeter.h" +@@ -109,13 +112,13 @@ + static int firstTime = 1; + if (firstTime) { + fprintf(stderr, +-" Warning: the CPU tick counters are not changing. This could +-be due to running a kernel besides /netbsd (or the equivalent for FreeBSD). +- If this is the case, re-run xosview with the -N kernel-name option. +- If not, then this is a bug. Please send a message to +-bgrayson@ece.utexas.edu, in addition to any send-pr bug reports +-(or in lieu of -- it ought to get fixed faster if you contact me +-directly). Thanks!\n"); ++" Warning: The CPU tick counters are not changing. This could" ++" be due to running a kernel besides /netbsd (or the equivalent for FreeBSD)." ++" If this is the case, re-run xosview with the -N kernel-name option." ++" If not, then this is a bug. Please send a message to" ++" bgrayson@ece.utexas.edu, in addition to any send-pr bug reports" ++" (or in lieu of -- it ought to get fixed faster if you contact me" ++" directly). Thanks!\n"); + firstTime = 0; + } + } diff --git a/sysutils/xosview/patches/patch-ai b/sysutils/xosview/patches/patch-ai new file mode 100644 index 00000000000..f69068151dd --- /dev/null +++ b/sysutils/xosview/patches/patch-ai @@ -0,0 +1,21 @@ +$NetBSD: patch-ai,v 1.1 2003/09/30 23:03:59 christos Exp $ + +--- bsd/btrymeter.cc.orig 1999-02-16 09:09:22.000000000 -0500 ++++ bsd/btrymeter.cc 2003-09-30 18:39:27.000000000 -0400 +@@ -11,6 +11,7 @@ + // + #include "btrymeter.h" + #include "xosview.h" ++#include <iostream> + #include <fstream.h> + #include <stdlib.h> + +@@ -52,7 +53,7 @@ + int loadinfo = open(APMFILENAME, O_RDONLY, 0); + + if ( !loadinfo ){ +- cerr <<"Can not open file : " <<APMFILENAME <<endl; ++ std::cerr <<"Can not open file : " <<APMFILENAME << std::endl; + parent_->done(1); + return; + } diff --git a/sysutils/xosview/patches/patch-aj b/sysutils/xosview/patches/patch-aj new file mode 100644 index 00000000000..b5ff7736eb0 --- /dev/null +++ b/sysutils/xosview/patches/patch-aj @@ -0,0 +1,21 @@ +$NetBSD: patch-aj,v 1.1 2003/09/30 23:03:59 christos Exp $ + +--- bsd/loadmeter.cc.orig 1999-02-16 09:09:21.000000000 -0500 ++++ bsd/loadmeter.cc 2003-09-30 18:38:51.000000000 -0400 +@@ -15,6 +15,7 @@ + // + // $Id: patch-aj,v 1.1 2003/09/30 23:03:59 christos Exp $ + // ++#include <iostream> + #include <stdlib.h> // for getloadavg() + #include "general.h" + #include "loadmeter.h" +@@ -58,7 +59,7 @@ + // prevent this whole problem, the load meter can not be a decay + // meter. The load is a decaying average kind of thing anyway, + // so having a decaying load average is redundant. +- cerr << "Warning: The loadmeter can not be configured as a decay\n" ++ std::cerr << "Warning: The loadmeter can not be configured as a decay\n" + << " meter. See the source code (" << __FILE__ << ") for further\n" + << " details.\n"; + dodecay_ = 0; diff --git a/sysutils/xosview/patches/patch-ak b/sysutils/xosview/patches/patch-ak new file mode 100644 index 00000000000..7a64926bebd --- /dev/null +++ b/sysutils/xosview/patches/patch-ak @@ -0,0 +1,42 @@ +$NetBSD: patch-ak,v 1.1 2003/09/30 23:03:59 christos Exp $ + +--- Host.cc.orig 1999-02-16 09:08:34.000000000 -0500 ++++ Host.cc 2003-09-30 18:47:24.000000000 -0400 +@@ -168,7 +168,7 @@ + return false; + } + +-ostream &Host::print(ostream& os) const { ++std::ostream &Host::print(std::ostream& os) const { + /* Cast 'this' to a char*, so we don't need to create a Host::! operator.*/ + if (!*((char*)this)) + return os <<"Invalid Host. h_errno was = " <<_failure <<"\n"; +--- Host.h.orig 1999-02-16 09:08:34.000000000 -0500 ++++ Host.h 2003-09-30 18:47:52.000000000 -0400 +@@ -17,7 +17,7 @@ + #include <netinet/in.h> + #include <netdb.h> + #include <arpa/inet.h> +-#include <iostream.h> ++#include <iostream> + #include "bool.h" + + class Host { +@@ -66,7 +66,7 @@ + + // Should not use this under linux for the same reashon as the above + // function. +- ostream &print(ostream &os) const; ++ std::ostream &print(std::ostream &os) const; + + protected: + private: +@@ -84,7 +84,7 @@ + }; + + // Do not use this under linux until inet_ntoa() is fixed. +-inline ostream &operator<<(ostream &os, const Host& host) { ++inline std::ostream &operator<<(std::ostream &os, const Host& host) { + return host.print(os); + } + diff --git a/sysutils/xosview/patches/patch-al b/sysutils/xosview/patches/patch-al new file mode 100644 index 00000000000..6d2473fb9e1 --- /dev/null +++ b/sysutils/xosview/patches/patch-al @@ -0,0 +1,32 @@ +$NetBSD: patch-al,v 1.1 2003/09/30 23:03:59 christos Exp $ + +--- fieldmeter.cc.orig 1999-02-16 09:08:35.000000000 -0500 ++++ fieldmeter.cc 2003-09-30 18:42:06.000000000 -0400 +@@ -6,6 +6,7 @@ + // + // $Id: patch-al,v 1.1 2003/09/30 23:03:59 christos Exp $ + // ++#include <iostream> + #include <fstream.h> + #include <stdlib.h> + #include "snprintf.h" +@@ -294,14 +295,14 @@ + bool FieldMeter::checkX(int x, int width) const { + if ((x < x_) || (x + width < x_) + || (x > x_ + width_) || (x + width > x_ + width_)){ +- cerr << "FieldMeter::checkX() : bad horiz values for meter : " +- << name() << endl; ++ std::cerr << "FieldMeter::checkX() : bad horiz values for meter : " ++ << name() << std::endl; + +- cerr <<"value "<<x<<", width "<<width<<", total_ = "<<total_<<endl; ++ std::cerr <<"value "<<x<<", width "<<width<<", total_ = "<<total_<<std::endl; + + for (int i = 0 ; i < numfields_ ; i++) +- cerr <<"fields_[" <<i <<"] = " <<fields_[i] <<","; +- cerr <<endl; ++ std::cerr <<"fields_[" <<i <<"] = " <<fields_[i] <<","; ++ std::cerr <<std::endl; + + return false; + } diff --git a/sysutils/xosview/patches/patch-am b/sysutils/xosview/patches/patch-am new file mode 100644 index 00000000000..5dc2fa9f273 --- /dev/null +++ b/sysutils/xosview/patches/patch-am @@ -0,0 +1,112 @@ +$NetBSD: patch-am,v 1.1 2003/09/30 23:03:59 christos Exp $ + +--- Xrm.cc.orig 1999-02-16 09:08:35.000000000 -0500 ++++ Xrm.cc 2003-09-30 18:44:38.000000000 -0400 +@@ -11,10 +11,13 @@ + #include <stdlib.h> + #include <stdio.h> // For snprintf(). + #include <ctype.h> +-#include <iostream.h> ++#include <iostream> + #include <unistd.h> // for access(), etc. BCG + #include "snprintf.h" + #include "general.h" ++#ifndef NULL ++#define NULL 0 ++#endif + #include "Xrm.h" + #include "Xrmcommandline.h" + +@@ -29,7 +32,7 @@ + bool Xrm::_initialized = false; + + Xrm::Xrm(const char *instanceName, int argc, char **argv){ +- cerr << " Error: This constructor is not supported yet.\n"; ++ std::cerr << " Error: This constructor is not supported yet." << std::endl; + exit (-1); + _db = NULL; + _class = _instance = NULLQUARK; +@@ -114,7 +117,7 @@ + } + else + { +- cerr << "Error: Xrm:loadAndMergeResources() called twice!\n"; ++ std::cerr << "Error: Xrm:loadAndMergeResources() called twice!" << std::endl; + exit (-1); + } + // This is ugly code. According to X and Xt rules, many files need +@@ -218,14 +221,14 @@ + + + //------------ Some debugging functions follow. ----------------------- +-inline ostream &operator<<(ostream &os, const XrmBinding &b){ ++inline std::ostream &operator<<(std::ostream &os, const XrmBinding &b){ + switch (b){ + case XrmBindTightly: + return os << "."; + case XrmBindLoosely: + return os << "*"; + default: +- cerr <<"ostream operator<<(ostream &, const XrmBinding &) : " ++ std::cerr <<"std::ostream operator<<(std::ostream &, const XrmBinding &) : " + <<"Unknown XrmBinding!"; + return os; + } +@@ -233,7 +236,7 @@ + return os; + } + +-ostream &Xrm::dump(ostream &os) const { ++std::ostream &Xrm::dump(std::ostream &os) const { + os <<"--- Xrm --- class: " <<XrmQuarkToString(_class) + <<", instance: " <<XrmQuarkToString(_instance) <<"\n"; + +@@ -250,10 +253,10 @@ + XrmQuarkList quarks, XrmRepresentation *type, + XrmValue *value, XPointer closure) { + +- ostream *os = (ostream *)closure; ++ std::ostream *os = (std::ostream *)closure; + (void) type; // Avoid gcc warnings. + +- //cerr <<"type = " <<XrmQuarkToString(*type) <<endl; ++ //std::cerr <<"type = " <<XrmQuarkToString(*type) <<std::endl; + + int i = 0; + while (quarks[i] != NULLQUARK){ +--- Xrm.h.orig 1999-02-16 09:08:34.000000000 -0500 ++++ Xrm.h 2003-09-30 19:01:04.000000000 -0400 +@@ -10,14 +10,13 @@ + #define _Xrm_h + + #include "bool.h" ++#include <iostream> + + #define XRM_H_CVSID "$Id: patch-am,v 1.1 2003/09/30 23:03:59 christos Exp $" + + #include <X11/Xlib.h> + #include <X11/Xresource.h> + +-class ostream; +- + class Xrm { + public: + Xrm(const char *className, const char *instanceName); +@@ -31,7 +30,7 @@ + const char* getDisplayName (int argc, char** argv); + void loadAndMergeResources(int& argc, char** argv, Display* display); + +- ostream &dump(ostream &os) const; ++ std::ostream &dump(std::ostream &os) const; + + private: + XrmDatabase _db; +@@ -47,7 +46,7 @@ + static bool _initialized; + }; + +-inline ostream &operator<<(ostream &os, const Xrm &xrm){ ++inline std::ostream &operator<<(std::ostream &os, const Xrm &xrm){ + return xrm.dump(os); + } + diff --git a/sysutils/xosview/patches/patch-an b/sysutils/xosview/patches/patch-an new file mode 100644 index 00000000000..d1291ab04b0 --- /dev/null +++ b/sysutils/xosview/patches/patch-an @@ -0,0 +1,28 @@ +$NetBSD: patch-an,v 1.1 2003/09/30 23:03:59 christos Exp $ + +--- fieldmeterdecay.cc.orig 1999-02-16 09:08:35.000000000 -0500 ++++ fieldmeterdecay.cc 2003-09-30 18:46:03.000000000 -0400 +@@ -26,6 +26,7 @@ + // 4. Make the checkResources () function in the meter set the + // dodecay_ variable according to the, e.g., xosview*cpuDecay resource. + ++#include <iostream> + #include <fstream.h> + #include <math.h> // For fabs() + #include "general.h" +@@ -137,13 +138,13 @@ + // Let's correct for that here. + if ( manditory || (twidth != lastvals_[i]) || (x != lastx_[i]) ){ + if (!checkX(x, twidth)) +- cerr <<__FILE__ << ":" << __LINE__ <<endl; ++ std::cerr <<__FILE__ << ":" << __LINE__ <<std::endl; + parent_->drawFilledRectangle( x, y_, twidth, halfheight ); + } + + if ( manditory || (decay_[i] != lastDecayval_[i]) ){ + if (!checkX(decayx, decaytwidth)) +- cerr <<__FILE__ << ":" << __LINE__ <<endl; ++ std::cerr <<__FILE__ << ":" << __LINE__ <<std::endl; + parent_->drawFilledRectangle( decayx, y_+halfheight+1, + decaytwidth, height_ - halfheight-1); + } diff --git a/sysutils/xosview/patches/patch-ao b/sysutils/xosview/patches/patch-ao new file mode 100644 index 00000000000..93fe5516b36 --- /dev/null +++ b/sysutils/xosview/patches/patch-ao @@ -0,0 +1,62 @@ +$NetBSD: patch-ao,v 1.1 2003/09/30 23:03:59 christos Exp $ + +--- xosview.cc.orig 1999-02-16 09:08:34.000000000 -0500 ++++ xosview.cc 2003-09-30 18:41:24.000000000 -0400 +@@ -6,7 +6,7 @@ + // + // $Id: patch-ao,v 1.1 2003/09/30 23:03:59 christos Exp $ + // +-#include <iostream.h> ++#include <iostream> + #include <unistd.h> + #include <string.h> + #include <stdlib.h> +@@ -312,7 +312,7 @@ + { + switch (argv[0][1]) { + case 'v': +- cerr << versionString << endl; ++ std::cerr << versionString << std::endl; + exit(0); + case 'n': // Check for -name option that was already parsed + // and acted upon by main(). +@@ -335,12 +335,12 @@ + #endif + case '-': /* Check for --version argument. */ + if (!strncasecmp(*argv, "--version", 10)) { +- cerr << versionString << endl; ++ std::cerr << versionString << std::endl; + exit(0); + } + /* Fall through to default/error case. */ + default: +- cerr << "Ignoring unknown option '" << argv[0] << "'.\n"; ++ std::cerr << "Ignoring unknown option '" << argv[0] << "'.\n"; + break; + } + argc--; +@@ -355,19 +355,19 @@ + } + + void XOSView::visibilityEvent( XVisibilityEvent &event ){ +- //cerr <<"XOSView::visibilityEvent() : "; ++ //std::cerr <<"XOSView::visibilityEvent() : "; + if (event.state == VisibilityFullyObscured){ +- //cerr <<"hidden"; ++ //std::cerr <<"hidden"; + _isvisible = false; + } + else { +- //cerr <<"not hidden"; ++ //std::cerr <<"not hidden"; + _isvisible = true; + } +- //cerr <<endl; ++ //std::cerr <<std::endl; + } + + void XOSView::unmapEvent( XUnmapEvent & ){ +- //cerr <<"XOSView::unmapEvent()" <<endl; ++ //std::cerr <<"XOSView::unmapEvent()" <<std::endl; + _isvisible = false; + } diff --git a/sysutils/xosview/patches/patch-aq b/sysutils/xosview/patches/patch-aq new file mode 100644 index 00000000000..ba02deb34cc --- /dev/null +++ b/sysutils/xosview/patches/patch-aq @@ -0,0 +1,169 @@ +$NetBSD: patch-aq,v 1.1 2003/09/30 23:03:59 christos Exp $ + +--- xwin.cc.orig 1999-02-16 09:08:34.000000000 -0500 ++++ xwin.cc 2003-09-30 18:46:45.000000000 -0400 +@@ -3,6 +3,7 @@ + // + + #include <X11/Xatom.h> ++#include <iostream> + #include <stdlib.h> + #include <unistd.h> + #include "snprintf.h" +@@ -22,8 +23,8 @@ + //----------------------------------------------------------------------------- + + XWin::XWin( int argc, char *argv[], int x, int y, int width, int height ){ +- cerr << "This constructor call is not supported! (" << __FILE__ +- << ":" << __LINE__ << ")" << endl; ++ std::cerr << "This constructor call is not supported! (" << __FILE__ ++ << ":" << __LINE__ << ")" << std::endl; + exit (-1); + // FIXME BCG This constructor needs to do much of the work of the above + // one. Or, we need to drop this as a constructor. As it is, it is +@@ -134,7 +135,7 @@ + map(); + flush(); + if(XGetWindowAttributes(display_, window_, &attr_) == 0){ +- cerr <<"Error getting attributes of Main." <<endl; ++ std::cerr <<"Error getting attributes of Main." <<std::endl; + exit(2); + } + +@@ -154,8 +155,8 @@ + const char* fontName = getResource("font"); + + if ((font_ = XLoadQueryFont(display_, fontName)) == NULL){ +- cerr <<name_ <<": display " <<DisplayString(display_) +- <<" cannot load font " << fontName << endl; ++ std::cerr <<name_ <<": display " <<DisplayString(display_) ++ <<" cannot load font " << fontName << std::endl; + exit(1); + } + } +@@ -164,7 +165,7 @@ + void XWin::setHints( int argc, char *argv[] ){ + // Set up class hint + if((classhints_ = XAllocClassHint()) == NULL){ +- cerr <<"Error allocating class hint!" <<endl; ++ std::cerr <<"Error allocating class hint!" <<std::endl; + exit(1); + } + // We have to cast away the const's. +@@ -173,7 +174,7 @@ + + // Set up the window manager hints + if((wmhints_ = XAllocWMHints()) == NULL){ +- cerr <<"Error allocating Window Manager hints!" <<endl; ++ std::cerr <<"Error allocating Window Manager hints!" <<std::endl; + exit(1); + } + wmhints_->flags = (InputHint|StateHint); +@@ -182,11 +183,11 @@ + + // Set up XTextProperty for window name and icon name + if(XStringListToTextProperty(&name_, 1, &title_) == 0){ +- cerr <<"Error creating XTextProperty!" <<endl; ++ std::cerr <<"Error creating XTextProperty!" <<std::endl; + exit(1); + } + if(XStringListToTextProperty(&name_, 1, &iconname_) == 0){ +- cerr <<"Error creating XTextProperty!" <<endl; ++ std::cerr <<"Error creating XTextProperty!" <<std::endl; + exit(1); + } + +@@ -204,7 +205,7 @@ + void XWin::openDisplay( void ){ + // Open connection to display selected by user + if ((display_ = XOpenDisplay (display_name_)) == NULL) { +- cerr <<"Can't open display named " << display_name_ <<endl; ++ std::cerr <<"Can't open display named " << display_name_ <<std::endl; + exit(1); + } + +@@ -251,8 +252,8 @@ + pixmap_att.valuemask=XpmSize|XpmReturnPixels|XpmColormap|XpmCloseness; + if(XpmReadFileToPixmap(display_,DefaultRootWindow(display_),pixmap_file, pixmap, NULL, &pixmap_att)) + { +- cerr << "Pixmap " << pixmap_file << " not found" << endl; +- cerr << "Defaulting to blank" << endl; ++ std::cerr << "Pixmap " << pixmap_file << " not found" << std::endl; ++ std::cerr << "Defaulting to blank" << std::endl; + pixmap=NULL; + return 0; // OOps + } +@@ -261,7 +262,7 @@ + return 0; // No file specified, none used + #else + (void) pixmap; +- cerr << "Error: getPixmap called, when Xpm is not enabled!\n" ; ++ std::cerr << "Error: getPixmap called, when Xpm is not enabled!\n" ; + return 0; + #endif + } +@@ -273,7 +274,7 @@ + // Fill out a XsizeHints structure to inform the window manager + // of desired size and location of main window. + if((sizehints_ = XAllocSizeHints()) == NULL){ +- cerr <<"Error allocating size hints!" <<endl; ++ std::cerr <<"Error allocating size hints!" <<std::endl; + exit(1); + } + sizehints_->flags = PSize; +@@ -350,7 +351,7 @@ + #if 0 + void XWin::usage( void ){ + // FIXME We need to update this. BCG +- cerr <<name_ <<" [-display name] [-geometry geom]" <<endl; ++ std::cerr <<name_ <<" [-display name] [-geometry geom]" <<std::endl; + // exit (1); + } + #endif +@@ -386,7 +387,7 @@ + return retval; + else + { +- cerr << "Error: Couldn't find '" << name << "' resource in the resource database!\n"; ++ std::cerr << "Error: Couldn't find '" << name << "' resource in the resource database!\n"; + exit (-1); + /* Some compilers aren't smart enough to know that exit() exits. */ + return '\0'; +@@ -396,7 +397,7 @@ + //----------------------------------------------------------------------------- + + void XWin::dumpResources( ostream &os ){ +-cerr << "Function not implemented!\n"; // BCG FIXME Need to make this. ++std::cerr << "Function not implemented!\n"; // BCG FIXME Need to make this. + (void) os; // Keep gcc happy. + } + //----------------------------------------------------------------------------- +@@ -405,7 +406,7 @@ + XColor exact, closest; + + if ( XAllocNamedColor( display_, colormap(), name, &closest, &exact ) == 0 ) +- cerr <<"XWin::allocColor() : failed to alloc : " <<name <<endl; ++ std::cerr <<"XWin::allocColor() : failed to alloc : " <<name <<std::endl; + + return exact.pixel; + } +@@ -504,7 +505,7 @@ + mask_ = ResizeRedirectMask; + break; + default: +- cerr <<"XWin::Event::Event() : unknown event type : " <<event_ <<endl; ++ std::cerr <<"XWin::Event::Event() : unknown event type : " <<event_ <<std::endl; + mask_ = NoEventMask; + break; + } +--- xwin.h.orig 1999-02-16 09:08:35.000000000 -0500 ++++ xwin.h 2003-09-30 18:33:56.000000000 -0400 +@@ -105,7 +105,7 @@ + Event( XWin *parent, int event, EventCallBack callBack ); + virtual ~Event( void ){} + +- friend XWin; ++ friend class XWin; + + void callBack( XEvent &event ) + { if ( event.type == event_ ) (parent_->*callBack_)( event ); } |