rename the following methods:

tqparent parent
tqmask mask


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

15 files changed, 124 insertions, 124 deletions

diff --git a/kopete/protocols/jabber/libiris/iris/include/im.h b/kopete/protocols/jabber/libiris/iris/include/im.h
index 3e52c5d2..8387d48a 100644
--- a/kopete/protocols/jabber/libiris/iris/include/im.h
+++ b/kopete/protocols/jabber/libiris/iris/include/im.h
@@ -498,11 +498,11 @@ namespace XMPP
   TQ_OBJECT
 	public:
 		enum { ErrDisc };
-		Task(Task *tqparent);
+		Task(Task *parent);
 		Task(Client *, bool isRoot);
 		virtual ~Task();
 
-		Task *tqparent() const;
+		Task *parent() const;
 		Client *client() const;
 		TQDomDocument *doc() const;
 		TQString id() const;
@@ -546,7 +546,7 @@ namespace XMPP
   TQ_OBJECT
 
 	public:
-		Client(TQObject *tqparent=0);
+		Client(TQObject *parent=0);
 		~Client();
 
 		bool isActive() const;
diff --git a/kopete/protocols/jabber/libiris/iris/include/xmpp.h b/kopete/protocols/jabber/libiris/iris/include/xmpp.h
index a59a4827..ef5604a1 100644
--- a/kopete/protocols/jabber/libiris/iris/include/xmpp.h
+++ b/kopete/protocols/jabber/libiris/iris/include/xmpp.h
@@ -65,7 +65,7 @@ namespace XMPP
 		Q_OBJECT
   TQ_OBJECT
 	public:
-		Connector(TQObject *tqparent=0);
+		Connector(TQObject *parent=0);
 		virtual ~Connector();
 
 		virtual void connectToServer(const TQString &server)=0;
@@ -99,7 +99,7 @@ namespace XMPP
   TQ_OBJECT
 	public:
 		enum Error { ErrConnectionRefused, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth, ErrStream };
-		AdvancedConnector(TQObject *tqparent=0);
+		AdvancedConnector(TQObject *parent=0);
 		virtual ~AdvancedConnector();
 
 		class Proxy
@@ -173,7 +173,7 @@ namespace XMPP
 		Q_OBJECT
   TQ_OBJECT
 	public:
-		TLSHandler(TQObject *tqparent=0);
+		TLSHandler(TQObject *parent=0);
 		virtual ~TLSHandler();
 
 		virtual void reset()=0;
@@ -194,7 +194,7 @@ namespace XMPP
 		Q_OBJECT
   TQ_OBJECT
 	public:
-		QCATLSHandler(QCA::TLS *tqparent);
+		QCATLSHandler(QCA::TLS *parent);
 		~QCATLSHandler();
 
 		QCA::TLS *tls() const;
@@ -375,7 +375,7 @@ namespace XMPP
 			SystemShutdown
 		};
 
-		Stream(TQObject *tqparent=0);
+		Stream(TQObject *parent=0);
 		virtual ~Stream();
 
 		virtual TQDomDocument & doc() const=0;
@@ -456,8 +456,8 @@ namespace XMPP
 			BindConflict                // resource in-use
 		};
 
-		ClientStream(Connector *conn, TLSHandler *tlsHandler=0, TQObject *tqparent=0);
-		ClientStream(const TQString &host, const TQString &defRealm, ByteStream *bs, QCA::TLS *tls=0, TQObject *tqparent=0); // server
+		ClientStream(Connector *conn, TLSHandler *tlsHandler=0, TQObject *parent=0);
+		ClientStream(const TQString &host, const TQString &defRealm, ByteStream *bs, QCA::TLS *tls=0, TQObject *parent=0); // server
 		~ClientStream();
 
 		Jid jid() const;
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp
index 2a9553a2..86bc65b0 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp
+++ b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp
@@ -67,8 +67,8 @@ public:
 	bool sender;
 };
 
-FileTransfer::FileTransfer(FileTransferManager *m, TQObject *tqparent)
-:TQObject(tqparent)
+FileTransfer::FileTransfer(FileTransferManager *m, TQObject *parent)
+:TQObject(parent)
 {
 	d = new Private;
 	d->m = m;
@@ -450,8 +450,8 @@ public:
 	TQStringList streamTypes;
 };
 
