rename the following methods:

tqparent parent
tqmask mask

1 files changed, 15 insertions, 15 deletions

diff --git a/tqtinterface/qt4/extensions/nsplugin/src/qnp.cpp b/tqtinterface/qt4/extensions/nsplugin/src/qnp.cpp
index 5dc6684..1efb75b 100644
--- a/tqtinterface/qt4/extensions/nsplugin/src/qnp.cpp
+++ b/tqtinterface/qt4/extensions/nsplugin/src/qnp.cpp
@@ -1951,18 +1951,18 @@ void qnpxt_socknot_handler( XtPointer pointer, int *, XtInputId *id )
 
 void TQNPXt::registerSocketNotifier( TQSocketNotifier *notifier )
 {
-    XtInputMask tqmask;
+    XtInputMask mask;
     switch ( notifier->type() ) {
     case TQSocketNotifier::Read:
-	tqmask = XtInputReadMask;
+	mask = XtInputReadMask;
 	break;
 
     case TQSocketNotifier::Write:
-	tqmask = XtInputWriteMask;
+	mask = XtInputWriteMask;
 	break;
 
     case TQSocketNotifier::Exception:
-	tqmask = XtInputExceptMask;
+	mask = XtInputExceptMask;
 	break;
 
     default:
@@ -1971,7 +1971,7 @@ void TQNPXt::registerSocketNotifier( TQSocketNotifier *notifier )
     }
 
     XtInputId id = XtAppAddInput( d->appContext,
-				  notifier->socket(), (XtPointer) tqmask,
+				  notifier->socket(), (XtPointer) mask,
 				  qnpxt_socknot_handler, this );
     d->socknotDict.insert( id, notifier );
 
@@ -2035,23 +2035,23 @@ bool TQNPXt::processEvents( ProcessEventsFlags flags )
 
     qnpxt_keep_alive();
 
-    // get the pending event tqmask from Xt and process the next event
-    XtInputMask pendingtqmask = XtAppPending( d->appContext );
-    XtInputMask tqmask = pendingtqmask;
-    if ( pendingtqmask & XtIMTimer ) {
-	tqmask &= ~XtIMTimer;
+    // get the pending event mask from Xt and process the next event
+    XtInputMask pendingmask = XtAppPending( d->appContext );
+    XtInputMask mask = pendingmask;
+    if ( pendingmask & XtIMTimer ) {
+	mask &= ~XtIMTimer;
 	// zero timers will starve the Xt X event dispatcher... so
 	// process something *instead* of a timer first...
-	if ( tqmask != 0 )
-	    XtAppProcessEvent( d->appContext, tqmask );
+	if ( mask != 0 )
+	    XtAppProcessEvent( d->appContext, mask );
 	// and process a timer afterwards
-	tqmask = pendingtqmask & XtIMTimer;
+	mask = pendingmask & XtIMTimer;
     }
 
     if ( canWait )
 	XtAppProcessEvent( d->appContext, XtIMAll );
     else
-	XtAppProcessEvent( d->appContext, tqmask );
+	XtAppProcessEvent( d->appContext, mask );
 
     int nevents = 0;
     if ( ! ( flags & ExcludeSocketNotifiers ) ) {
@@ -2064,7 +2064,7 @@ bool TQNPXt::processEvents( ProcessEventsFlags flags )
     }
     d->activate_timers = FALSE;
 
-    return ( canWait || ( pendingtqmask != 0 ) || nevents > 0 );
+    return ( canWait || ( pendingmask != 0 ) || nevents > 0 );
 }