1 files changed, 17 insertions, 19 deletions

diff --git a/comm/XtMultiplexer.cc b/comm/XtMultiplexer.cc
index fbd49b5..f20894d 100644
--- a/comm/XtMultiplexer.cc
+++ b/comm/XtMultiplexer.cc
@@ -16,15 +16,14 @@
 #include "XtMultiplexer.h"
 #include "error.h"
 
-UchXtMultiplexer :: UchXtMultiplexer ()
-: UchBaseMultiplexer ()
+IvlXtMultiplexer :: IvlXtMultiplexer ()
+: IvlBaseMultiplexer ()
 {
 	memset (ReadId, 0, NFILE * sizeof (XtInputId));
 	memset (WriteId, 0, NFILE * sizeof (XtInputId));
 }
 
-
-UchXtMultiplexer :: ~UchXtMultiplexer ()
+IvlXtMultiplexer :: ~IvlXtMultiplexer ()
 {
 }
 
@@ -32,21 +31,21 @@ UchXtMultiplexer :: ~UchXtMultiplexer ()
 static void
 inputCB (XtPointer client_data, int*, XtInputId*)
 {
-	UchChannel* chan = (UchChannel*) client_data;
+	IvlChannel* chan = (IvlChannel*) client_data;
 	chan->HandleRead ();
 }
 
 static void
 outputCB (XtPointer client_data, int*, XtInputId*)
 {
-	UchChannel* chan = (UchChannel*) client_data;
+	IvlChannel* chan = (IvlChannel*) client_data;
 	chan->HandleWrite ();
 }
 
 void
-UchXtMultiplexer :: SetMasks (int fd, IOMODE mode)
+IvlXtMultiplexer :: SetMasks (int fd, IOMODE mode)
 {
-	UchChannel* ch = Channels [fd];
+	IvlChannel* ch = Channels [fd];
 	if (!ch)
 		return;
 
@@ -78,42 +77,41 @@ UchXtMultiplexer :: SetMasks (int fd, IOMODE mode)
 }
 
 void
-UchXtMultiplexer :: FireTimers (void* mpx, XtIntervalId*)
+IvlXtMultiplexer :: FireTimers (void* mpx, XtIntervalId*)
 {
-	CcuCoreTimer::Fire (((UchXtMultiplexer*) mpx)->GetTimerSet ());
+	IvlCoreTimer::Fire (((IvlXtMultiplexer*) mpx)->GetTimerSet ());
 }
 
 void
-UchXtMultiplexer :: SetTimeOut (Millisecond delay)
+IvlXtMultiplexer :: SetTimeOut (Millisecond delay)
 {
 	/* should replace with XtAppAddTimeOut */
-	TimeOut = XtAddTimeOut (delay, &UchXtMultiplexer::FireTimers, this);
+	TimeOut = XtAddTimeOut (delay, &IvlXtMultiplexer::FireTimers, this);
 }
 
 void
-UchXtMultiplexer :: SuppressTimeOut ()
+IvlXtMultiplexer :: SuppressTimeOut ()
 {
 	XtRemoveTimeOut (TimeOut);
 	TimeOut = 0;
 }
 
 void
-UchXtMultiplexer :: FireSignals (void* mpx)
+IvlXtMultiplexer :: FireSignals (void* mpx)
 {
-	((UchXtMultiplexer*) mpx)->HandleDeferredSignals ();
+	((IvlXtMultiplexer*) mpx)->HandleDeferredSignals ();
 }
 
-
 void
-UchXtMultiplexer :: AddSignalHook ()
+IvlXtMultiplexer :: AddSignalHook ()
 {
 	/* should replace with XtAppAddWorkProc */
-	XtAddWorkProc ((XtWorkProc) (&UchXtMultiplexer::FireSignals), this);
+	XtAddWorkProc ((XtWorkProc) (&IvlXtMultiplexer::FireSignals), this);
 }
 		
 
 MPX_RES
-UchXtMultiplexer :: Loop ()
+IvlXtMultiplexer :: Loop ()
 {
 	XEvent event;
 	bool waiting = true;