-JT_FT::JT_FT(Task *tqparent)
-:Task(tqparent)
+JT_FT::JT_FT(Task *parent)
+:Task(parent)
 {
 	d = new Private;
 }
@@ -619,8 +619,8 @@ bool JT_FT::take(const TQDomElement &x)
 //----------------------------------------------------------------------------
 // JT_PushFT
 //----------------------------------------------------------------------------
-JT_PushFT::JT_PushFT(Task *tqparent)
-:Task(tqparent)
+JT_PushFT::JT_PushFT(Task *parent)
+:Task(parent)
 {
 }
 
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h
index 6ad8f7ff..f3688768 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h
+++ b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h
@@ -81,7 +81,7 @@ namespace XMPP
 		void reset();
 
 		friend class FileTransferManager;
-		FileTransfer(FileTransferManager *, TQObject *tqparent=0);
+		FileTransfer(FileTransferManager *, TQObject *parent=0);
 		void man_waitForAccept(const FTRequest &req);
 		void takeConnection(S5BConnection *c);
 	};
@@ -123,7 +123,7 @@ namespace XMPP
 		Q_OBJECT
   TQ_OBJECT
 	public:
-		JT_FT(Task *tqparent);
+		JT_FT(Task *parent);
 		~JT_FT();
 
 		void request(const Jid &to, const TQString &id, const TQString &fname, TQ_LLONG size, const TQString &desc, const TQStringList &streamTypes);
@@ -154,7 +154,7 @@ namespace XMPP
 		Q_OBJECT
   TQ_OBJECT
 	public:
-		JT_PushFT(Task *tqparent);
+		JT_PushFT(Task *parent);
 		~JT_PushFT();
 
 		void respondSuccess(const Jid &to, const TQString &id, TQ_LLONG rangeOffset, TQ_LLONG rangeLength, const TQString &streamType);
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp
index 1914ad26..9e1f4ccd 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp
+++ b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp
@@ -185,8 +185,8 @@ public:
 static int id_conn = 0;
 static int num_conn = 0;
 
-S5BConnection::S5BConnection(S5BManager *m, TQObject *tqparent)
-:ByteStream(tqparent)
+S5BConnection::S5BConnection(S5BManager *m, TQObject *parent)
+:ByteStream(parent)
 {
 	d = new Private;
 	d->m = m;
@@ -575,15 +575,15 @@ public:
 	JT_PushS5B *ps;
 };
 
-S5BManager::S5BManager(Client *tqparent)
-:TQObject(tqparent)
+S5BManager::S5BManager(Client *parent)
+:TQObject(parent)
 {
 	// S5B needs SHA1
 	if(!QCA::isSupported(QCA::CAP_SHA1))
 		QCA::insertProvider(createProviderHash());
 
 	d = new Private;
-	d->client = tqparent;
+	d->client = parent;
 	d->serv = 0;
 	d->activeList.setAutoDelete(true);
 
@@ -1865,8 +1865,8 @@ public:
 	TQTimer t;
 };
 
-S5BConnector::S5BConnector(TQObject *tqparent)
-:TQObject(tqparent)
+S5BConnector::S5BConnector(TQObject *parent)
+:TQObject(parent)
 {
 	d = new Private;
 	d->active = 0;
@@ -2054,8 +2054,8 @@ public:
 	TQPtrList<Item> itemList;
 };
 
-S5BServer::S5BServer(TQObject *tqparent)
-:TQObject(tqparent)
+S5BServer::S5BServer(TQObject *parent)
+:TQObject(parent)
 {
 	d = new Private;
 	d->itemList.setAutoDelete(true);
@@ -2195,8 +2195,8 @@ public:
 	TQTimer t;
 };
 
