rename the following methods:

tqparent parent
tqmask mask

9 files changed, 41 insertions, 41 deletions

diff --git a/tqtinterface/qt4/src/network/tqdns.cpp b/tqtinterface/qt4/src/network/tqdns.cpp
index 898ac43..4ba3a85 100644
--- a/tqtinterface/qt4/src/network/tqdns.cpp
+++ b/tqtinterface/qt4/src/network/tqdns.cpp
@@ -4166,8 +4166,8 @@ void TQDnsDomain::sweep( TQ_UINT32 thisSweep )
 // so I can subclass and reimplement the Q_SLOTS.
 
 
-TQDnsSocket::TQDnsSocket( TQObject * tqparent, const char * name )
-    : TQObject( tqparent, name )
+TQDnsSocket::TQDnsSocket( TQObject * parent, const char * name )
+    : TQObject( parent, name )
 {
     // nothing
 }
diff --git a/tqtinterface/qt4/src/network/tqftp.cpp b/tqtinterface/qt4/src/network/tqftp.cpp
index 7b6acdd..78f1ce8 100644
--- a/tqtinterface/qt4/src/network/tqftp.cpp
+++ b/tqtinterface/qt4/src/network/tqftp.cpp
@@ -76,7 +76,7 @@ public:
 	CsConnectionRefused
     };
 
-    TQFtpDTP( TQFtpPI *p, TQObject *tqparent=0, const char *name=0 );
+    TQFtpDTP( TQFtpPI *p, TQObject *parent=0, const char *name=0 );
 
     void setData( TQByteArray * );
     void setDevice( TQIODevice * );
@@ -163,7 +163,7 @@ class TQFtpPI : public TQObject
     TQ_OBJECT
 
 public:
-    TQFtpPI( TQObject *tqparent = 0 );
+    TQFtpPI( TQObject *parent = 0 );
 
     void connectToHost( const TQString &host, TQ_UINT16 port );
 
@@ -291,8 +291,8 @@ TQFtpCommand::~TQFtpCommand()
  * TQFtpDTP implemenatation
  *
  *********************************************************************/
-TQFtpDTP::TQFtpDTP( TQFtpPI *p, TQObject *tqparent, const char *name ) :
-    TQObject( tqparent, name ),
+TQFtpDTP::TQFtpDTP( TQFtpPI *p, TQObject *parent, const char *name ) :
+    TQObject( parent, name ),
     socket( 0, "TQFtpDTP_socket" ),
     pi( p ),
     callWriteData( FALSE )
@@ -629,8 +629,8 @@ void TQFtpDTP::socketBytesWritten( int bytes )
  * TQFtpPI implemenatation
  *
  *********************************************************************/
-TQFtpPI::TQFtpPI( TQObject *tqparent ) :
-    TQObject( tqparent ),
+TQFtpPI::TQFtpPI( TQObject *parent ) :
+    TQObject( parent ),
     rawCommand(FALSE),
     dtp( this ),
     commandSocket( 0, "TQFtpPI_socket" ),
@@ -1125,7 +1125,7 @@ static void delete_d( const TQFtp* foo )
     simply achieved:
 
     \code
-    TQFtp *ftp = new TQFtp( this ); // this is an optional TQObject tqparent
+    TQFtp *ftp = new TQFtp( this ); // this is an optional TQObject parent
     ftp->connectToHost( "ftp.trolltech.com" );
     ftp->login();
     \endcode
@@ -1237,13 +1237,13 @@ TQFtp::TQFtp() : TQNetworkProtocol()
 }
 
 /*!
-    Constructs a TQFtp object. The \a tqparent and \a name parameters
+    Constructs a TQFtp object. The \a parent and \a name parameters
     are passed to the TQObject constructor.
 */
-TQFtp::TQFtp( TQObject *tqparent, const char *name ) : TQNetworkProtocol()
+TQFtp::TQFtp( TQObject *parent, const char *name ) : TQNetworkProtocol()
 {
-    if ( tqparent )
-	tqparent->insertChild( this );
+    if ( parent )
+	parent->insertChild( this );
     TQT_TQOBJECT(this)->setName( name );
     init();
 }
diff --git a/tqtinterface/qt4/src/network/tqftp.h b/tqtinterface/qt4/src/network/tqftp.h
index ee49afc..afa7461 100644
--- a/tqtinterface/qt4/src/network/tqftp.h
+++ b/tqtinterface/qt4/src/network/tqftp.h
@@ -67,7 +67,7 @@ class TQM_EXPORT_FTP TQFtp : public TQNetworkProtocol
 
 public:
     TQFtp(); // ### TQt 4.0: get rid of this overload
