rename the following methods:

tqparent parent
tqmask mask

1 files changed, 9 insertions, 9 deletions

diff --git a/tqtinterface/qt4/src/widgets/tqcombobox.cpp b/tqtinterface/qt4/src/widgets/tqcombobox.cpp
index 382258b..f934485 100644
--- a/tqtinterface/qt4/src/widgets/tqcombobox.cpp
+++ b/tqtinterface/qt4/src/widgets/tqcombobox.cpp
@@ -342,8 +342,8 @@
 class TQComboBoxPopup : public TQPopupMenu
 {
 public:
-    TQComboBoxPopup( TQWidget *tqparent=0, const char *name=0 )
-	: TQPopupMenu( tqparent, name )
+    TQComboBoxPopup( TQWidget *parent=0, const char *name=0 )
+	: TQPopupMenu( parent, name )
     {
     }
 
@@ -499,7 +499,7 @@ static inline bool checkIndex( const char *method, const char * name,
 
 
 /*!
-    Constructs a combobox widget with tqparent \a tqparent called \a name.
+    Constructs a combobox widget with parent \a parent called \a name.
 
     This constructor creates a popup list if the program uses Motif
     (or Aqua) look and feel; this is compatible with Motif 1.x and
@@ -513,8 +513,8 @@ static inline bool checkIndex( const char *method, const char * name,
 
 
 
-TQComboBox::TQComboBox( TQWidget *tqparent, const char *name )
-    : TQWidget( tqparent, name, TQt::WNoAutoErase )
+TQComboBox::TQComboBox( TQWidget *parent, const char *name )
+    : TQWidget( parent, name, TQt::WNoAutoErase )
 {
     d = new TQComboBoxData( this );
     if ( tqstyle().tqstyleHint(TQStyle::SH_ComboBox_Popup, this) ||
@@ -556,13 +556,13 @@ TQComboBox::TQComboBox( TQWidget *tqparent, 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.
 */
 
 
-TQComboBox::TQComboBox( bool rw, TQWidget *tqparent, const char *name )
-    : TQWidget( tqparent, name, TQt::WNoAutoErase )
+TQComboBox::TQComboBox( bool rw, TQWidget *parent, const char *name )
+    : TQWidget( parent, name, TQt::WNoAutoErase )
 {
     d = new TQComboBoxData( this );
     setUpListBox();
@@ -2298,7 +2298,7 @@ void TQComboBox::setLineEdit( TQLineEdit *edit )
     delete d->ed;
     d->ed = edit;
 
-    if ( edit->tqparent() != TQT_TQOBJECT(this) )
+    if ( edit->parent() != TQT_TQOBJECT(this) )
 	edit->reparent( this, TQPoint(0,0), FALSE );
 
     connect (edit, TQT_SIGNAL( textChanged(const TQString&) ),