-JT_S5B::JT_S5B(Task *tqparent)
-:Task(tqparent)
+JT_S5B::JT_S5B(Task *parent)
+:Task(parent)
 {
 	d = new Private;
 	d->mode = -1;
@@ -2356,8 +2356,8 @@ StreamHost JT_S5B::proxyInfo() const
 //----------------------------------------------------------------------------
 // JT_PushS5B
 //----------------------------------------------------------------------------
-JT_PushS5B::JT_PushS5B(Task *tqparent)
-:Task(tqparent)
+JT_PushS5B::JT_PushS5B(Task *parent)
+:Task(parent)
 {
 }
 
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/s5b.h b/kopete/protocols/jabber/libiris/iris/jabber/s5b.h
index d9818503..d925e25f 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/s5b.h
+++ b/kopete/protocols/jabber/libiris/iris/jabber/s5b.h
@@ -125,7 +125,7 @@ namespace XMPP
 		void man_clientReady(SocksClient *, SocksUDP *);
 		void man_udpReady(const TQByteArray &buf);
 		void man_failed(int);
-		S5BConnection(S5BManager *, TQObject *tqparent=0);
+		S5BConnection(S5BManager *, TQObject *parent=0);
 	};
 
 	class S5BManager : public TQObject
@@ -203,7 +203,7 @@ namespace XMPP
 		Q_OBJECT
   TQ_OBJECT
 	public:
-		S5BConnector(TQObject *tqparent=0);
+		S5BConnector(TQObject *parent=0);
 		~S5BConnector();
 
 		void reset();
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp
index 6bf15aa2..2ca012c1 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp
+++ b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp
@@ -346,11 +346,11 @@ public:
 	JT_IBB *ibb;
 };
 
-IBBManager::IBBManager(Client *tqparent)
-:TQObject(tqparent)
+IBBManager::IBBManager(Client *parent)
+:TQObject(parent)
 {
 	d = new Private;
-	d->client = tqparent;
+	d->client = parent;
 	
 	d->ibb = new JT_IBB(d->client->rootTask(), true);
 	connect(d->ibb, TQT_SIGNAL(incomingRequest(const Jid &, const TQString &, const TQDomElement &)), TQT_SLOT(ibb_incomingRequest(const Jid &, const TQString &, const TQDomElement &)));
@@ -479,8 +479,8 @@ public:
 	TQString streamid;
 };
 
-JT_IBB::JT_IBB(Task *tqparent, bool serve)
-:Task(tqparent)
+JT_IBB::JT_IBB(Task *parent, bool serve)
+:Task(parent)
 {
 	d = new Private;
 	d->serve = serve;
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp
index ab2a5d5c..6e73799d 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp
@@ -55,8 +55,8 @@ using namespace XMPP;
 //----------------------------------------------------------------------------
 // Connector
 //----------------------------------------------------------------------------
-Connector::Connector(TQObject *tqparent)
-:TQObject(tqparent)
+Connector::Connector(TQObject *parent)
+:TQObject(parent)
 {
 	setUseSSL(false);
 	setPeerAddressNone();
@@ -223,8 +223,8 @@ public:
 	SafeDelete sd;
 };
 
-AdvancedConnector::AdvancedConnector(TQObject *tqparent)
-:Connector(tqparent)
+AdvancedConnector::AdvancedConnector(TQObject *parent)
+:Connector(parent)
 {
 	d = new Private;
 	d->bs = 0;
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
index 59b28f8b..0e324cb1 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
@@ -488,8 +488,8 @@ void Stanza::clearError()
 // Stream
 //----------------------------------------------------------------------------
 static XmlProtocol *foo = 0;
-Stream::Stream(TQObject *tqparent)
-:TQObject(tqparent)
+Stream::Stream(TQObject *parent)
+:TQObject(parent)
 {
 }
 
@@ -612,8 +612,8 @@ public:
 	int noop_time;
 };
 
-ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *tqparent)
-:Stream(tqparent)
+ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *parent)
+:Stream(parent)
 {
 	d = new Private;
 	d->mode = Client;
@@ -627,8 +627,8 @@ ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *tq
 	d->tlsHandler = tlsHandler;
 }
 
