1 files changed, 17 insertions, 17 deletions

diff --git a/comm/TkMultiplexer.cc b/comm/TkMultiplexer.cc
index 28c76d3..7ce87a4 100644
--- a/comm/TkMultiplexer.cc
+++ b/comm/TkMultiplexer.cc
@@ -11,6 +11,7 @@
  *
  *	$Id$
  *	$CurLog$
+ *	Made consistent with Tcl7.0 and Tk3.3
  */
 
 #include "TkMultiplexer.h"
@@ -29,28 +30,27 @@ extern "C" {
 static void
 ioHandler (ClientData client_data, int mask)
 {
-	UchChannel* ch = (UchChannel*) client_data;
+	IvlChannel* ch = (IvlChannel*) client_data;
 	if (mask & TK_WRITABLE)
 		ch->HandleWrite ();
 	if (mask & TK_READABLE)
 		ch->HandleRead ();
 }
 
-UchTkMultiplexer :: UchTkMultiplexer ()
-: UchBaseMultiplexer ()
+IvlTkMultiplexer :: IvlTkMultiplexer ()
+: IvlBaseMultiplexer ()
 {
 	memset (Active, 0, NFILE * sizeof (bool));
 }
 
-
-UchTkMultiplexer :: ~UchTkMultiplexer ()
+IvlTkMultiplexer :: ~IvlTkMultiplexer ()
 {
 }
 
 void
-UchTkMultiplexer :: SetMasks (int fd, IOMODE mode)
+IvlTkMultiplexer :: SetMasks (int fd, IOMODE mode)
 {
-	UchChannel* ch = Channels [fd];
+	IvlChannel* ch = Channels [fd];
 	if (!ch)
 		return;
 
@@ -80,38 +80,38 @@ UchTkMultiplexer :: SetMasks (int fd, IOMODE mode)
 }
 
 void
-UchTkMultiplexer :: FireTimers (ClientData mpx)
+IvlTkMultiplexer :: FireTimers (ClientData mpx)
 {
-	CcuCoreTimer::Fire (((UchTkMultiplexer*) mpx)->GetTimerSet ());
+	IvlCoreTimer::Fire (((IvlTkMultiplexer*) mpx)->GetTimerSet ());
 }
 
 void
-UchTkMultiplexer :: SetTimeOut (Millisecond delay)
+IvlTkMultiplexer :: SetTimeOut (Millisecond delay)
 {
-	TimeOut = Tk_CreateTimerHandler (int (delay), &UchTkMultiplexer::FireTimers, (ClientData) this);
+	TimeOut = Tk_CreateTimerHandler (int (delay), &IvlTkMultiplexer::FireTimers, (ClientData) this);
 }
 
 void
-UchTkMultiplexer :: SuppressTimeOut ()
+IvlTkMultiplexer :: SuppressTimeOut ()
 {
 	Tk_DeleteTimerHandler (TimeOut);
 	TimeOut = 0;
 }
 
 void
-UchTkMultiplexer :: FireSignals (ClientData mpx)
+IvlTkMultiplexer :: FireSignals (ClientData mpx)
 {
-	((UchTkMultiplexer*) mpx)->HandleDeferredSignals ();
+	((IvlTkMultiplexer*) mpx)->HandleDeferredSignals ();
 }
 
 void
-UchTkMultiplexer :: AddSignalHook ()
+IvlTkMultiplexer :: AddSignalHook ()
 {
-	Tk_DoWhenIdle (&UchTkMultiplexer::FireSignals, (ClientData) this);
+	Tk_DoWhenIdle (&IvlTkMultiplexer::FireSignals, (ClientData) this);
 }
 		
 MPX_RES
-UchTkMultiplexer :: Loop ()
+IvlTkMultiplexer :: Loop ()
 {
 	Looping = true;