-    TQFtp( TQObject *tqparent, const char *name=0 );
+    TQFtp( TQObject *parent, const char *name=0 );
     virtual ~TQFtp();
 
     int supportedOperations() const;
diff --git a/tqtinterface/qt4/src/network/tqhttp.cpp b/tqtinterface/qt4/src/network/tqhttp.cpp
index 53cdbeb..6b1f061 100644
--- a/tqtinterface/qt4/src/network/tqhttp.cpp
+++ b/tqtinterface/qt4/src/network/tqhttp.cpp
@@ -1189,13 +1189,13 @@ TQHttp::TQHttp()
 }
 
 /*!
-    Constructs a TQHttp object. The parameters \a tqparent and \a name
+    Constructs a TQHttp object. The parameters \a parent and \a name
     are passed on to the TQObject constructor.
 */
-TQHttp::TQHttp( TQObject* tqparent, const char* name )
+TQHttp::TQHttp( TQObject* parent, const char* name )
 {
-    if ( tqparent )
-	tqparent->insertChild( this );
+    if ( parent )
+	parent->insertChild( this );
     setName( name );
     init();
 }
@@ -1203,15 +1203,15 @@ TQHttp::TQHttp( TQObject* tqparent, const char* name )
 /*!
     Constructs a TQHttp object. Subsequent requests are done by
     connecting to the server \a hostname on port \a port. The
-    parameters \a tqparent and \a name are passed on to the TQObject
+    parameters \a parent and \a name are passed on to the TQObject
     constructor.
 
     \sa setHost()
 */
