rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 16 insertions, 16 deletions

diff --git a/kdevdesigner/designer/formwindow.cpp b/kdevdesigner/designer/formwindow.cpp
index 6070b378..fbd7e1ad 100644
--- a/kdevdesigner/designer/formwindow.cpp
+++ b/kdevdesigner/designer/formwindow.cpp
@@ -134,8 +134,8 @@ static void flickerfree_update( TQWidget *w )
   event filter which is implemented in MainWindow::eventFilter().
 */
 
-FormWindow::FormWindow( FormFile *f, MainWindow *mw, TQWidget *tqparent, const char *name )
-    : TQWidget( tqparent, name, WDestructiveClose ), mainwindow( mw ),
+FormWindow::FormWindow( FormFile *f, MainWindow *mw, TQWidget *parent, const char *name )
+    : TQWidget( parent, name, WDestructiveClose ), mainwindow( mw ),
       commands( 100 ), pixInline( TRUE ), pixProject( FALSE )
 {
     ff = f;
@@ -143,8 +143,8 @@ FormWindow::FormWindow( FormFile *f, MainWindow *mw, TQWidget *tqparent, const c
     initSlots();
 }
 
-FormWindow::FormWindow( FormFile *f, TQWidget *tqparent, const char *name )
-    : TQWidget( tqparent, name, WDestructiveClose ), mainwindow( 0 ),
+FormWindow::FormWindow( FormFile *f, TQWidget *parent, const char *name )
+    : TQWidget( parent, name, WDestructiveClose ), mainwindow( 0 ),
       commands( 100 ), pixInline( TRUE )
 {
     ff = f;
@@ -261,16 +261,16 @@ void FormWindow::paintGrid( TQWidget *w, TQPaintEvent *e )
     if( !TQPixmapCache::find( grid_name, grid ) ) {
 	grid = TQPixmap( 350 + ( 350 % mainWindow()->grid().x() ), 350 + ( 350 % mainWindow()->grid().y() ) );
 	grid.fill( tqcolorGroup().color( TQColorGroup::Foreground ) );
-	TQBitmap tqmask( grid.width(), grid.height() );
-	tqmask.fill( color0 );
-	TQPainter p( &tqmask );
+	TQBitmap mask( grid.width(), grid.height() );
+	mask.fill( color0 );
+	TQPainter p( &mask );
 	p.setPen( color1 );
 	for ( int y = 0; y < grid.width(); y += mainWindow()->grid().y()) {
 	    for ( int x = 0; x < grid.height(); x += mainWindow()->grid().x() ) {
 		p.drawPoint( x, y );
 	    }
 	}
-	grid.setMask( tqmask );
+	grid.setMask( mask );
 	TQPixmapCache::insert( grid_name, grid );
     }
     TQPainter p( w );
@@ -455,7 +455,7 @@ void FormWindow::insertWidget()
                 np.append( pos );
             }
             
-            MoveCommand *mv = new MoveCommand( i18n( "Retqparent Widgets" ), this,
+            MoveCommand *mv = new MoveCommand( i18n( "Reparent Widgets" ), this,
                                                lst, op, np, insertParent, pw );
 
             if ( !toolFixed )
@@ -692,14 +692,14 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w )
 	break;
     default: // any insert widget tool
 	if ( e->button() == Qt::LeftButton ) {
-	    insertParent = WidgetFactory::containerOfWidget( mainContainer() ); // default tqparent for new widget is the formwindow
-	    if ( !isMainContainer( TQT_TQOBJECT(w) ) ) { // press was not on formwindow, check if we can find another tqparent
+	    insertParent = WidgetFactory::containerOfWidget( mainContainer() ); // default parent for new widget is the formwindow
+	    if ( !isMainContainer( TQT_TQOBJECT(w) ) ) { // press was not on formwindow, check if we can find another parent
 		TQWidget *wid = w;
 		for (;;) {
 		    int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(wid) ) );
 		    if ( ( WidgetDatabase::isContainer( id ) || wid == mainContainer() ) &&
 			 !::tqqt_cast<TQLayoutWidget*>(wid) && !::tqqt_cast<TQSplitter*>(wid) ) {
-			insertParent = WidgetFactory::containerOfWidget( wid ); // found another tqparent, store it
+			insertParent = WidgetFactory::containerOfWidget( wid ); // found another parent, store it
 			break;
 		    } else {
 			wid = wid->parentWidget();
@@ -807,7 +807,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
 		    checkSelectionsForMove( w );
 		}
 
-		// check whether we would have to reparent the selection and highlight the possible new tqparent container
+		// check whether we would have to reparent the selection and highlight the possible new parent container
 		TQMapConstIterator<TQWidget*, TQPoint> it = moving.begin();
 		TQWidget* wa = containerAt( e->globalPos(), it.key() );
 		if ( wa  && !isMainContainer( TQT_TQOBJECT(wa) ) && !isCentralWidget( TQT_TQOBJECT(wa) ) ) {
@@ -1633,7 +1633,7 @@ TQWidget *FormWindow::designerWidget( TQObject *o ) const
 	return 0;
     TQWidget *w = (TQWidget*)o;
     while ( w && !isMainContainer( TQT_TQOBJECT(w) ) && !insertedWidgets[ (void*)w ] || isCentralWidget( TQT_TQOBJECT(w) ) )
-	w = (TQWidget*)w->tqparent();
+	w = (TQWidget*)w->parent();
     return w;
 }
 
@@ -1966,12 +1966,12 @@ void FormWindow::raiseWidgets()
     commandHistory()->addCommand( cmd );
 }
 
-void FormWindow::paste( const TQString &cb, TQWidget *tqparent )
+void FormWindow::paste( const TQString &cb, TQWidget *parent )
 {
     CHECK_MAINWINDOW;
     Resource resource( mainWindow() );
     resource.setWidget( this );
-    resource.paste( cb, tqparent );
+    resource.paste( cb, parent );
 }
 
 void FormWindow::selectAll()