rename the following methods:

tqparent parent
tqmask mask

1 files changed, 14 insertions, 14 deletions

diff --git a/tqtinterface/qt4/src/kernel/tqdnd_x11.cpp b/tqtinterface/qt4/src/kernel/tqdnd_x11.cpp
index 471df70..6292a07 100644
--- a/tqtinterface/qt4/src/kernel/tqdnd_x11.cpp
+++ b/tqtinterface/qt4/src/kernel/tqdnd_x11.cpp
@@ -270,7 +270,7 @@ public:
 
     void setPixmap(TQPixmap pm, TQPoint hot)
     {
-	int bmser = pm.tqmask() ? pm.tqmask()->serialNumber() : 0;
+	int bmser = pm.mask() ? pm.mask()->serialNumber() : 0;
 	if( oldpmser == pm.serialNumber() && oldbmser == bmser
 	    && oldhot == hot )
 	    return;
@@ -283,17 +283,17 @@ public:
 // of finding this pixmap, and therefore there won't be needed any (slow) search for the window
 // using findRealWindow()
 	if( hotspot_in ) {
-	    TQBitmap tqmask = pm.tqmask() ? *pm.tqmask() : TQBitmap( pm.width(), pm.height());
-	    if( !pm.tqmask())
-		tqmask.fill( TQt::color1 );
-	    TQPainter p( &tqmask );
+	    TQBitmap mask = pm.mask() ? *pm.mask() : TQBitmap( pm.width(), pm.height());
+	    if( !pm.mask())
+		mask.fill( TQt::color1 );
+	    TQPainter p( &mask );
 	    p.setPen( TQt::color0 );
 	    p.drawPoint( hot.x(), hot.y());
 	    p.end();
-    	    pm.setMask( tqmask );
-    	    setMask( tqmask );
-	} else if ( pm.tqmask() ) {
-	    setMask( *pm.tqmask() );
+    	    pm.setMask( mask );
+    	    setMask( mask );
+	} else if ( pm.mask() ) {
+	    setMask( *pm.mask() );
 	} else {
 	    clearMask();
 	}
@@ -913,10 +913,10 @@ void TQDragManager::timerEvent( TQTimerEvent* e )
         if( need_modifiers_check ) {
             Window root, child;
             int root_x, root_y, win_x, win_y;
-            unsigned int tqmask;
+            unsigned int mask;
             XQueryPointer( qt_xdisplay(), qt_xrootwin( qt_xdnd_current_screen ),
-                &root, &child, &root_x, &root_y, &win_x, &win_y, &tqmask );
-            if( updateMode( (ButtonState)qt_x11_translateButtonState( tqmask )))
+                &root, &child, &root_x, &root_y, &win_x, &win_y, &mask );
+            if( updateMode( (ButtonState)qt_x11_translateButtonState( mask )))
                 qt_xdnd_source_sameanswer = TQRect(); // force move
         }
         need_modifiers_check = TRUE;
@@ -1737,7 +1737,7 @@ const char* TQDropEvent::format( int n ) const
 
 bool TQDragManager::drag( TQDragObject * o, TQDragObject::DragMode mode )
 {
-    if ( object == o || !o || !o->tqparent() )
+    if ( object == o || !o || !o->parent() )
 	return FALSE;
 
     if ( object ) {
@@ -1781,7 +1781,7 @@ bool TQDragManager::drag( TQDragObject * o, TQDragObject::DragMode mode )
     object = o;
     updatePixmap();
 
-    dragSource = (TQWidget *)(object->tqparent());
+    dragSource = (TQWidget *)(object->parent());
 
     qt_xdnd_deco->x11SetWindowTransient( dragSource->tqtopLevelWidget());
     tqApp->installEventFilter( this );