rename the following methods:

tqparent parent
tqmask mask


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

1 files changed, 2 insertions, 2 deletions

diff --git a/khotkeys/kcontrol/actions_listview_widget.cpp b/khotkeys/kcontrol/actions_listview_widget.cpp
index cd61e2ae6..5048289df 100644
--- a/khotkeys/kcontrol/actions_listview_widget.cpp
+++ b/khotkeys/kcontrol/actions_listview_widget.cpp
@@ -92,7 +92,7 @@ void Actions_listview_widget::new_action( Action_data_base* data_P )
         if( dynamic_cast< Action_data_group* >( current_action()->data()) != NULL )
             parent = current_action();
         else
-            parent = current_action()->tqparent();
+            parent = current_action()->parent();
         }
     if( parent )
         parent->setOpen( true );
@@ -124,7 +124,7 @@ void Actions_listview_widget::delete_action()
 void Actions_listview_widget::item_moved( TQListViewItem* item_P, TQListViewItem*, TQListViewItem* )
     {
     Action_listview_item* item = static_cast< Action_listview_item* >( item_P );
-    Action_listview_item* parent = static_cast< Action_listview_item* >( item->tqparent());
+    Action_listview_item* parent = static_cast< Action_listview_item* >( item->parent());
     if( parent == NULL )
         item->data()->reparent( module->actions_root());
     else if( Action_data_group* group = dynamic_cast< Action_data_group* >( parent->data()))