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

diff --git a/lib/widgets/qcomboview.cpp b/lib/widgets/qcomboview.cpp
index 793c52d2..68e940ae 100644
--- a/lib/widgets/qcomboview.cpp
+++ b/lib/widgets/qcomboview.cpp
@@ -133,13 +133,13 @@ static inline bool checkIndex( const char *method, const char * name,
     The input field can be edited if \a rw is TRUE, otherwise the user
     may only choose one of the items in the combobox.
 
-    The \a tqparent and \a name arguments are passed on to the TQWidget
+    The \a parent and \a name arguments are passed on to the TQWidget
     constructor.
 */
 
 
-QComboView::QComboView( bool rw, TQWidget *tqparent, const char *name )
-    : TQWidget( tqparent, name, WResizeNoErase )
+QComboView::QComboView( bool rw, TQWidget *parent, const char *name )
+    : TQWidget( parent, name, WResizeNoErase )
 {
     d = new QComboViewData( this );
     setUpListView();
@@ -1430,7 +1430,7 @@ void QComboView::setLineEdit( TQLineEdit *edit )
 
     d->ed = edit;
 
-    if ( TQT_BASE_OBJECT(edit->tqparent()) != TQT_BASE_OBJECT(this) ) {
+    if ( TQT_BASE_OBJECT(edit->parent()) != TQT_BASE_OBJECT(this) ) {
         edit->reparent( this, TQPoint(0,0), FALSE );
         edit->setFont( font() );
     }