From 03feb89582fc354acaeb1df65a687361a661486d Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: 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 --- khotkeys/kcontrol/action_list_widget.cpp | 2 +- khotkeys/kcontrol/actions_listview_widget.cpp | 4 ++-- khotkeys/kcontrol/condition_list_widget.cpp | 8 ++++---- khotkeys/kcontrol/windowdef_list_widget.cpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'khotkeys') diff --git a/khotkeys/kcontrol/action_list_widget.cpp b/khotkeys/kcontrol/action_list_widget.cpp index a2fedfdfb..95aa7db89 100644 --- a/khotkeys/kcontrol/action_list_widget.cpp +++ b/khotkeys/kcontrol/action_list_widget.cpp @@ -151,7 +151,7 @@ void Action_list_widget::copy_pressed() if ( !selected_item ) return; actions_listview->setSelected( create_listview_item( selected_item->action(), - selected_item->tqparent() ? NULL : actions_listview, selected_item->tqparent(), + selected_item->parent() ? NULL : actions_listview, selected_item->parent(), selected_item, true ), true ); } 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())) diff --git a/khotkeys/kcontrol/condition_list_widget.cpp b/khotkeys/kcontrol/condition_list_widget.cpp index b526d34ef..86ff8f47c 100644 --- a/khotkeys/kcontrol/condition_list_widget.cpp +++ b/khotkeys/kcontrol/condition_list_widget.cpp @@ -165,9 +165,9 @@ void Condition_list_widget::new_selected( int type_P ) parent = NULL; } } - if( parent == NULL && selected_item != NULL && selected_item->tqparent() != NULL ) + if( parent == NULL && selected_item != NULL && selected_item->parent() != NULL ) { - parent = static_cast< Condition_list_item* >( selected_item->tqparent()); + parent = static_cast< Condition_list_item* >( selected_item->parent()); after = selected_item; } Condition_list_base* parent_cond = parent @@ -217,8 +217,8 @@ void Condition_list_widget::copy_pressed() return; conditions_listview->setSelected( create_listview_item( selected_item->condition()->copy( selected_item->condition()->parent()), - selected_item->tqparent() ? NULL : conditions_listview, - static_cast< Condition_list_item* >( selected_item->tqparent()), + selected_item->parent() ? NULL : conditions_listview, + static_cast< Condition_list_item* >( selected_item->parent()), selected_item, true ), true ); } diff --git a/khotkeys/kcontrol/windowdef_list_widget.cpp b/khotkeys/kcontrol/windowdef_list_widget.cpp index 1533da6de..471aab743 100644 --- a/khotkeys/kcontrol/windowdef_list_widget.cpp +++ b/khotkeys/kcontrol/windowdef_list_widget.cpp @@ -134,7 +134,7 @@ void Windowdef_list_widget::new_selected( int type_P ) void Windowdef_list_widget::copy_pressed() { windows_listview->setSelected( create_listview_item( selected_item->window(), - selected_item->tqparent() ? NULL : windows_listview, selected_item->tqparent(), + selected_item->parent() ? NULL : windows_listview, selected_item->parent(), selected_item, true ), true ); } -- cgit v1.2.3