-ClientStream::ClientStream(const TQString &host, const TQString &defRealm, ByteStream *bs, QCA::TLS *tls, TQObject *tqparent)
-:Stream(tqparent)
+ClientStream::ClientStream(const TQString &host, const TQString &defRealm, ByteStream *bs, QCA::TLS *tls, TQObject *parent)
+:Stream(parent)
 {
 	d = new Private;
 	d->mode = Server;
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp
index 996727ea..313c6b6a 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp
@@ -28,8 +28,8 @@ using namespace XMPP;
 //----------------------------------------------------------------------------
 // TLSHandler
 //----------------------------------------------------------------------------
-TLSHandler::TLSHandler(TQObject *tqparent)
-:TQObject(tqparent)
+TLSHandler::TLSHandler(TQObject *parent)
+:TQObject(parent)
 {
 }
 
@@ -48,11 +48,11 @@ public:
 	int state, err;
 };
 
-QCATLSHandler::QCATLSHandler(QCA::TLS *tqparent)
-:TLSHandler(tqparent)
+QCATLSHandler::QCATLSHandler(QCA::TLS *parent)
+:TLSHandler(parent)
 {
 	d = new Private;
-	d->tls = tqparent;
+	d->tls = parent;
 	connect(d->tls, TQT_SIGNAL(handshaken()), TQT_SLOT(tls_handshaken()));
 	connect(d->tls, TQT_SIGNAL(readyRead()), TQT_SLOT(tls_readyRead()));
 	connect(d->tls, TQT_SIGNAL(readyReadOutgoing(int)), TQT_SLOT(tls_readyReadOutgoing(int)));
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp
index 91111ea9..d1650842 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp
@@ -32,7 +32,7 @@ using namespace XMPP;
 // redundant namespaces.
 static TQDomElement stripExtraNS(const TQDomElement &e)
 {
-	// find closest tqparent with a namespace
+	// find closest parent with a namespace
 	TQDomNode par = e.parentNode();
 	while(!par.isNull() && par.namespaceURI().isNull())
 		par = par.parentNode();
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
index 7b425696..9d5ee471 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
@@ -34,7 +34,7 @@
 //!  Client, you will need to manually invoke Tasks.  Fortunately, the
 //!  process is very simple.
 //!
-//!  The entire Task system is heavily founded on TQt.  All Tasks have a tqparent,
+//!  The entire Task system is heavily founded on TQt.  All Tasks have a parent,
 //!  except for the root Task, and are considered TQObjects.  By using TQt's RTTI
 //!  facilities (TQObject::sender(), TQObject::isA(), etc), you can use a
 //!  "fire and forget" approach with Tasks.
@@ -469,7 +469,7 @@ void Client::streamCloseFinished()
 
 static TQDomElement oldStyleNS(const TQDomElement &e)
 {
-	// find closest tqparent with a namespace
+	// find closest parent with a namespace
 	TQDomNode par = e.parentNode();
 	while(!par.isNull() && par.namespaceURI().isNull())
 		par = par.parentNode();
@@ -1155,22 +1155,22 @@ public:
 	bool done;
 };
 
-Task::Task(Task *tqparent)
-:TQObject(tqparent)
+Task::Task(Task *parent)
+:TQObject(parent)
 {
 	init();
 
-	d->client = tqparent->client();
+	d->client = parent->client();
 	d->id = client()->genUniqueId();
 	connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected()));
 }
 
-Task::Task(Client *tqparent, bool)
+Task::Task(Client *parent, bool)
 :TQObject(0)
 {
 	init();
 
-	d->client = tqparent;
+	d->client = parent;
 	connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected()));
 }
 
@@ -1189,9 +1189,9 @@ void Task::init()
 	d->done = false;
 }
 
-Task *Task::tqparent() const
+Task *Task::parent() const
 {
-	return (Task *)TQObject::tqparent();
+	return (Task *)TQObject::parent();
 }
 
 Client *Task::client() const
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
index 522e52f9..9e742d10 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
@@ -503,17 +503,17 @@ Stanza Message::toStanza(Stream *stream) const
 		}
 	}
 	if ( !d->xHTMLBody.isEmpty()) {
-		TQDomElement tqparent = s.createElement(s.xhtmlImNS(), "html");
+		TQDomElement parent = s.createElement(s.xhtmlImNS(), "html");
 		for(it = d->xHTMLBody.begin(); it != d->xHTMLBody.end(); ++it) {
 			const TQString &str = it.data();
 			if(!str.isEmpty()) {
 				TQDomElement child = s.createXHTMLElement(str);
 				if(!it.key().isEmpty())
 					child.setAttributeNS(NS_XML, "xml:lang", it.key());
-				tqparent.appendChild(child);
+				parent.appendChild(child);
 			}
 		}
-		s.appendChild(tqparent);
+		s.appendChild(parent);
 	}
 	if(d->type == "error")
 		s.setError(d->error);
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
index 45ef7a04..4e4c96d1 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
@@ -103,8 +103,8 @@ public:
 	int type;
 };
 
