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

86 files changed, 121 insertions, 121 deletions

diff --git a/kopete/protocols/yahoo/libkyahoo/bytestream.cpp b/kopete/protocols/yahoo/libkyahoo/bytestream.cpp
index 384402e9..8ca3a4cd 100644
--- a/kopete/protocols/yahoo/libkyahoo/bytestream.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/bytestream.cpp
@@ -64,9 +64,9 @@ public:
 };
 
 //!
-//! Constructs a ByteStream object with tqparent \a tqparent.
-ByteStream::ByteStream(TQObject *tqparent)
-:TQObject(tqparent)
+//! Constructs a ByteStream object with parent \a parent.
+ByteStream::ByteStream(TQObject *parent)
+:TQObject(parent)
 {
 // 	kdDebug(14181) << k_funcinfo << endl;
 	d = new Private;
diff --git a/kopete/protocols/yahoo/libkyahoo/bytestream.h b/kopete/protocols/yahoo/libkyahoo/bytestream.h
index c4dc96e1..9104bbce 100644
--- a/kopete/protocols/yahoo/libkyahoo/bytestream.h
+++ b/kopete/protocols/yahoo/libkyahoo/bytestream.h
@@ -33,7 +33,7 @@ class ByteStream : public TQObject
   TQ_OBJECT
 public:
 	enum Error { ErrRead, ErrWrite, ErrCustom = 10 };
-	ByteStream(TQObject *tqparent=0);
+	ByteStream(TQObject *parent=0);
 	virtual ~ByteStream()=0;
 
 	virtual bool isOpen() const;
diff --git a/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp b/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp
index 757f7d98..a92cfc8f 100644
--- a/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp
@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 
-ChangeStatusTask::ChangeStatusTask(Task* tqparent) : Task(tqparent)
+ChangeStatusTask::ChangeStatusTask(Task* parent) : Task(parent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/changestatustask.h b/kopete/protocols/yahoo/libkyahoo/changestatustask.h
index 50a2051b..ffeb5301 100644
--- a/kopete/protocols/yahoo/libkyahoo/changestatustask.h
+++ b/kopete/protocols/yahoo/libkyahoo/changestatustask.h
@@ -30,7 +30,7 @@ class ChangeStatusTask : public Task
 {
 public:
 	enum Type { Available, Away };
-	ChangeStatusTask(Task *tqparent);
+	ChangeStatusTask(Task *parent);
 	~ChangeStatusTask();
 
 	virtual void onGo();
diff --git a/kopete/protocols/yahoo/libkyahoo/chatsessiontask.cpp b/kopete/protocols/yahoo/libkyahoo/chatsessiontask.cpp
index 6d7a987d..3be83a79 100644
--- a/kopete/protocols/yahoo/libkyahoo/chatsessiontask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/chatsessiontask.cpp
@@ -24,7 +24,7 @@
 #include <tqstring.h>
 #include <kdebug.h>
 
-ChatSessionTask::ChatSessionTask(Task* tqparent) : Task(tqparent)
+ChatSessionTask::ChatSessionTask(Task* parent) : Task(parent)
 {
 	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/chatsessiontask.h b/kopete/protocols/yahoo/libkyahoo/chatsessiontask.h
index e1f9f498..eee7cdc9 100644
--- a/kopete/protocols/yahoo/libkyahoo/chatsessiontask.h
+++ b/kopete/protocols/yahoo/libkyahoo/chatsessiontask.h
@@ -30,7 +30,7 @@ class ChatSessionTask : public Task
 {
 public:
 	enum Type { RegisterSession, UnregisterSession };
-	ChatSessionTask(Task *tqparent);
+	ChatSessionTask(Task *parent);
 	~ChatSessionTask();
 	
 	virtual void onGo();
diff --git a/kopete/protocols/yahoo/libkyahoo/client.h b/kopete/protocols/yahoo/libkyahoo/client.h
index 9fc4825e..586eead5 100644
--- a/kopete/protocols/yahoo/libkyahoo/client.h
+++ b/kopete/protocols/yahoo/libkyahoo/client.h
@@ -53,7 +53,7 @@ Q_OBJECT
 
 		enum LogLevel { Debug, Info, Notice, Warning, Error, Critical };
 
-		Client(TQObject *tqparent=0);
+		Client(TQObject *parent=0);
 		~Client();
 
 		/**
diff --git a/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp b/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp
index 105d9de6..6ca9ae06 100644
--- a/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp
@@ -23,7 +23,7 @@
 #include <tqstringlist.h>
 #include <kdebug.h>
 
-ConferenceTask::ConferenceTask(Task* tqparent) : Task(tqparent)
+ConferenceTask::ConferenceTask(Task* parent) : Task(parent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/conferencetask.h b/kopete/protocols/yahoo/libkyahoo/conferencetask.h
index aff52228..4490fc6a 100644
--- a/kopete/protocols/yahoo/libkyahoo/conferencetask.h
+++ b/kopete/protocols/yahoo/libkyahoo/conferencetask.h
@@ -29,7 +29,7 @@ class ConferenceTask : public Task
 	Q_OBJECT
   TQ_OBJECT
 public:
-	ConferenceTask(Task *tqparent);
+	ConferenceTask(Task *parent);
 	~ConferenceTask();
 
 	bool take(Transfer *transfer);
diff --git a/kopete/protocols/yahoo/libkyahoo/connector.cpp b/kopete/protocols/yahoo/libkyahoo/connector.cpp
index 36912011..83910204 100644
--- a/kopete/protocols/yahoo/libkyahoo/connector.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/connector.cpp
@@ -20,8 +20,8 @@
 
 #include "connector.h"
 
-Connector::Connector(TQObject *tqparent)
-:TQObject(tqparent)
+Connector::Connector(TQObject *parent)
+:TQObject(parent)
 {
 	setPeerAddressNone();
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/connector.h b/kopete/protocols/yahoo/libkyahoo/connector.h
index f5b1917a..a15f137b 100644
--- a/kopete/protocols/yahoo/libkyahoo/connector.h
+++ b/kopete/protocols/yahoo/libkyahoo/connector.h
@@ -32,7 +32,7 @@ class Connector : public TQObject
 	Q_OBJECT
   TQ_OBJECT
 public:
-	Connector(TQObject *tqparent=0);
+	Connector(TQObject *parent=0);
 	virtual ~Connector();
 
 	virtual void connectToServer(const TQString &server)=0;
diff --git a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp
index f48bd52d..fd9657f7 100644
--- a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp
@@ -25,7 +25,7 @@
 #include <kdebug.h>
 //#include <kcodecs.h>
 
-FileTransferNotifierTask::FileTransferNotifierTask(Task* tqparent) : Task(tqparent)
+FileTransferNotifierTask::FileTransferNotifierTask(Task* parent) : Task(parent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.h b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.h
index 84b50849..9851bf60 100644
--- a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.h
+++ b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.h
@@ -32,7 +32,7 @@ class FileTransferNotifierTask : public Task
 Q_OBJECT
   TQ_OBJECT
 public:
-	FileTransferNotifierTask(Task *tqparent);
+	FileTransferNotifierTask(Task *parent);
 	~FileTransferNotifierTask();
 	
 	bool take(Transfer *transfer);
diff --git a/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.cpp b/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.cpp
index 53068b58..5ef1047d 100644
--- a/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.cpp
@@ -19,8 +19,8 @@
 #include "inputprotocolbase.h"
 
 
-InputProtocolBase::InputProtocolBase(TQObject *tqparent, const char *name)
- : TQObject(tqparent, name)
+InputProtocolBase::InputProtocolBase(TQObject *parent, const char *name)
+ : TQObject(parent, name)
 {
 }
 
diff --git a/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.h b/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.h
index 3c610cdf..683202f4 100644
--- a/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.h
+++ b/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.h
@@ -33,7 +33,7 @@ Q_OBJECT
   TQ_OBJECT
 public:
 	enum EventProtocolState { Success, NeedMore, OutOfSync, ProtocolError };
-	InputProtocolBase(TQObject *tqparent = 0, const char *name = 0);
+	InputProtocolBase(TQObject *parent = 0, const char *name = 0);
 	~InputProtocolBase();
 	/**
 	 * Returns a value describing the state of the object.  
diff --git a/kopete/protocols/yahoo/libkyahoo/listtask.cpp b/kopete/protocols/yahoo/libkyahoo/listtask.cpp
index a368ac5b..d299f963 100644
--- a/kopete/protocols/yahoo/libkyahoo/listtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/listtask.cpp
@@ -23,7 +23,7 @@
 #include "client.h"
 #include <kdebug.h>
 
-ListTask::ListTask(Task* tqparent) : Task(tqparent)
+ListTask::ListTask(Task* parent) : Task(parent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/listtask.h b/kopete/protocols/yahoo/libkyahoo/listtask.h
index 2c487c0c..cd7718e3 100644
--- a/kopete/protocols/yahoo/libkyahoo/listtask.h
+++ b/kopete/protocols/yahoo/libkyahoo/listtask.h
@@ -30,7 +30,7 @@ class ListTask : public Task
 Q_OBJECT
   TQ_OBJECT
 public:
-	ListTask(Task *tqparent);
+	ListTask(Task *parent);
 	~ListTask();
 
 	bool take(Transfer *transfer);
diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.cpp b/kopete/protocols/yahoo/libkyahoo/logintask.cpp
index 7c46229b..d653ecf1 100644
--- a/kopete/protocols/yahoo/libkyahoo/logintask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/logintask.cpp
@@ -37,7 +37,7 @@ extern "C"
 #include "libyahoo.h"
 }
 
-LoginTask::LoginTask(Task* tqparent) : Task(tqparent)
+LoginTask::LoginTask(Task* parent) : Task(parent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 	mState = InitialState;
diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.h b/kopete/protocols/yahoo/libkyahoo/logintask.h
index 88fc53d3..30c01ffe 100644
--- a/kopete/protocols/yahoo/libkyahoo/logintask.h
+++ b/kopete/protocols/yahoo/libkyahoo/logintask.h
@@ -40,7 +40,7 @@ class LoginTask : public Task
 Q_OBJECT
   TQ_OBJECT
 public:
-	LoginTask(Task *tqparent);
+	LoginTask(Task *parent);
 	~LoginTask();
 
 	bool take(Transfer* transfer);
diff --git a/kopete/protocols/yahoo/libkyahoo/logofftask.cpp b/kopete/protocols/yahoo/libkyahoo/logofftask.cpp
index 07fc1ae4..4816ba44 100644
--- a/kopete/protocols/yahoo/libkyahoo/logofftask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/logofftask.cpp
@@ -22,7 +22,7 @@
 #include <tqstring.h>
 #include <kdebug.h>
 
-LogoffTask::LogoffTask(Task* tqparent) : Task(tqparent)
+LogoffTask::LogoffTask(Task* parent) : Task(parent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/logofftask.h b/kopete/protocols/yahoo/libkyahoo/logofftask.h
index af29512a..b04f8f53 100644
--- a/kopete/protocols/yahoo/libkyahoo/logofftask.h
+++ b/kopete/protocols/yahoo/libkyahoo/logofftask.h
@@ -26,7 +26,7 @@
 class LogoffTask : public Task
 {
 public:
-	LogoffTask(Task *tqparent);
+	LogoffTask(Task *parent);
 	~LogoffTask();
 	
 	virtual void onGo();
diff --git a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp
index 4c86bb20..133b17cf 100644
--- a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp
@@ -23,7 +23,7 @@
 #include "client.h"
 #include <kdebug.h>
 
-MailNotifierTask::MailNotifierTask(Task* tqparent) : Task(tqparent)
+MailNotifierTask::MailNotifierTask(Task* parent) : Task(parent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.h b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.h
index 7faba303..cbdbe3d7 100644
--- a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.h
+++ b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.h
@@ -30,7 +30,7 @@ class MailNotifierTask : public Task
 Q_OBJECT
   TQ_OBJECT
 public:
-	MailNotifierTask(Task *tqparent);
+	MailNotifierTask(Task *parent);
 	~MailNotifierTask();
 	
 	bool take(Transfer *transfer);
diff --git a/kopete/protocols/yahoo/libkyahoo/messagereceivertask.cpp b/kopete/protocols/yahoo/libkyahoo/messagereceivertask.cpp
index 522f407f..769b4abe 100644
--- a/kopete/protocols/yahoo/libkyahoo/messagereceivertask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/messagereceivertask.cpp
@@ -23,7 +23,7 @@
 #include "client.h"
 #include <kdebug.h>
 
-MessageReceiverTask::MessageReceiverTask(Task* tqparent) : Task(tqparent)
+MessageReceiverTask::MessageReceiverTask(Task* parent) : Task(parent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/messagereceivertask.h b/kopete/protocols/yahoo/libkyahoo/messagereceivertask.h
index 459b851e..d95fa135 100644
--- a/kopete/protocols/yahoo/libkyahoo/messagereceivertask.h
+++ b/kopete/protocols/yahoo/libkyahoo/messagereceivertask.h
@@ -30,7 +30,7 @@ class MessageReceiverTask : public Task
 Q_OBJECT
   TQ_OBJECT
 public:
-	MessageReceiverTask(Task *tqparent);
+	MessageReceiverTask(Task *parent);
 	~MessageReceiverTask();
 	
 	bool take(Transfer *transfer);
diff --git a/kopete/protocols/yahoo/libkyahoo/modifybuddytask.cpp b/kopete/protocols/yahoo/libkyahoo/modifybuddytask.cpp
index 84b7f012..e83b1e4b 100644
--- a/kopete/protocols/yahoo/libkyahoo/modifybuddytask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/modifybuddytask.cpp
@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 
-ModifyBuddyTask::ModifyBuddyTask(Task* tqparent) : Task(tqparent)
+ModifyBuddyTask::ModifyBuddyTask(Task* parent) : Task(parent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/modifybuddytask.h b/kopete/protocols/yahoo/libkyahoo/modifybuddytask.h
index 3d353086..266a3f00 100644
--- a/kopete/protocols/yahoo/libkyahoo/modifybuddytask.h
+++ b/kopete/protocols/yahoo/libkyahoo/modifybuddytask.h
@@ -30,7 +30,7 @@ Q_OBJECT
   TQ_OBJECT
 public:
 	enum Type { AddBuddy, RemoveBuddy, MoveBuddy };
-	ModifyBuddyTask(Task *tqparent);
+	ModifyBuddyTask(Task *parent);
 	~ModifyBuddyTask();
 	
 	virtual void onGo();
diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
index a9916851..3888bef8 100644
--- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
@@ -31,7 +31,7 @@
 #include <kbufferedsocket.h>
 
 using namespace KNetwork;
-ModifyYABTask::ModifyYABTask(Task* tqparent) : Task(tqparent)
+ModifyYABTask::ModifyYABTask(Task* parent) : Task(parent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 	m_socket = 0;
diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h
index ef1a97eb..8030e011 100644
--- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h
+++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h
@@ -38,7 +38,7 @@ class ModifyYABTask : public Task
   TQ_OBJECT
 public:
 	enum Action { AddEntry, EditEntry, DeleteEntry };
-	ModifyYABTask(Task *tqparent);
+	ModifyYABTask(Task *parent);
 	~ModifyYABTask();
 
 	virtual void onGo();
diff --git a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp
index cf7a6e34..a7245fe6 100644
--- a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 
 
-PictureNotifierTask::PictureNotifierTask(Task* tqparent) : Task(tqparent)
+PictureNotifierTask::PictureNotifierTask(Task* parent) : Task(parent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h
index bfd03303..7e09be19 100644
--- a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h
+++ b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h
@@ -31,7 +31,7 @@ class PictureNotifierTask : public Task
 Q_OBJECT
   TQ_OBJECT
 public:
-	PictureNotifierTask(Task *tqparent);
+	PictureNotifierTask(Task *parent);
 	~PictureNotifierTask();
 
 	bool take(Transfer *transfer);
diff --git a/kopete/protocols/yahoo/libkyahoo/pingtask.cpp b/kopete/protocols/yahoo/libkyahoo/pingtask.cpp
index 25b80abe..c453ff9d 100644
--- a/kopete/protocols/yahoo/libkyahoo/pingtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/pingtask.cpp
@@ -24,7 +24,7 @@
 #include <tqstring.h>
 #include <kdebug.h>
 
-PingTask::PingTask(Task* tqparent) : Task(tqparent)
+PingTask::PingTask(Task* parent) : Task(parent)
 {
 	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/pingtask.h b/kopete/protocols/yahoo/libkyahoo/pingtask.h
index 47453709..f1c2f6a7 100644
--- a/kopete/protocols/yahoo/libkyahoo/pingtask.h
+++ b/kopete/protocols/yahoo/libkyahoo/pingtask.h
@@ -27,7 +27,7 @@
 class PingTask : public Task
 {
 public:
-	PingTask(Task *tqparent);
+	PingTask(Task *parent);
 	~PingTask();
 	
 	virtual void onGo();
diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
index a614f0b8..3943cd22 100644
--- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
@@ -28,7 +28,7 @@
 #include <kio/job.h>
 #include <kio/jobclasses.h>
 
-ReceiveFileTask::ReceiveFileTask(Task* tqparent) : Task(tqparent)
+ReceiveFileTask::ReceiveFileTask(Task* parent) : Task(parent)
 {
 	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
 	m_transmitted = 0;
diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.h b/kopete/protocols/yahoo/libkyahoo/receivefiletask.h
index 93f3261e..bc429b30 100644
--- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.h
+++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.h
@@ -39,7 +39,7 @@ class ReceiveFileTask : public Task
   TQ_OBJECT
 public:
 	enum Type { FileTransferAccept, FileTransfer7Accept, FileTransfer7Reject };
-	ReceiveFileTask(Task *tqparent);
+	ReceiveFileTask(Task *parent);
 	~ReceiveFileTask();
 
 	virtual void onGo();
diff --git a/kopete/protocols/yahoo/libkyahoo/requestpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/requestpicturetask.cpp
index 59173389..55fb046e 100644
--- a/kopete/protocols/yahoo/libkyahoo/requestpicturetask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/requestpicturetask.cpp
@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 
-RequestPictureTask::RequestPictureTask(Task* tqparent) : Task(tqparent)
+RequestPictureTask::RequestPictureTask(Task* parent) : Task(parent)
 {
 	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/requestpicturetask.h b/kopete/protocols/yahoo/libkyahoo/requestpicturetask.h
index d2a901bb..4152afa9 100644
--- a/kopete/protocols/yahoo/libkyahoo/requestpicturetask.h
+++ b/kopete/protocols/yahoo/libkyahoo/requestpicturetask.h
@@ -29,7 +29,7 @@ class RequestPictureTask : public Task
 Q_OBJECT
   TQ_OBJECT
 public:
-	RequestPictureTask(Task *tqparent);
+	RequestPictureTask(Task *parent);
 	virtual ~RequestPictureTask();
 
 	virtual void onGo();
diff --git a/kopete/protocols/yahoo/libkyahoo/sendauthresptask.cpp b/kopete/protocols/yahoo/libkyahoo/sendauthresptask.cpp
index 1f23a40b..34e94c69 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendauthresptask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendauthresptask.cpp
@@ -23,7 +23,7 @@
 #include <tqstring.h>
 #include <kdebug.h>
 
-SendAuthRespTask::SendAuthRespTask(Task* tqparent) : Task(tqparent)
+SendAuthRespTask::SendAuthRespTask(Task* parent) : Task(parent)
 {
 	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/sendauthresptask.h b/kopete/protocols/yahoo/libkyahoo/sendauthresptask.h
index 8740cf50..4f69f156 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendauthresptask.h
+++ b/kopete/protocols/yahoo/libkyahoo/sendauthresptask.h
@@ -30,7 +30,7 @@ class SendAuthRespTask : public Task
 Q_OBJECT
   TQ_OBJECT
 public:
-	SendAuthRespTask(Task *tqparent);
+	SendAuthRespTask(Task *parent);
 	~SendAuthRespTask();
 	
 	virtual void onGo();
diff --git a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
index 06c9e395..8c277525 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
@@ -29,7 +29,7 @@
 
 using namespace KNetwork;
 
-SendFileTask::SendFileTask(Task* tqparent) : Task(tqparent)
+SendFileTask::SendFileTask(Task* parent) : Task(parent)
 {
 	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
 	m_transmitted = 0;
diff --git a/kopete/protocols/yahoo/libkyahoo/sendfiletask.h b/kopete/protocols/yahoo/libkyahoo/sendfiletask.h
index 49f7fbaf..70402a2d 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendfiletask.h
+++ b/kopete/protocols/yahoo/libkyahoo/sendfiletask.h
@@ -34,7 +34,7 @@ class SendFileTask : public Task
 	Q_OBJECT
   TQ_OBJECT
 public:
-	SendFileTask(Task *tqparent);
+	SendFileTask(Task *parent);
 	~SendFileTask();
 	
 	virtual void onGo();
diff --git a/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp
index 438c330f..828c6832 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 
-SendMessageTask::SendMessageTask(Task* tqparent) : Task(tqparent)
+SendMessageTask::SendMessageTask(Task* parent) : Task(parent)
 {
 	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/sendmessagetask.h b/kopete/protocols/yahoo/libkyahoo/sendmessagetask.h
index 52846a3d..e21d9029 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendmessagetask.h
+++ b/kopete/protocols/yahoo/libkyahoo/sendmessagetask.h
@@ -27,7 +27,7 @@ class TQString;
 class SendMessageTask : public Task
 {
 public:
-	SendMessageTask(Task *tqparent);
+	SendMessageTask(Task *parent);
 	~SendMessageTask();
 	
 	virtual void onGo();
diff --git a/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp b/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp
index 00055725..3f4f83b2 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp
@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 
-SendNotifyTask::SendNotifyTask(Task* tqparent) : Task(tqparent)
+SendNotifyTask::SendNotifyTask(Task* parent) : Task(parent)
 {
 	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/sendnotifytask.h b/kopete/protocols/yahoo/libkyahoo/sendnotifytask.h
index b4e84658..c55f8004 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendnotifytask.h
+++ b/kopete/protocols/yahoo/libkyahoo/sendnotifytask.h
@@ -32,7 +32,7 @@ public:
 	enum Type { NotifyTyping, NotifyWebcamInvite, NotifyGame };
 	enum State { Active = 1, NotActive = 0 };
 
-	SendNotifyTask(Task *tqparent);
+	SendNotifyTask(Task *parent);
 	~SendNotifyTask();
 	
 	virtual void onGo();
diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
index f4e8dcf9..a9e76332 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
@@ -31,7 +31,7 @@
 
 using namespace KNetwork;
 
-SendPictureTask::SendPictureTask(Task* tqparent) : Task(tqparent)
+SendPictureTask::SendPictureTask(Task* parent) : Task(parent)
 {
 	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
 	m_socket = 0;
diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h
index 40e80378..861d0dd5 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h
+++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h
@@ -39,7 +39,7 @@ Q_OBJECT
 public:
 	enum Type { UploadPicture, SendChecksum, SendInformation, SendtqStatus };
 
-	SendPictureTask(Task *tqparent);
+	SendPictureTask(Task *parent);
 	virtual ~SendPictureTask();
 
 	virtual void onGo();
diff --git a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp
index 3d0802d1..95e06b3c 100644
--- a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp
@@ -24,7 +24,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 
-StatusNotifierTask::StatusNotifierTask(Task* tqparent) : Task(tqparent)
+StatusNotifierTask::StatusNotifierTask(Task* parent) : Task(parent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h
index 62668947..8ed029f5 100644
--- a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h
+++ b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h
@@ -31,7 +31,7 @@ class StatusNotifierTask : public Task
 Q_OBJECT
   TQ_OBJECT
 public:
-	StatusNotifierTask(Task *tqparent);
+	StatusNotifierTask(Task *parent);
 	~StatusNotifierTask();
 	
 	bool take(Transfer *transfer);
diff --git a/kopete/protocols/yahoo/libkyahoo/stealthtask.cpp b/kopete/protocols/yahoo/libkyahoo/stealthtask.cpp
index ee9bb6d3..9dcc2431 100644
--- a/kopete/protocols/yahoo/libkyahoo/stealthtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/stealthtask.cpp
@@ -21,7 +21,7 @@
 #include "client.h"
 #include <tqstring.h>
 
-StealthTask::StealthTask(Task* tqparent) : Task(tqparent)
+StealthTask::StealthTask(Task* parent) : Task(parent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/stealthtask.h b/kopete/protocols/yahoo/libkyahoo/stealthtask.h
index 6a1b0b2e..aef13038 100644
--- a/kopete/protocols/yahoo/libkyahoo/stealthtask.h
+++ b/kopete/protocols/yahoo/libkyahoo/stealthtask.h
@@ -29,7 +29,7 @@ class TQString;
 class StealthTask : public Task
 {
 public:
-	StealthTask(Task *tqparent);
+	StealthTask(Task *parent);
 	~StealthTask();
 	
 	virtual void onGo();
diff --git a/kopete/protocols/yahoo/libkyahoo/stream.cpp b/kopete/protocols/yahoo/libkyahoo/stream.cpp
index 240a8144..82d6fe52 100644
--- a/kopete/protocols/yahoo/libkyahoo/stream.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/stream.cpp
@@ -19,8 +19,8 @@
 
 #include "stream.h"
 
-Stream::Stream(TQObject *tqparent)
-:TQObject(tqparent)
+Stream::Stream(TQObject *parent)
+:TQObject(parent)
 {
 }
 
diff --git a/kopete/protocols/yahoo/libkyahoo/stream.h b/kopete/protocols/yahoo/libkyahoo/stream.h
index 244519f7..cabcc9fc 100644
--- a/kopete/protocols/yahoo/libkyahoo/stream.h
+++ b/kopete/protocols/yahoo/libkyahoo/stream.h
@@ -44,7 +44,7 @@ public:
 		SystemShutdown
 	};
 
-	Stream(TQObject *tqparent=0);
+	Stream(TQObject *parent=0);
 	virtual ~Stream();
 
 	virtual void close()=0;
diff --git a/kopete/protocols/yahoo/libkyahoo/task.cpp b/kopete/protocols/yahoo/libkyahoo/task.cpp
index c17568ee..6ad9994c 100644
--- a/kopete/protocols/yahoo/libkyahoo/task.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/task.cpp
@@ -40,22 +40,22 @@ public:
 	Transfer * transfer;
 };
 
-Task::Task(Task *tqparent)
-:TQObject(tqparent)
+Task::Task(Task *parent)
+:TQObject(parent)
 {
 	init();
 	d->transfer = 0;
-	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()));
 }
 
@@ -75,9 +75,9 @@ void Task::init()
 	d->transfer = 0;
 }
 
-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/yahoo/libkyahoo/task.h b/kopete/protocols/yahoo/libkyahoo/task.h
index fcdaf9ef..22458a8f 100644
--- a/kopete/protocols/yahoo/libkyahoo/task.h
+++ b/kopete/protocols/yahoo/libkyahoo/task.h
@@ -33,11 +33,11 @@ class Task : public TQObject
   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;
 	Transfer *transfer() const;
 	
diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
index d50d68b2..8c85705c 100644
--- a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
@@ -33,7 +33,7 @@
 
 using namespace KNetwork;
 
-WebcamTask::WebcamTask(Task* tqparent) : Task(tqparent)
+WebcamTask::WebcamTask(Task* parent) : Task(parent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 	transmittingData = false;
@@ -355,7 +355,7 @@ void WebcamTask::parseData( TQByteArray &data, KStreamSocket *socket )
 					// Send Invitation packets
 					for(it = pendingInvitations.begin(); it != pendingInvitations.end(); it++)
 					{
-						SendNotifyTask *snt = new SendNotifyTask( tqparent() );
+						SendNotifyTask *snt = new SendNotifyTask( parent() );
 						snt->setTarget( *it );
 						snt->setType( SendNotifyTask::NotifyWebcamInvite );
 						snt->go( true );
diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.h b/kopete/protocols/yahoo/libkyahoo/webcamtask.h
index db3756ff..1aff0537 100644
--- a/kopete/protocols/yahoo/libkyahoo/webcamtask.h
+++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.h
@@ -59,7 +59,7 @@ class WebcamTask : public Task
 	Q_OBJECT
   TQ_OBJECT
 public:
-	WebcamTask(Task *tqparent);
+	WebcamTask(Task *parent);
 	~WebcamTask();
 
 	bool take(Transfer *transfer);
diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
index be274230..278dcd31 100644
--- a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
@@ -27,7 +27,7 @@
 #include <kio/jobclasses.h>
 #include <klocale.h>
 
-YABTask::YABTask(Task* tqparent) : Task(tqparent)
+YABTask::YABTask(Task* parent) : Task(parent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 }
diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.h b/kopete/protocols/yahoo/libkyahoo/yabtask.h
index 16620fcd..3970e4a6 100644
--- a/kopete/protocols/yahoo/libkyahoo/yabtask.h
+++ b/kopete/protocols/yahoo/libkyahoo/yabtask.h
@@ -36,7 +36,7 @@ class YABTask : public Task
 	Q_OBJECT
   TQ_OBJECT
 public:
-	YABTask(Task *tqparent);
+	YABTask(Task *parent);
 	~YABTask();
 
 	bool take(Transfer *transfer);
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp
index 6b69bc70..3e2c4a19 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp
@@ -22,8 +22,8 @@
 
 #include "yahoobytestream.h"
 
-KNetworkByteStream::KNetworkByteStream( TQObject *tqparent )
- : ByteStream ( tqparent )
+KNetworkByteStream::KNetworkByteStream( TQObject *parent )
+ : ByteStream ( parent )
 {
 	kdDebug( 14181 ) << "Instantiating new KNetwork byte stream." << endl;
 
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h
index e84f70b0..d08641a9 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h
+++ b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h
@@ -35,7 +35,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-	KNetworkByteStream ( TQObject *tqparent = 0 );
+	KNetworkByteStream ( TQObject *parent = 0 );
 
 	~KNetworkByteStream ();
 
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
index 3f3af310..ad70d3c6 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
@@ -27,7 +27,7 @@
 #include <kio/jobclasses.h>
 #include <tqdom.h>
 
-YahooChatTask::YahooChatTask(Task* tqparent) : Task(tqparent)
+YahooChatTask::YahooChatTask(Task* parent) : Task(parent)
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 	m_loggedIn = false;
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoochattask.h b/kopete/protocols/yahoo/libkyahoo/yahoochattask.h
index ef20a815..a971cf0c 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.h
+++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.h
@@ -43,7 +43,7 @@ class YahooChatTask : public Task
 Q_OBJECT
   TQ_OBJECT
 public:
-	YahooChatTask(Task *tqparent);
+	YahooChatTask(Task *parent);
 	virtual ~YahooChatTask();
 
 	virtual void onGo();
diff --git a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp
index 3a15b03c..0d05d853 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp
@@ -102,8 +102,8 @@ public:
 	int noop_time;
 };
 
-ClientStream::ClientStream(Connector *conn, TQObject *tqparent)
-:Stream(tqparent), d(new Private())
+ClientStream::ClientStream(Connector *conn, TQObject *parent)
+:Stream(parent), d(new Private())
 {
 	kdDebug(YAHOO_RAW_DEBUG) ;
 
diff --git a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.h b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.h
index bc56eafd..87b60c82 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.h
+++ b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.h
@@ -72,7 +72,7 @@ public:
 		BindConflict                // resource in-use
 	};
 
-	explicit ClientStream(Connector *conn, TQObject *tqparent=0);
+	explicit ClientStream(Connector *conn, TQObject *parent=0);
 	~ClientStream();
 
 	void connectToServer(const TQString& server, bool auth=true);
diff --git a/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp b/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp
index dc54bf82..af485840 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp
@@ -25,8 +25,8 @@
 #include "yahoobytestream.h"
 #include "yahootypes.h"
 
-KNetworkConnector::KNetworkConnector( TQObject *tqparent )
-		: Connector( tqparent )
+KNetworkConnector::KNetworkConnector( TQObject *parent )
+		: Connector( parent )
 {
 	kdDebug( YAHOO_RAW_DEBUG ) << "New KNetwork connector." << endl;
 
diff --git a/kopete/protocols/yahoo/libkyahoo/yahooconnector.h b/kopete/protocols/yahoo/libkyahoo/yahooconnector.h
index 667138ed..889382bf 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahooconnector.h
+++ b/kopete/protocols/yahoo/libkyahoo/yahooconnector.h
@@ -37,7 +37,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-	KNetworkConnector( TQObject *tqparent = 0 );
+	KNetworkConnector( TQObject *parent = 0 );
 
 	virtual ~KNetworkConnector();
 
diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp
index 5517c3f2..d7a13b85 100644
--- a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp
@@ -36,8 +36,8 @@
 
 using namespace Yahoo;
 
-YMSGProtocol::YMSGProtocol(TQObject *tqparent, const char *name)
- : InputProtocolBase(tqparent, name)
+YMSGProtocol::YMSGProtocol(TQObject *parent, const char *name)
+ : InputProtocolBase(parent, name)
 {
 }
 
diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.h b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.h
index 1703e36f..8fa91498 100644
--- a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.h
+++ b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.h
@@ -29,7 +29,7 @@ Q_OBJECT
 public:
 
 
-	YMSGProtocol( TQObject *tqparent = 0, const char *name = 0 );
+	YMSGProtocol( TQObject *parent = 0, const char *name = 0 );
 	~YMSGProtocol();
 
 	/**
diff --git a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui
index 002c740b..144a0f33 100644
--- a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui
+++ b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui
@@ -270,10 +270,10 @@
                                             <cstring>edtServerAddress</cstring>
                                         </property>
                                         <property name="toolTip" stdset="0">
-                                            <string>The IP address or hosttqmask of the Yahoo server you wish to connect to.</string>
+                                            <string>The IP address or hostmask of the Yahoo server you wish to connect to.</string>
                                         </property>
                                         <property name="whatsThis" stdset="0">
-                                            <string>The IP address or hosttqmask of the Yahoo server you wish to connect to.  Normally you will want the default (scs.msg.yahoo.com).</string>
+                                            <string>The IP address or hostmask of the Yahoo server you wish to connect to.  Normally you will want the default (scs.msg.yahoo.com).</string>
                                         </property>
                                     </widget>
                                     <widget class="TQLineEdit">
@@ -287,10 +287,10 @@
                                             <string>scs.msg.yahoo.com</string>
                                         </property>
                                         <property name="toolTip" stdset="0">
-                                            <string>The IP address or hosttqmask of the Yahoo server you wish to connect to.</string>
+                                            <string>The IP address or hostmask of the Yahoo server you wish to connect to.</string>
                                         </property>
                                         <property name="whatsThis" stdset="0">
-                                            <string>The IP address or hosttqmask of the Yahoo server you wish to connect to.  Normally you will want the default (scs.msg.yahoo.com).</string>
+                                            <string>The IP address or hostmask of the Yahoo server you wish to connect to.  Normally you will want the default (scs.msg.yahoo.com).</string>
                                         </property>
                                     </widget>
                                     <widget class="TQLabel">
diff --git a/kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp b/kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp
index 6291f252..594e7a01 100644
--- a/kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp
+++ b/kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp
@@ -22,7 +22,7 @@
 #include <tqlistbox.h>
 #include <tqlineedit.h>
 
-YahooInviteListImpl::YahooInviteListImpl(TQWidget *tqparent, const char *name) : YahooInviteListBase(tqparent,name)
+YahooInviteListImpl::YahooInviteListImpl(TQWidget *parent, const char *name) : YahooInviteListBase(parent,name)
 {
 	listFriends->setSelectionMode( TQListBox::Extended );
 	listInvited->setSelectionMode( TQListBox::Extended );
diff --git a/kopete/protocols/yahoo/ui/yahooinvitelistimpl.h b/kopete/protocols/yahoo/ui/yahooinvitelistimpl.h
index 270fef08..30109a7d 100644
--- a/kopete/protocols/yahoo/ui/yahooinvitelistimpl.h
+++ b/kopete/protocols/yahoo/ui/yahooinvitelistimpl.h
@@ -27,7 +27,7 @@ class YahooInviteListImpl : public YahooInviteListBase
 	Q_OBJECT
   TQ_OBJECT
 public: 
-	YahooInviteListImpl(TQWidget *tqparent=0, const char *name=0);
+	YahooInviteListImpl(TQWidget *parent=0, const char *name=0);
 	~YahooInviteListImpl();
 	
 	void fillFriendList( const TQStringList &buddies );
diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp
index 2b3e357e..a19ebfff 100644
--- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp
+++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp
@@ -39,8 +39,8 @@
 #include "yahoootherinfowidget.h"
 #include "yahoocontact.h"
 
-YahooUserInfoDialog::YahooUserInfoDialog( YahooContact *c, TQWidget * tqparent, const char * name )
-: KDialogBase( KDialogBase::IconList, 0,  tqparent, name, false, i18n( "Yahoo User Information" ), User2|User1|Cancel, Cancel, false, i18n("Save and Close"), i18n("Merge with existing entry") )
+YahooUserInfoDialog::YahooUserInfoDialog( YahooContact *c, TQWidget * parent, const char * name )
+: KDialogBase( KDialogBase::IconList, 0,  parent, name, false, i18n( "Yahoo User Information" ), User2|User1|Cancel, Cancel, false, i18n("Save and Close"), i18n("Merge with existing entry") )
 {
 	kdDebug(14180) << k_funcinfo << "Creating new yahoo user info widget" << endl;
 	m_contact = c;
diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.h b/kopete/protocols/yahoo/ui/yahoouserinfodialog.h
index b7f9f3d2..6778a1af 100644
--- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.h
+++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.h
@@ -34,7 +34,7 @@ class YahooUserInfoDialog : public KDialogBase
 Q_OBJECT
   TQ_OBJECT
 public:
-	YahooUserInfoDialog( YahooContact *c, TQWidget* tqparent = 0, const char* name = 0 );
+	YahooUserInfoDialog( YahooContact *c, TQWidget* parent = 0, const char* name = 0 );
 	void setAccountConnected( bool isOnline );
 signals:
 	void saveYABEntry( YABEntry & );
diff --git a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp
index 9c37c07d..640164f1 100644
--- a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp
+++ b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp
@@ -27,9 +27,9 @@
 
 #include <webcamwidget.h>
 
-YahooWebcamDialog::YahooWebcamDialog( const TQString &contactId, TQWidget * tqparent, const char * name )
+YahooWebcamDialog::YahooWebcamDialog( const TQString &contactId, TQWidget * parent, const char * name )
 : KDialogBase( KDialogBase::Plain, i18n( "Webcam for %1" ).tqarg( contactId ),
-                   KDialogBase::Close, KDialogBase::Close, tqparent, name, false, true /*seperator*/ )
+                   KDialogBase::Close, KDialogBase::Close, parent, name, false, true /*seperator*/ )
 {
 	setInitialSize( TQSize(320,290), false );
 	
diff --git a/kopete/protocols/yahoo/ui/yahoowebcamdialog.h b/kopete/protocols/yahoo/ui/yahoowebcamdialog.h
index eb8e1626..3718841a 100644
--- a/kopete/protocols/yahoo/ui/yahoowebcamdialog.h
+++ b/kopete/protocols/yahoo/ui/yahoowebcamdialog.h
@@ -35,7 +35,7 @@ class YahooWebcamDialog : public KDialogBase
 Q_OBJECT
   TQ_OBJECT
 public:
-	YahooWebcamDialog( const TQString &, TQWidget* tqparent = 0, const char* name = 0 );
+	YahooWebcamDialog( const TQString &, TQWidget* parent = 0, const char* name = 0 );
 	~YahooWebcamDialog();
 	
 	void setViewer( const TQStringList & );
diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp
index 93395746..ecfb8139 100644
--- a/kopete/protocols/yahoo/yahooaccount.cpp
+++ b/kopete/protocols/yahoo/yahooaccount.cpp
@@ -66,14 +66,14 @@
 #include "yabentry.h"
 #include "yahoouserinfodialog.h"
 
-YahooAccount::YahooAccount(YahooProtocol *tqparent, const TQString& accountId, const char *name)
- : Kopete::PasswordedAccount(tqparent, accountId, 0, name)
+YahooAccount::YahooAccount(YahooProtocol *parent, const TQString& accountId, const char *name)
+ : Kopete::PasswordedAccount(parent, accountId, 0, name)
 {
 
 	// first things first - initialise internals
 	stateOnConnection = 0;
 	theHaveContactList = false;
-	m_protocol = tqparent;
+	m_protocol = parent;
 	m_session = new Client( this );
 	m_lastDisconnectCode = 0;
 	m_currentMailCount = 0;
@@ -101,7 +101,7 @@ YahooAccount::YahooAccount(YahooProtocol *tqparent, const TQString& accountId, c
 
 	YahooContact* _myself=new YahooContact( this, accountId.lower(), accountId, Kopete::ContactList::self()->myself() );
 	setMyself( _myself );
-	_myself->setOnlineStatus( tqparent->Offline );
+	_myself->setOnlineStatus( parent->Offline );
 	myself()->setProperty( YahooProtocol::protocol()->iconRemoteUrl, configGroup()->readEntry( "iconRemoteUrl", "" ) );
 	myself()->setProperty( Kopete::Global::Properties::self()->photo(), configGroup()->readEntry( "iconLocalUrl", "" ) );
 	myself()->setProperty( YahooProtocol::protocol()->iconCheckSum, configGroup()->readEntry( "iconCheckSum", 0 ) );
diff --git a/kopete/protocols/yahoo/yahooaccount.h b/kopete/protocols/yahoo/yahooaccount.h
index ac70d510..7cfc6f84 100644
--- a/kopete/protocols/yahoo/yahooaccount.h
+++ b/kopete/protocols/yahoo/yahooaccount.h
@@ -70,7 +70,7 @@ public:
 
 	enum SignalConnectionType { MakeConnections, DeleteConnections };
 
-	YahooAccount(YahooProtocol *tqparent,const TQString& accountID, const char *name = 0);
+	YahooAccount(YahooProtocol *parent,const TQString& accountID, const char *name = 0);
 	~YahooAccount();
 
 	/*
diff --git a/kopete/protocols/yahoo/yahooaddcontact.cpp b/kopete/protocols/yahoo/yahooaddcontact.cpp
index df9bca6d..af3e1bc5 100644
--- a/kopete/protocols/yahoo/yahooaddcontact.cpp
+++ b/kopete/protocols/yahoo/yahooaddcontact.cpp
@@ -33,9 +33,9 @@
 #include "yahooaccount.h"
 
 // Yahoo Add Contact page
-YahooAddContact::YahooAddContact(YahooProtocol *owner, TQWidget *tqparent, const char *name): AddContactPage(tqparent, name)
+YahooAddContact::YahooAddContact(YahooProtocol *owner, TQWidget *parent, const char *name): AddContactPage(parent, name)
 {
-	kdDebug(YAHOO_GEN_DEBUG) << "YahooAddContact::YahooAddContact(<owner>, <tqparent>, " << name << ")" << endl;
+	kdDebug(YAHOO_GEN_DEBUG) << "YahooAddContact::YahooAddContact(<owner>, <parent>, " << name << ")" << endl;
 
 	(new TQVBoxLayout(this))->setAutoAdd(true);
 	theDialog = new YahooAddContactBase(this);
diff --git a/kopete/protocols/yahoo/yahooaddcontact.h b/kopete/protocols/yahoo/yahooaddcontact.h
index ad07eb69..5f2e5744 100644
--- a/kopete/protocols/yahoo/yahooaddcontact.h
+++ b/kopete/protocols/yahoo/yahooaddcontact.h
@@ -41,7 +41,7 @@ private:
 	YahooAddContactBase *theDialog;
 
 public:
-	YahooAddContact(YahooProtocol *owner, TQWidget *tqparent = 0, const char *name = 0);
+	YahooAddContact(YahooProtocol *owner, TQWidget *parent = 0, const char *name = 0);
 	~YahooAddContact();
 
 	virtual bool validateData();
diff --git a/kopete/protocols/yahoo/yahooeditaccount.cpp b/kopete/protocols/yahoo/yahooeditaccount.cpp
index b43fb476..e047e849 100644
--- a/kopete/protocols/yahoo/yahooeditaccount.cpp
+++ b/kopete/protocols/yahoo/yahooeditaccount.cpp
@@ -47,7 +47,7 @@
 #include "yahooeditaccount.h"
 
 // Yahoo Add Contact page
-YahooEditAccount::YahooEditAccount(YahooProtocol *protocol, Kopete::Account *theAccount, TQWidget *tqparent, const char* /*name*/): YahooEditAccountBase(tqparent), KopeteEditAccountWidget(theAccount)
+YahooEditAccount::YahooEditAccount(YahooProtocol *protocol, Kopete::Account *theAccount, TQWidget *parent, const char* /*name*/): YahooEditAccountBase(parent), KopeteEditAccountWidget(theAccount)
 {
 	kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
 
diff --git a/kopete/protocols/yahoo/yahooeditaccount.h b/kopete/protocols/yahoo/yahooeditaccount.h
index 47a445f8..de7dcfd9 100644
--- a/kopete/protocols/yahoo/yahooeditaccount.h
+++ b/kopete/protocols/yahoo/yahooeditaccount.h
@@ -42,7 +42,7 @@ private:
 	Kopete::UI::PasswordWidget *mPasswordWidget;
 
 public:
-	YahooEditAccount(YahooProtocol *protocol, Kopete::Account *theAccount, TQWidget *tqparent = 0, const char *name = 0);
+	YahooEditAccount(YahooProtocol *protocol, Kopete::Account *theAccount, TQWidget *parent = 0, const char *name = 0);
 
 	virtual bool validateData();
 
diff --git a/kopete/protocols/yahoo/yahooprotocol.cpp b/kopete/protocols/yahoo/yahooprotocol.cpp
index fc132701..6197aa86 100644
--- a/kopete/protocols/yahoo/yahooprotocol.cpp
+++ b/kopete/protocols/yahoo/yahooprotocol.cpp
@@ -37,8 +37,8 @@
 typedef KGenericFactory<YahooProtocol> YahooProtocolFactory;
 K_EXPORT_COMPONENT_FACTORY( kopete_yahoo, YahooProtocolFactory( "kopete_yahoo" )  )
 
-YahooProtocol::YahooProtocol( TQObject *tqparent, const char *name, const TQStringList & )
-	: Kopete::Protocol( YahooProtocolFactory::instance(), tqparent, name ),
+YahooProtocol::YahooProtocol( TQObject *parent, const char *name, const TQStringList & )
+	: Kopete::Protocol( YahooProtocolFactory::instance(), parent, name ),
 	Offline( Kopete::OnlineStatus::Offline,      0, this, 0x5a55aa56, TQString(),  i18n( "Offline" ),       i18n( "Offline" ),     Kopete::OnlineStatusManager::Offline ),
 	Online( Kopete::OnlineStatus::Online,       25, this, 0, TQString(),           i18n( "Online" ),        i18n( "Online" ),      Kopete::OnlineStatusManager::Online, Kopete::OnlineStatusManager::HasAwayMessage  ),
 	BeRightBack( Kopete::OnlineStatus::Away,    22, this, 1, "contact_away_overlay",  i18n( "Be right back" ), i18n( "Be right back" ) ),
@@ -187,15 +187,15 @@ Kopete::Contact *YahooProtocol::deserializeContact( Kopete::MetaContact *metaCon
 	return theAccount->contacts()[contactId];
 }
 
-AddContactPage *YahooProtocol::createAddContactWidget( TQWidget * tqparent , Kopete::Account* )
+AddContactPage *YahooProtocol::createAddContactWidget( TQWidget * parent , Kopete::Account* )
 {
-	kdDebug(YAHOO_GEN_DEBUG) << "YahooProtocol::createAddContactWidget(<tqparent>)" << endl;
-	return new YahooAddContact(this, tqparent);
+	kdDebug(YAHOO_GEN_DEBUG) << "YahooProtocol::createAddContactWidget(<parent>)" << endl;
+	return new YahooAddContact(this, parent);
 }
 
-KopeteEditAccountWidget *YahooProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent)
+KopeteEditAccountWidget *YahooProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *parent)
 {
-	return new YahooEditAccount(this, account, tqparent);
+	return new YahooEditAccount(this, account, parent);
 }
 
 Kopete::Account *YahooProtocol::createNewAccount(const TQString &accountId)
diff --git a/kopete/protocols/yahoo/yahooprotocol.h b/kopete/protocols/yahoo/yahooprotocol.h
index f454e4c6..c12cb8c9 100644
--- a/kopete/protocols/yahoo/yahooprotocol.h
+++ b/kopete/protocols/yahoo/yahooprotocol.h
@@ -44,7 +44,7 @@ class YahooProtocol : public Kopete::Protocol
 	Q_OBJECT
   TQ_OBJECT
 public:
-	YahooProtocol( TQObject *tqparent, const char *name, const TQStringList &args );
+	YahooProtocol( TQObject *parent, const char *name, const TQStringList &args );
 	~YahooProtocol();
 
 	//Online Statuses
@@ -133,8 +133,8 @@ public:
 	Kopete::OnlineStatus statusFromYahoo( int status );
 
 public slots:
-	virtual AddContactPage *createAddContactWidget(TQWidget * tqparent, Kopete::Account* a);
-	virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent);
+	virtual AddContactPage *createAddContactWidget(TQWidget * parent, Kopete::Account* a);
+	virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *parent);
 	virtual Kopete::Account *createNewAccount(const TQString &accountId);
 
 
diff --git a/kopete/protocols/yahoo/yahooverifyaccount.cpp b/kopete/protocols/yahoo/yahooverifyaccount.cpp
index 5ea7b340..7d50e900 100644
--- a/kopete/protocols/yahoo/yahooverifyaccount.cpp
+++ b/kopete/protocols/yahoo/yahooverifyaccount.cpp
@@ -37,8 +37,8 @@
 #include "yahooverifyaccount.h"
 #include "yahooaccount.h"
 
-YahooVerifyAccount::YahooVerifyAccount(Kopete::Account *account, TQWidget *tqparent, const char *name)
-: KDialogBase(tqparent, name, true, i18n("Account Verification - Yahoo"), Cancel|Apply,
+YahooVerifyAccount::YahooVerifyAccount(Kopete::Account *account, TQWidget *parent, const char *name)
+: KDialogBase(parent, name, true, i18n("Account Verification - Yahoo"), Cancel|Apply,
               Apply, true )
 {
 	mTheAccount = account;	
diff --git a/kopete/protocols/yahoo/yahooverifyaccount.h b/kopete/protocols/yahoo/yahooverifyaccount.h
index c78d6e11..666e3561 100644
--- a/kopete/protocols/yahoo/yahooverifyaccount.h
+++ b/kopete/protocols/yahoo/yahooverifyaccount.h
@@ -37,7 +37,7 @@ private:
 	KTempFile *mFile;
 	YahooVerifyAccountBase *mTheDialog;
 public:
-	YahooVerifyAccount(Kopete::Account *account, TQWidget *tqparent = 0, const char *name = 0);
+	YahooVerifyAccount(Kopete::Account *account, TQWidget *parent = 0, const char *name = 0);
 	~YahooVerifyAccount();
 
 	virtual bool validateData();