rename the following methods:

tqparent parent
tqmask mask

1 files changed, 15 insertions, 15 deletions

diff --git a/experimental/tqtinterface/qt4/src/kernel/tqapplication_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqapplication_x11.cpp
index 64a270475..f4e3bad23 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqapplication_x11.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqapplication_x11.cpp
@@ -332,7 +332,7 @@ static int xsync_errorbase;
 // modifier masks for alt/meta - detected when the application starts
 static long qt_alt_mask = 0;
 static long qt_meta_mask = 0;
-// modifier tqmask to remove mode switch from modifiers that have alt/meta set
+// modifier mask to remove mode switch from modifiers that have alt/meta set
 // this problem manifests itself on HP/UX 10.20 at least, and without it
 // modifiers do not work at all...
 static long qt_mode_switch_remove_mask = 0;
@@ -2909,7 +2909,7 @@ TQ_EXPORT bool qt_use_xrender = FALSE;
 // modifier masks for alt/meta - detected when the application starts
 static long qt_alt_mask = 0;
 static long qt_meta_mask = 0;
-// modifier tqmask to remove mode switch from modifiers that have alt/meta set
+// modifier mask to remove mode switch from modifiers that have alt/meta set
 // this problem manifests itself on HP/UX 10.20 at least, and without it
 // modifiers do not work at all...
 static long qt_mode_switch_remove_mask = 0;
@@ -5301,7 +5301,7 @@ void TQApplication::setMainWidget( TQWidget *mainWidget )
     if ( mainWidget && mainWidget->parentWidget() &&
 	 ! mainWidget->parentWidget()->isDesktop() )
 	qWarning( "TQApplication::setMainWidget(): New main widget (%s/%s) "
-		  "has a tqparent!",
+		  "has a parent!",
 		  mainWidget->className(), mainWidget->name() );
 #endif
     main_widget = mainWidget;
@@ -5531,7 +5531,7 @@ Window qt_x11_findClientWindow( Window win, Atom property, bool leaf )
     int	   format, i;
     ulong  nitems, after;
     uchar *data;
-    Window root, tqparent, target=0, *tqchildren=0;
+    Window root, parent, target=0, *tqchildren=0;
     uint   ntqchildren;
     if ( XGetWindowProperty( appDpy, win, property, 0, 0, FALSE, AnyPropertyType,
 			     &type, &format, &nitems, &after, &data ) == Success ) {
@@ -5540,7 +5540,7 @@ Window qt_x11_findClientWindow( Window win, Atom property, bool leaf )
 	if ( type )
 	    return win;
     }
-    if ( !XQueryTree(appDpy,win,&root,&tqparent,&tqchildren,&ntqchildren) ) {
+    if ( !XQueryTree(appDpy,win,&root,&parent,&tqchildren,&ntqchildren) ) {
 	if ( tqchildren )
 	    XFree( (char *)tqchildren );
 	return 0;
@@ -6251,17 +6251,17 @@ int TQApplication::x11ProcessEvent( XEvent* event )
 					ReparentNotify,
 					event ) )
 	    ;	// skip old reparent events
-	if ( event->xreparent.tqparent == TQPaintDevice::x11AppRootWindow() ) {
+	if ( event->xreparent.parent == TQPaintDevice::x11AppRootWindow() ) {
 	    if ( widget->isTopLevel() ) {
-		widget->topData()->parentWinId = event->xreparent.tqparent;
+		widget->topData()->parentWinId = event->xreparent.parent;
 		if ( qt_deferred_map_contains( widget ) ) {
 		    qt_deferred_map_take( widget );
 		    XMapWindow( appDpy, widget->winId() );
 		}
 	    }
 	} else
-	    // store the tqparent. Useful for many things, embedding for instance.
-	    widget->topData()->parentWinId = event->xreparent.tqparent;
+	    // store the parent. Useful for many things, embedding for instance.
+	    widget->topData()->parentWinId = event->xreparent.parent;
 	if ( widget->isTopLevel() ) {
 	    // the widget frame strut should also be invalidated
 	    widget->topData()->fleft = widget->topData()->fright =
@@ -6269,9 +6269,9 @@ int TQApplication::x11ProcessEvent( XEvent* event )
 
 	    if ( qt_focus_model != FocusModel_Unknown ) {
 		// toplevel reparented...
-		TQWidget *newtqparent = TQWidget::find( event->xreparent.tqparent );
-		if ( ! newtqparent || newtqparent->isDesktop() ) {
-		    // we dont' know about the new tqparent (or we've been
+		TQWidget *newparent = TQWidget::find( event->xreparent.parent );
+		if ( ! newparent || newparent->isDesktop() ) {
+		    // we dont' know about the new parent (or we've been
 		    // reparented to root), perhaps a window manager
 		    // has been (re)started?  reset the focus model to unknown
 		    qt_focus_model = FocusModel_Unknown;
@@ -6350,8 +6350,8 @@ bool TQApplication::x11EventFilter( XEvent * )
 /*****************************************************************************
   Modal widgets; Since Xlib has little support for this we roll our own
   modal widget mechanism.
-  A modal widget without a tqparent becomes application-modal.
-  A modal widget with a tqparent becomes modal to its tqparent and grandparents..
+  A modal widget without a parent becomes application-modal.
+  A modal widget with a parent becomes modal to its parent and grandparents..
 
   qt_enter_modal()
 	Enters modal state
@@ -7238,7 +7238,7 @@ bool TQETWidget::translatePropertyEvent(const XEvent *event)
 		    // WM_STATE property (ICCCM 4.1.3.1)
 		    XDeleteProperty(appDpy, winId(), qt_wm_state);
 
-		    // set the tqparent id to zero, so that show() will
+		    // set the parent id to zero, so that show() will
 		    // work again
 		    topData()->parentWinId = 0;
 		    // map the window if we were waiting for a