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, 18 insertions, 18 deletions

diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp
index 8ad20987..dbc2b932 100644
--- a/kdevdesigner/designer/mainwindow.cpp
+++ b/kdevdesigner/designer/mainwindow.cpp
@@ -931,8 +931,8 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 {
     if ( ::tqqt_cast<MenuBarEditor*>(o) || ::tqqt_cast<PopupMenuEditor*>(o) ||
 	 ( o &&
-	   ( ::tqqt_cast<MenuBarEditor*>(o->tqparent()) ||
-	     ::tqqt_cast<PopupMenuEditor*>(o->tqparent()) ) ) ) {
+	   ( ::tqqt_cast<MenuBarEditor*>(o->parent()) ||
+	     ::tqqt_cast<PopupMenuEditor*>(o->parent()) ) ) ) {
 
 	if ( e->type() == TQEvent::Accel && ::tqqt_cast<PopupMenuEditor*>(o) ) {
 	    return TRUE; // consume accel events
@@ -993,9 +993,9 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 	       ( ::tqqt_cast<TQComboBox*>(o) ||
 		 ::tqqt_cast<TQToolButton*>(o) ||
 		 ::tqqt_cast<QDesignerToolBarSeparator*>(o) ) &&
-	       o->tqparent()
-	       && ( ::tqqt_cast<QDesignerToolBar*>(o->tqparent())
-		   || ::tqqt_cast<QDesignerWidgetStack*>(o->tqparent())) ) ) {
+	       o->parent()
+	       && ( ::tqqt_cast<QDesignerToolBar*>(o->parent())
+		   || ::tqqt_cast<QDesignerWidgetStack*>(o->parent())) ) ) {
 	    TQWidget *w = (TQWidget*)o;
 	    if ( ::tqqt_cast<TQToolButton*>(w) ||
 		 ::tqqt_cast<TQComboBox*>(w) ||
@@ -1108,7 +1108,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 	     ::tqqt_cast<SizeHandle*>(o) ||
 	     ::tqqt_cast<OrderIndicator*>(o) ) {
 	    if ( ::tqqt_cast<TQToolButton*>(o) && ((TQToolButton*)o)->isOn() &&
-		 o->tqparent() && ::tqqt_cast<TQToolBar*>(o->tqparent()) && formWindow() )
+		 o->parent() && ::tqqt_cast<TQToolBar*>(o->parent()) && formWindow() )
 		formWindow()->setToolFixed();
 	    break;
 	}
@@ -1151,7 +1151,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 	     ::tqqt_cast<SizeHandle*>(o) ||
 	     ::tqqt_cast<OrderIndicator*>(o) )
 	    break;
-	if ( WidgetFactory::layoutType( (TQWidget*)o->tqparent() ) != WidgetFactory::NoLayout ) {
+	if ( WidgetFactory::layoutType( (TQWidget*)o->parent() ) != WidgetFactory::NoLayout ) {
 	    ( (FormWindow*)w )->updateSelection( (TQWidget*)o );
 	    if ( e->type() != TQEvent::Resize )
 		( (FormWindow*)w )->updateChildSelections( (TQWidget*)o );
@@ -1233,12 +1233,12 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 
 TQWidget *MainWindow::isAFormWindowChild( TQObject *o ) const
 {
-    if ( ::tqqt_cast<TQWizard*>(o->tqparent()) && !::tqqt_cast<TQPushButton*>(o) )
+    if ( ::tqqt_cast<TQWizard*>(o->parent()) && !::tqqt_cast<TQPushButton*>(o) )
 	return 0;
     while ( o ) {
 	if ( ::tqqt_cast<FormWindow*>(o) )
 	    return (TQWidget*)o;
-	o = o->tqparent();
+	o = o->parent();
     }
     return 0;
 }
@@ -1250,7 +1250,7 @@ TQWidget *MainWindow::isAToolBarChild( TQObject *o ) const
 	    return (TQWidget*)o;
 	if ( ::tqqt_cast<FormWindow*>(o) )
 	    return 0;
-	o = o->tqparent();
+	o = o->parent();
     }
     return 0;
 }
@@ -2261,7 +2261,7 @@ void MainWindow::readConfig()
 	if ( !ok ) {
 	    if ( oWindow ) {
 		oWindow->shuttingDown();
-		( (TQDockWindow*)oWindow->tqparent() )->hide();
+		( (TQDockWindow*)oWindow->parent() )->hide();
 	    }
 	    TQPixmap pix;
 	    pix.load( backPixName );
@@ -2418,7 +2418,7 @@ void MainWindow::readConfig()
     }
     if ( readPreviousConfig && oWindow ) {
 	oWindow->shuttingDown();
-	( (TQDockWindow*)oWindow->tqparent() )->hide();
+	( (TQDockWindow*)oWindow->parent() )->hide();
     }
 
     rebuildCustomWidgetGUI();
@@ -2449,9 +2449,9 @@ HierarchyView *MainWindow::objectHierarchy() const
     return hierarchyView;
 }
 
-TQPopupMenu *MainWindow::setupNormalHierarchyMenu( TQWidget *tqparent )
+TQPopupMenu *MainWindow::setupNormalHierarchyMenu( TQWidget *parent )
 {
-    TQPopupMenu *menu = new TQPopupMenu( tqparent );
+    TQPopupMenu *menu = new TQPopupMenu( parent );
 
     actionEditCut->addTo( menu );
     actionEditCopy->addTo( menu );
@@ -2461,12 +2461,12 @@ TQPopupMenu *MainWindow::setupNormalHierarchyMenu( TQWidget *tqparent )
     return menu;
 }
 
-TQPopupMenu *MainWindow::setupTabWidgetHierarchyMenu( TQWidget *tqparent, const char *addSlot, const char *removeSlot )
+TQPopupMenu *MainWindow::setupTabWidgetHierarchyMenu( TQWidget *parent, const char *addSlot, const char *removeSlot )
 {
-    TQPopupMenu *menu = new TQPopupMenu( tqparent );
+    TQPopupMenu *menu = new TQPopupMenu( parent );
 
-    menu->insertItem( i18n( "Add Page" ), tqparent, addSlot );
-    menu->insertItem( i18n( "Delete Page" ), tqparent, removeSlot );
+    menu->insertItem( i18n( "Add Page" ), parent, addSlot );
+    menu->insertItem( i18n( "Delete Page" ), parent, removeSlot );
     menu->insertSeparator();
     actionEditCut->addTo( menu );
     actionEditCopy->addTo( menu );