-JT_Register::JT_Register(Task *tqparent)
-:Task(tqparent)
+JT_Register::JT_Register(Task *parent)
+:Task(parent)
 {
 	d = new Private;
 	d->type = -1;
@@ -246,8 +246,8 @@ public:
 	JT_Register *jt_reg;
 };
 
-JT_UnRegister::JT_UnRegister(Task *tqparent)
-: Task(tqparent)
+JT_UnRegister::JT_UnRegister(Task *parent)
+: Task(parent)
 {
 	d = new Private;
 	d->jt_reg = 0;
@@ -306,8 +306,8 @@ public:
 	TQValueList<TQDomElement> itemList;
 };
 
-JT_Roster::JT_Roster(Task *tqparent)
-:Task(tqparent)
+JT_Roster::JT_Roster(Task *parent)
+:Task(parent)
 {
 	type = -1;
 	d = new Private;
@@ -448,8 +448,8 @@ bool JT_Roster::take(const TQDomElement &x)
 //----------------------------------------------------------------------------
 // JT_PushRoster
 //----------------------------------------------------------------------------
-JT_PushRoster::JT_PushRoster(Task *tqparent)
-:Task(tqparent)
+JT_PushRoster::JT_PushRoster(Task *parent)
+:Task(parent)
 {
 }
 
@@ -475,8 +475,8 @@ bool JT_PushRoster::take(const TQDomElement &e)
 //----------------------------------------------------------------------------
 // JT_Presence
 //----------------------------------------------------------------------------
-JT_Presence::JT_Presence(Task *tqparent)
-:Task(tqparent)
+JT_Presence::JT_Presence(Task *parent)
+:Task(parent)
 {
 	type = -1;
 }
@@ -554,8 +554,8 @@ void JT_Presence::onGo()
 //----------------------------------------------------------------------------
 // JT_PushPresence
 //----------------------------------------------------------------------------
-JT_PushPresence::JT_PushPresence(Task *tqparent)
-:Task(tqparent)
+JT_PushPresence::JT_PushPresence(Task *parent)
+:Task(parent)
 {
 }
 
@@ -653,7 +653,7 @@ bool JT_PushPresence::take(const TQDomElement &e)
 //----------------------------------------------------------------------------
 static TQDomElement oldStyleNS(const TQDomElement &e)
 {
-	// find closest tqparent with a namespace
+	// find closest parent with a namespace
 	TQDomNode par = e.parentNode();
 	while(!par.isNull() && par.namespaceURI().isNull())
 		par = par.parentNode();
@@ -688,8 +688,8 @@ static TQDomElement oldStyleNS(const TQDomElement &e)
 	return i;
 }
 
-JT_Message::JT_Message(Task *tqparent, const Message &msg)
-:Task(tqparent)
+JT_Message::JT_Message(Task *parent, const Message &msg)
+:Task(parent)
 {
 	m = msg;
 	m.setId(id());
@@ -756,8 +756,8 @@ static TQDomElement addCorrectNS(const TQDomElement &e)
 	return i;
 }
 
-JT_PushMessage::JT_PushMessage(Task *tqparent)
-:Task(tqparent)
+JT_PushMessage::JT_PushMessage(Task *parent)
+:Task(parent)
 {
 }
 
@@ -799,8 +799,8 @@ public:
 	TQString message;
 };
 
-JT_GetLastActivity::JT_GetLastActivity(Task *tqparent)
-:Task(tqparent)
+JT_GetLastActivity::JT_GetLastActivity(Task *parent)
+:Task(parent)
 {
 	d = new Private;
 }
