TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


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

1 files changed, 10 insertions, 10 deletions

diff --git a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp
index 076b92b8..90f4f1e0 100644
--- a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp
+++ b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp
@@ -35,7 +35,7 @@
 #include "jabberclient.h"
 #include "xmpp_tasks.h"
 
-JabberAddContactPage::JabberAddContactPage (Kopete::Account * owner, TQWidget * parent, const char *name):AddContactPage (parent, name)
+JabberAddContactPage::JabberAddContactPage (Kopete::Account * owner, TQWidget * tqparent, const char *name):AddContactPage (tqparent, name)
 {
 	(new TQVBoxLayout (this))->setAutoAdd (true);
 	
@@ -76,7 +76,7 @@ bool JabberAddContactPage::validateData ()
 }
 
 
-bool JabberAddContactPage::apply ( Kopete::Account *account, Kopete::MetaContact *parentContact )
+bool JabberAddContactPage::apply ( Kopete::Account *account, Kopete::MetaContact *tqparentContact )
 {
 
 	if( canadd && validateData () )
@@ -90,25 +90,25 @@ bool JabberAddContactPage::apply ( Kopete::Account *account, Kopete::MetaContact
 		{
 			XMPP::JT_Gateway * gatewayTask = new XMPP::JT_Gateway ( jaccount->client()->rootTask () );
 			JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND *workaround = 
-					new JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( transport , parentContact , gatewayTask );
+					new JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( transport , tqparentContact , gatewayTask );
 			TQObject::connect (gatewayTask, TQT_SIGNAL (finished ()), workaround, TQT_SLOT (slotJidReceived()));
 			gatewayTask->set ( transport->myself()->contactId() , contactId );
 			gatewayTask->go ( true );
 			return true;
 		}
 		
-		TQString displayName = parentContact->displayName ();
+		TQString displayName = tqparentContact->displayName ();
 		/*		
 		if ( displayName.isEmpty () )
 			displayName = contactId;
 		*/
 		// collect all group names
 		TQStringList groupNames;
-		Kopete::GroupList groupList = parentContact->groups();
+		Kopete::GroupList groupList = tqparentContact->groups();
 		for(Kopete::Group *group = groupList.first(); group; group = groupList.next())
 			groupNames += group->displayName();
 
-		if ( jaccount->addContact ( contactId, parentContact, Kopete::Account::ChangeKABC ) )
+		if ( jaccount->addContact ( contactId, tqparentContact, Kopete::Account::ChangeKABC ) )
 		{
 			XMPP::RosterItem item;
 			XMPP::Jid jid ( contactId );
@@ -167,25 +167,25 @@ void JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND::slot
 
 	TQString contactId=task->prompt();
 	
-	Kopete::MetaContact* parentContact=metacontact;
+	Kopete::MetaContact* tqparentContact=metacontact;
 	JabberAccount *jaccount=transport->account();;
 	
 	/*\
 	 *   this is a copy of the end of JabberAddContactPage::apply
 	\*/
 	
-	TQString displayName = parentContact->displayName ();
+	TQString displayName = tqparentContact->displayName ();
 		/*		
 	if ( displayName.isEmpty () )
 	displayName = contactId;
 		*/
 		// collect all group names
 	TQStringList groupNames;
-	Kopete::GroupList groupList = parentContact->groups();
+	Kopete::GroupList groupList = tqparentContact->groups();
 	for(Kopete::Group *group = groupList.first(); group; group = groupList.next())
 		groupNames += group->displayName();
 
-	if ( jaccount->addContact ( contactId, parentContact, Kopete::Account::ChangeKABC ) )
+	if ( jaccount->addContact ( contactId, tqparentContact, Kopete::Account::ChangeKABC ) )
 	{
 		XMPP::RosterItem item;
 		XMPP::Jid jid ( contactId );