11 files changed, 25 insertions, 25 deletions
diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp
index 2b90459e..eb881c70 100644
--- a/kopete/protocols/winpopup/wpaccount.cpp
+++ b/kopete/protocols/winpopup/wpaccount.cpp
@@ -34,8 +34,8 @@
 
 class KPopupMenu;
 
-WPAccount::WPAccount(WPProtocol *tqparent, const TQString &accountID, const char *name)
-	: Kopete::Account(tqparent, accountID, name)
+WPAccount::WPAccount(WPProtocol *parent, const TQString &accountID, const char *name)
+	: Kopete::Account(parent, accountID, name)
 {
 //	kdDebug(14170) <<  "WPAccount::WPAccount()" << endl;
 
diff --git a/kopete/protocols/winpopup/wpaccount.h b/kopete/protocols/winpopup/wpaccount.h
index d11d5885..04f8ea20 100644
--- a/kopete/protocols/winpopup/wpaccount.h
+++ b/kopete/protocols/winpopup/wpaccount.h
@@ -52,7 +52,7 @@ class WPAccount : public Kopete::Account
 
 // Kopete::Account overloading
 public:
-	WPAccount(WPProtocol *tqparent, const TQString& accountID, const char *name = 0);
+	WPAccount(WPProtocol *parent, const TQString& accountID, const char *name = 0);
 	~WPAccount();
 
 	virtual KActionMenu* actionMenu();			// Per-protocol actions for the systray and the status bar
diff --git a/kopete/protocols/winpopup/wpaddcontact.cpp b/kopete/protocols/winpopup/wpaddcontact.cpp
index a681f48b..25e4b6d8 100644
--- a/kopete/protocols/winpopup/wpaddcontact.cpp
+++ b/kopete/protocols/winpopup/wpaddcontact.cpp
@@ -36,9 +36,9 @@
 #include "wpaccount.h"
 #include "wpaddcontact.h"
 
-WPAddContact::WPAddContact(TQWidget *tqparent, WPAccount *newAccount, const char *name) : AddContactPage(tqparent, name)
+WPAddContact::WPAddContact(TQWidget *parent, WPAccount *newAccount, const char *name) : AddContactPage(parent, name)
 {
-//	kdDebug(14170) << "WPAddContact::WPAddContact(<owner>, " << newAccount << ", <tqparent>, " << name << ")" << endl;
+//	kdDebug(14170) << "WPAddContact::WPAddContact(<owner>, " << newAccount << ", <parent>, " << name << ")" << endl;
 
 	(new TQVBoxLayout(this))->setAutoAdd(true);
 	theDialog = new WPAddContactBase(this);
diff --git a/kopete/protocols/winpopup/wpaddcontact.h b/kopete/protocols/winpopup/wpaddcontact.h
index 03b3d51d..59ebaecd 100644
--- a/kopete/protocols/winpopup/wpaddcontact.h
+++ b/kopete/protocols/winpopup/wpaddcontact.h
@@ -41,7 +41,7 @@ private:
 	WPAddContactBase *theDialog;
 
 public:
-	WPAddContact(TQWidget *tqparent, WPAccount *newAccount, const char *name = 0);
+	WPAddContact(TQWidget *parent, WPAccount *newAccount, const char *name = 0);
 	~WPAddContact();
 
 	virtual bool validateData();
diff --git a/kopete/protocols/winpopup/wpcontact.cpp b/kopete/protocols/winpopup/wpcontact.cpp
index 1fd29905..1aff6e32 100644
--- a/kopete/protocols/winpopup/wpcontact.cpp
+++ b/kopete/protocols/winpopup/wpcontact.cpp
@@ -30,7 +30,7 @@
 WPContact::WPContact(Kopete::Account *account, const TQString &newHostName, const TQString &nickName, Kopete::MetaContact *metaContact)
 	: Kopete::Contact(account, newHostName, metaContact)
 {
-//	kdDebug(14170) << "WPContact::WPContact(<account>, " << newHostName << ", " << nickName << ", <tqparent>)" << endl;
+//	kdDebug(14170) << "WPContact::WPContact(<account>, " << newHostName << ", " << nickName << ", <parent>)" << endl;
 	kdDebug(14170) << "WPContact::WPContact: " << this << endl;
 
 	TQString theNickName = nickName;
@@ -57,7 +57,7 @@ WPContact::WPContact(Kopete::Account *account, const TQString &newHostName, cons
 
 TQPtrList<KAction> * WPContact::customContextMenuActions()
 {
-	//myActionCollection = new KActionCollection(tqparent);
+	//myActionCollection = new KActionCollection(parent);
 	return 0;
 }
 
diff --git a/kopete/protocols/winpopup/wpeditaccount.cpp b/kopete/protocols/winpopup/wpeditaccount.cpp
index 05312330..217ac462 100644
--- a/kopete/protocols/winpopup/wpeditaccount.cpp
+++ b/kopete/protocols/winpopup/wpeditaccount.cpp
@@ -45,10 +45,10 @@
 #include "wpeditaccount.h"
 #include "wpprotocol.h"
 
-WPEditAccount::WPEditAccount(TQWidget *tqparent, Kopete::Account *theAccount)
-	: WPEditAccountBase(tqparent), KopeteEditAccountWidget(theAccount)
+WPEditAccount::WPEditAccount(TQWidget *parent, Kopete::Account *theAccount)
+	: WPEditAccountBase(parent), KopeteEditAccountWidget(theAccount)
 {
-	kdDebug(14170) << "WPEditAccount::WPEditAccount(<tqparent>, <theAccount>)";
+	kdDebug(14170) << "WPEditAccount::WPEditAccount(<parent>, <theAccount>)";
 
 	mProtocol = WPProtocol::protocol();
 
diff --git a/kopete/protocols/winpopup/wpeditaccount.h b/kopete/protocols/winpopup/wpeditaccount.h
index f573c000..4101c37a 100644
--- a/kopete/protocols/winpopup/wpeditaccount.h
+++ b/kopete/protocols/winpopup/wpeditaccount.h
@@ -42,7 +42,7 @@ private:
 	WPAccount *mAccount;
 
 public:
-	WPEditAccount(TQWidget *tqparent, Kopete::Account *theAccount);
+	WPEditAccount(TQWidget *parent, Kopete::Account *theAccount);
 
 	virtual bool validateData();
 	void writeConfig();
diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp
index 610cb598..a6805a7e 100644
--- a/kopete/protocols/winpopup/wpprotocol.cpp
+++ b/kopete/protocols/winpopup/wpprotocol.cpp
@@ -48,8 +48,8 @@ typedef KGenericFactory<WPProtocol> WPProtocolFactory;
 K_EXPORT_COMPONENT_FACTORY( kopete_wp, WPProtocolFactory( "kopete_wp" )  )
 
 // WP Protocol
-WPProtocol::WPProtocol( TQObject *tqparent, const char *name, const TQStringList & /* args */ )
-: Kopete::Protocol( WPProtocolFactory::instance(), tqparent, name ),
+WPProtocol::WPProtocol( TQObject *parent, const char *name, const TQStringList & /* args */ )
+: Kopete::Protocol( WPProtocolFactory::instance(), parent, name ),
 	WPOnline(  Kopete::OnlineStatus::Online,  25, this, 0,  TQString(), i18n("Online"),  i18n("Online")),
 	WPAway(    Kopete::OnlineStatus::Away,    20, this, 1,  "wp_away",     i18n("Away"),    i18n("Away")),
 	WPOffline( Kopete::OnlineStatus::Offline, 0,  this, 2,  TQString(), i18n("Offline"), i18n("Offline"))
@@ -79,11 +79,11 @@ WPProtocol::~WPProtocol()
 	sProtocol = 0;
 }
 
-AddContactPage *WPProtocol::createAddContactWidget(TQWidget *tqparent, Kopete::Account *theAccount)
+AddContactPage *WPProtocol::createAddContactWidget(TQWidget *parent, Kopete::Account *theAccount)
 {
-//	kdDebug(14170) << "WPProtocol::createAddContactWidget(<tqparent>, " << theAccount << ")" << endl;
+//	kdDebug(14170) << "WPProtocol::createAddContactWidget(<parent>, " << theAccount << ")" << endl;
 
-	return new WPAddContact(tqparent, dynamic_cast<WPAccount *>(theAccount));
+	return new WPAddContact(parent, dynamic_cast<WPAccount *>(theAccount));
 }
 
 Kopete::Contact *WPProtocol::deserializeContact( Kopete::MetaContact *metaContact,
@@ -108,9 +108,9 @@ Kopete::Contact *WPProtocol::deserializeContact( Kopete::MetaContact *metaContac
 	return theAccount->contacts()[contactId];
 }
 
-KopeteEditAccountWidget *WPProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent)
+KopeteEditAccountWidget *WPProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *parent)
 {
-	return new WPEditAccount(tqparent, account);
+	return new WPEditAccount(parent, account);
 }
 
 Kopete::Account *WPProtocol::createNewAccount(const TQString &accountId)
diff --git a/kopete/protocols/winpopup/wpprotocol.h b/kopete/protocols/winpopup/wpprotocol.h
index defd7dc8..acff4cc0 100644
--- a/kopete/protocols/winpopup/wpprotocol.h
+++ b/kopete/protocols/winpopup/wpprotocol.h
@@ -52,11 +52,11 @@ class WPProtocol : public Kopete::Protocol
 
 // Kopete::Protocol overloading
 public:
-	WPProtocol( TQObject *tqparent, const char *name, const TQStringList &args );
+	WPProtocol( TQObject *parent, const char *name, const TQStringList &args );
 	~WPProtocol();
 
-	virtual AddContactPage *createAddContactWidget(TQWidget *tqparent, Kopete::Account *theAccount);
-	virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent);
+	virtual AddContactPage *createAddContactWidget(TQWidget *parent, Kopete::Account *theAccount);
+	virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *parent);
 	virtual Kopete::Account *createNewAccount(const TQString &accountId);
 
 	const TQStringList getGroups() {return popupClient->getGroups(); }
diff --git a/kopete/protocols/winpopup/wpuserinfo.cpp b/kopete/protocols/winpopup/wpuserinfo.cpp
index d5e01138..c602b70e 100644
--- a/kopete/protocols/winpopup/wpuserinfo.cpp
+++ b/kopete/protocols/winpopup/wpuserinfo.cpp
@@ -32,8 +32,8 @@
 #include "wpaccount.h"
 #include "wpcontact.h"
 
-WPUserInfo::WPUserInfo( WPContact *contact, WPAccount */*account*/, TQWidget *tqparent, const char* name )
-	: KDialogBase( tqparent, name, false, TQString(), Close, Close, false ), m_contact(contact),
+WPUserInfo::WPUserInfo( WPContact *contact, WPAccount */*account*/, TQWidget *parent, const char* name )
+	: KDialogBase( parent, name, false, TQString(), Close, Close, false ), m_contact(contact),
 	  Comment(i18n("N/A")), Workgroup(i18n("N/A")), OS(i18n("N/A")), Software(i18n("N/A"))
 {
 //	kdDebug( 14170 ) << k_funcinfo << endl;
diff --git a/kopete/protocols/winpopup/wpuserinfo.h b/kopete/protocols/winpopup/wpuserinfo.h
index bea23dc8..4d9bd098 100644
--- a/kopete/protocols/winpopup/wpuserinfo.h
+++ b/kopete/protocols/winpopup/wpuserinfo.h
@@ -37,7 +37,7 @@ class WPUserInfo : public KDialogBase
   TQ_OBJECT
 
 	public:
-		WPUserInfo( WPContact *, WPAccount *, TQWidget *tqparent = 0, const char* name = "WPUserInfo" );
+		WPUserInfo( WPContact *, WPAccount *, TQWidget *parent = 0, const char* name = "WPUserInfo" );
 
 		void startDetailsProcess(const TQString &host);