@@ -858,8 +858,8 @@ bool JT_GetLastActivity::take(const TQDomElement &x)
 //----------------------------------------------------------------------------
 // JT_GetServices
 //----------------------------------------------------------------------------
-JT_GetServices::JT_GetServices(Task *tqparent)
-:Task(tqparent)
+JT_GetServices::JT_GetServices(Task *parent)
+:Task(parent)
 {
 }
 
@@ -955,8 +955,8 @@ public:
 	VCard vcard;
 };
 
-JT_VCard::JT_VCard(Task *tqparent)
-:Task(tqparent)
+JT_VCard::JT_VCard(Task *parent)
+:Task(parent)
 {
 	type = -1;
 	d = new Private;
@@ -1055,8 +1055,8 @@ public:
 	TQValueList<SearchResult> resultList;
 };
 
-JT_Search::JT_Search(Task *tqparent)
-:Task(tqparent)
+JT_Search::JT_Search(Task *parent)
+:Task(parent)
 {
 	d = new Private;
 	type = -1;
@@ -1187,8 +1187,8 @@ bool JT_Search::take(const TQDomElement &x)
 //----------------------------------------------------------------------------
 // JT_ClientVersion
 //----------------------------------------------------------------------------
-JT_ClientVersion::JT_ClientVersion(Task *tqparent)
-:Task(tqparent)
+JT_ClientVersion::JT_ClientVersion(Task *parent)
+:Task(parent)
 {
 }
 
@@ -1258,8 +1258,8 @@ const TQString & JT_ClientVersion::os() const
 //----------------------------------------------------------------------------
 // JT_ClientTime
 //----------------------------------------------------------------------------
-/*JT_ClientTime::JT_ClientTime(Task *tqparent, const Jid &_j)
-:Task(tqparent)
+/*JT_ClientTime::JT_ClientTime(Task *parent, const Jid &_j)
+:Task(parent)
 {
 	j = _j;
 	iq = createIQ("get", j.full(), id());
@@ -1307,8 +1307,8 @@ bool JT_ClientTime::take(const TQDomElement &x)
 //----------------------------------------------------------------------------
 // JT_ServInfo
 //----------------------------------------------------------------------------
-JT_ServInfo::JT_ServInfo(Task *tqparent)
-:Task(tqparent)
+JT_ServInfo::JT_ServInfo(Task *parent)
+:Task(parent)
 {
 }
 
@@ -1444,8 +1444,8 @@ bool JT_ServInfo::take(const TQDomElement &e)
 //----------------------------------------------------------------------------
 // JT_Gateway
 //----------------------------------------------------------------------------
-JT_Gateway::JT_Gateway(Task *tqparent)
-:Task(tqparent)
+JT_Gateway::JT_Gateway(Task *parent)
+:Task(parent)
 {
 	type = -1;
 }
@@ -1539,8 +1539,8 @@ public:
 	AgentItem root;
 };
 
-JT_Browse::JT_Browse (Task *tqparent)
-:Task (tqparent)
+JT_Browse::JT_Browse (Task *parent)
+:Task (parent)
 {
 	d = new Private;
 }
@@ -1664,8 +1664,8 @@ public:
 	DiscoList items;
 };
 
-JT_DiscoItems::JT_DiscoItems(Task *tqparent)
-: Task(tqparent)
+JT_DiscoItems::JT_DiscoItems(Task *parent)
+: Task(parent)
 {
 	d = new Private;
 }
@@ -1753,8 +1753,8 @@ public:
 	DiscoItem item;
 };
 
-JT_DiscoInfo::JT_DiscoInfo(Task *tqparent)
-: Task(tqparent)
+JT_DiscoInfo::JT_DiscoInfo(Task *parent)
+: Task(parent)
 {
 	d = new Private;
 }
@@ -1895,8 +1895,8 @@ public:
 	DiscoList list;
 };
 
-JT_DiscoPublish::JT_DiscoPublish(Task *tqparent)
-: Task(tqparent)
+JT_DiscoPublish::JT_DiscoPublish(Task *parent)
+: Task(parent)
 {
 	d = new Private;
 }
@@ -1959,8 +1959,8 @@ bool JT_DiscoPublish::take(const TQDomElement &x)
 //----------------------------------------------------------------------------
 // JT_MucPresence
 //----------------------------------------------------------------------------
-JT_MucPresence::JT_MucPresence(Task *tqparent)
-:Task(tqparent)
+JT_MucPresence::JT_MucPresence(Task *parent)
+:Task(parent)
 {
 	type = -1;
 }
@@ -2043,8 +2043,8 @@ class JT_PrivateStorage::Private
 		int type;
 };
 
-JT_PrivateStorage::JT_PrivateStorage(Task *tqparent)
-	:Task(tqparent)
+JT_PrivateStorage::JT_PrivateStorage(Task *parent)
+	:Task(parent)
 {
 	d = new Private;
 }
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h
index 9d5125d9..97d68964 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h
@@ -37,7 +37,7 @@ namespace XMPP
 		Q_OBJECT
   TQ_OBJECT
 	public:
-		JT_Register(Task *tqparent);
+		JT_Register(Task *parent);
 		~JT_Register();
 
 		void reg(const TQString &user, const TQString &pass);
@@ -64,7 +64,7 @@ namespace XMPP
 		Q_OBJECT
   TQ_OBJECT
 	public:
-		JT_UnRegister(Task *tqparent);
+		JT_UnRegister(Task *parent);
 		~JT_UnRegister();
 
 		void unreg(const Jid &);
@@ -85,7 +85,7 @@ namespace XMPP
 		Q_OBJECT
   TQ_OBJECT
 	public:
-		JT_Roster(Task *tqparent);
+		JT_Roster(Task *parent);
 		~JT_Roster();
 
 		void get();
@@ -114,7 +114,7 @@ namespace XMPP
 		Q_OBJECT
   TQ_OBJECT
 	public:
-		JT_PushRoster(Task *tqparent);
+		JT_PushRoster(Task *parent);
 		~JT_PushRoster();
 
 		bool take(const TQDomElement &);
@@ -132,7 +132,7 @@ namespace XMPP
 		Q_OBJECT
   TQ_OBJECT
 	public:
-		JT_Presence(Task *tqparent);
+		JT_Presence(Task *parent);
 		~JT_Presence();
 
 		void pres(const tqStatus &);
@@ -154,7 +154,7 @@ namespace XMPP
 		Q_OBJECT
   TQ_OBJECT
 	public:
-		JT_PushPresence(Task *tqparent);
+		JT_PushPresence(Task *parent);
 		~JT_PushPresence();
 
 		bool take(const TQDomElement &);
@@ -173,7 +173,7 @@ namespace XMPP
 		Q_OBJECT
   TQ_OBJECT
 	public:
-		JT_Message(Task *tqparent, const Message &);
+		JT_Message(Task *parent, const Message &);
 		~JT_Message();
 
 		void onGo();
@@ -190,7 +190,7 @@ namespace XMPP
 		Q_OBJECT
   TQ_OBJECT
 	public:
-		JT_PushMessage(Task *tqparent);
+		JT_PushMessage(Task *parent);
 		~JT_PushMessage();
 
 		bool take(const TQDomElement &);
@@ -255,7 +255,7 @@ namespace XMPP
 		Q_OBJECT
   TQ_OBJECT
 	public:
-		JT_VCard(Task *tqparent);
+		JT_VCard(Task *parent);
 		~JT_VCard();
 
 		void get(const Jid &);
@@ -279,7 +279,7 @@ namespace XMPP
 		Q_OBJECT
   TQ_OBJECT
 	public:
-		JT_Search(Task *tqparent);
+		JT_Search(Task *parent);
 		~JT_Search();
 
 		const Form & form() const;
@@ -465,7 +465,7 @@ namespace XMPP
 		Q_OBJECT
   TQ_OBJECT
 	public:
-		JT_MucPresence(Task *tqparent);
+		JT_MucPresence(Task *parent);
 		~JT_MucPresence();
 
 		void pres(const tqStatus &);
@@ -486,7 +486,7 @@ namespace XMPP
 		Q_OBJECT
   TQ_OBJECT
 	public:
-		JT_PrivateStorage(Task *tqparent);
+		JT_PrivateStorage(Task *parent);
 		~JT_PrivateStorage();
 
 		void set(const TQDomElement &);