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

diff --git a/kdevdesigner/designer/actioneditorimpl.cpp b/kdevdesigner/designer/actioneditorimpl.cpp
index 67cb0bdf..84514875 100644
--- a/kdevdesigner/designer/actioneditorimpl.cpp
+++ b/kdevdesigner/designer/actioneditorimpl.cpp
@@ -45,8 +45,8 @@
 
 #include <klocale.h>
 
-ActionEditor::ActionEditor( TQWidget* tqparent,  const char* name, WFlags fl )
-    : ActionEditorBase( tqparent, name, fl ), currentAction( 0 ), formWindow( 0 ),
+ActionEditor::ActionEditor( TQWidget* parent,  const char* name, WFlags fl )
+    : ActionEditorBase( parent, name, fl ), currentAction( 0 ), formWindow( 0 ),
     explicitlyClosed(false)
 {
     listActions->addColumn( i18n( "Actions" ) );
@@ -150,7 +150,7 @@ void ActionEditor::newAction()
     ActionItem *actionParent = (ActionItem*)listActions->selectedItem();
     if ( actionParent ) {
 	if ( !::tqqt_cast<TQActionGroup*>(actionParent->actionGroup()) )
-	    actionParent = (ActionItem*)actionParent->tqparent();
+	    actionParent = (ActionItem*)actionParent->parent();
     }
 
     ActionItem *i = 0;
@@ -186,7 +186,7 @@ void ActionEditor::newActionGroup()
     ActionItem *actionParent = (ActionItem*)listActions->selectedItem();
     if ( actionParent ) {
 	if ( !::tqqt_cast<TQActionGroup*>(actionParent->actionGroup()) )
-	    actionParent = (ActionItem*)actionParent->tqparent();
+	    actionParent = (ActionItem*)actionParent->parent();
     }
 
     ActionItem *i = 0;
@@ -231,7 +231,7 @@ void ActionEditor::setFormWindow( FormWindow *fw )
 	setEnabled( TRUE );
 	for ( TQAction *a = formWindow->actionList().first(); a; a = formWindow->actionList().next() ) {
 	    ActionItem *i = 0;
-	    if ( ::tqqt_cast<TQAction*>(a->tqparent()) )
+	    if ( ::tqqt_cast<TQAction*>(a->parent()) )
 		continue;
 	    i = new ActionItem( listActions, a );
 	    i->setText( 0, a->name() );