-TQHttp::TQHttp( const TQString &hostname, TQ_UINT16 port, TQObject* tqparent, const char* name )
+TQHttp::TQHttp( const TQString &hostname, TQ_UINT16 port, TQObject* parent, const char* name )
 {
-    if ( tqparent )
-	tqparent->insertChild( this );
+    if ( parent )
+	parent->insertChild( this );
     setName( name );
     init();
 
diff --git a/tqtinterface/qt4/src/network/tqhttp.h b/tqtinterface/qt4/src/network/tqhttp.h
index 37ab916..fb20d4f 100644
--- a/tqtinterface/qt4/src/network/tqhttp.h
+++ b/tqtinterface/qt4/src/network/tqhttp.h
@@ -173,8 +173,8 @@ class TQM_EXPORT_HTTP TQHttp : public TQNetworkProtocol
 
 public:
     TQHttp();
-    TQHttp( TQObject* tqparent, const char* name = 0 ); // ### TQt 4.0: make tqparent=0 and get rid of the TQHttp() constructor
-    TQHttp( const TQString &hostname, TQ_UINT16 port=80, TQObject* tqparent=0, const char* name = 0 );
+    TQHttp( TQObject* parent, const char* name = 0 ); // ### TQt 4.0: make parent=0 and get rid of the TQHttp() constructor
+    TQHttp( const TQString &hostname, TQ_UINT16 port=80, TQObject* parent=0, const char* name = 0 );
     virtual ~TQHttp();
 
     int supportedOperations() const;
diff --git a/tqtinterface/qt4/src/network/tqserversocket.cpp b/tqtinterface/qt4/src/network/tqserversocket.cpp
index bd067b1..02a15b0 100644
--- a/tqtinterface/qt4/src/network/tqserversocket.cpp
+++ b/tqtinterface/qt4/src/network/tqserversocket.cpp
@@ -86,7 +86,7 @@ public:
     backlog to specify how many pending connections the server can
     have.
 
-    The \a tqparent and \a name arguments are passed on to the TQObject
+    The \a parent and \a name arguments are passed on to the TQObject
     constructor.
 
     \warning On Tru64 Unix systems a value of 0 for \a backlog means
@@ -95,8 +95,8 @@ public:
 */
 
 TQServerSocket::TQServerSocket( TQ_UINT16 port, int backlog,
-			      TQObject *tqparent, const char *name )
-    : TQObject( tqparent, name )
+			      TQObject *parent, const char *name )
+    : TQObject( parent, name )
 {
     d = new TQServerSocketPrivate;
     init( TQHostAddress(), port, backlog );
@@ -108,7 +108,7 @@ TQServerSocket::TQServerSocket( TQ_UINT16 port, int backlog,
     only on the given \a address. Use \a backlog to specify how many
     pending connections the server can have.
 
-    The \a tqparent and \a name arguments are passed on to the TQObject
+    The \a parent and \a name arguments are passed on to the TQObject
     constructor.
 
     \warning On Tru64 Unix systems a value of 0 for \a backlog means
@@ -118,8 +118,8 @@ TQServerSocket::TQServerSocket( TQ_UINT16 port, int backlog,
 
 TQServerSocket::TQServerSocket( const TQHostAddress & address, TQ_UINT16 port,
 			      int backlog,
-			      TQObject *tqparent, const char *name )
-    : TQObject( tqparent, name )
+			      TQObject *parent, const char *name )
+    : TQObject( parent, name )
 {
     d = new TQServerSocketPrivate;
     init( address, port, backlog );
@@ -133,14 +133,14 @@ TQServerSocket::TQServerSocket( const TQHostAddress & address, TQ_UINT16 port,
     use the TQServerSocket class as a wrapper for other socket types
     (e.g. Unix Domain Sockets under Unix).
 
-    The \a tqparent and \a name arguments are passed on to the TQObject
+    The \a parent and \a name arguments are passed on to the TQObject
     constructor.
 
     \sa setSocket()
 */
 
-TQServerSocket::TQServerSocket( TQObject *tqparent, const char *name )
-    : TQObject( tqparent, name )
+TQServerSocket::TQServerSocket( TQObject *parent, const char *name )
+    : TQObject( parent, name )
 {
     d = new TQServerSocketPrivate;
 }
diff --git a/tqtinterface/qt4/src/network/tqserversocket.h b/tqtinterface/qt4/src/network/tqserversocket.h
index 5024c62..d1f4a83 100644
--- a/tqtinterface/qt4/src/network/tqserversocket.h
+++ b/tqtinterface/qt4/src/network/tqserversocket.h
@@ -63,10 +63,10 @@ class TQM_EXPORT_NETWORK TQServerSocket : public TQObject
     TQ_OBJECT
 public:
     TQServerSocket( TQ_UINT16 port, int backlog = 1,
-		   TQObject *tqparent=0, const char *name=0 );
+		   TQObject *parent=0, const char *name=0 );
     TQServerSocket( const TQHostAddress & address, TQ_UINT16 port, int backlog = 1,
-		   TQObject *tqparent=0, const char *name=0 );
-    TQServerSocket( TQObject *tqparent=0, const char *name=0 );
+		   TQObject *parent=0, const char *name=0 );
+    TQServerSocket( TQObject *parent=0, const char *name=0 );
     virtual ~TQServerSocket();
 
     bool ok() const;
diff --git a/tqtinterface/qt4/src/network/tqsocket.cpp b/tqtinterface/qt4/src/network/tqsocket.cpp
index c894f3e..8e4d40a 100644
--- a/tqtinterface/qt4/src/network/tqsocket.cpp
+++ b/tqtinterface/qt4/src/network/tqsocket.cpp
@@ -393,22 +393,22 @@ qint64 TQSocket::writeData( const char *data, qint64 len )
 /*!
     Creates a TQSocket object in \c TQSocket::Idle state.
 
-    The \a tqparent and \a name arguments are passed on to the TQObject
+    The \a parent and \a name arguments are passed on to the TQObject
     constructor.
 
     Note that a TQApplication must have been constructed before sockets
     can be used.
 */
 
-TQSocket::TQSocket( TQObject *tqparent, const char *name )
+TQSocket::TQSocket( TQObject *parent, const char *name )
 #ifdef USE_QT4
     : TQIODevice()
 #else // USE_QT4
-    : TQObject( tqparent, name )
+    : TQObject( parent, name )
 #endif // USE_QT4
 {
 #ifdef USE_QT4
-    setParent(tqparent);
+    setParent(parent);
     setObjectName(name);
 #endif // USE_QT4
     d = new TQSocketPrivate;
diff --git a/tqtinterface/qt4/src/network/tqsocket.h b/tqtinterface/qt4/src/network/tqsocket.h
index 664356c..7b9453e 100644
--- a/tqtinterface/qt4/src/network/tqsocket.h
+++ b/tqtinterface/qt4/src/network/tqsocket.h
@@ -72,7 +72,7 @@ public:
 	ErrSocketRead
     };
 
-    TQSocket( TQObject *tqparent=0, const char *name=0 );
+    TQSocket( TQObject *parent=0, const char *name=0 );
     virtual ~TQSocket();
 
     enum State { Idle, HostLookup, Connecting,