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, 70 insertions, 70 deletions

diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp
index 267cd0d7..567ff91e 100644
--- a/kopete/protocols/msn/msnaccount.cpp
+++ b/kopete/protocols/msn/msnaccount.cpp
@@ -61,8 +61,8 @@
 #include "avdevice/videodevicepool.h"
 #endif
 
-MSNAccount::MSNAccount( MSNProtocol *parent, const TQString& AccountID, const char *name )
-	: Kopete::PasswordedAccount ( parent, AccountID.lower(), 0, name )
+MSNAccount::MSNAccount( MSNProtocol *tqparent, const TQString& AccountID, const char *name )
+	: Kopete::PasswordedAccount ( tqparent, AccountID.lower(), 0, name )
 {
 	m_notifySocket = 0L;
 	m_connectstatus = MSNProtocol::protocol()->NLN;
@@ -81,7 +81,7 @@ MSNAccount::MSNAccount( MSNProtocol *parent, const TQString& AccountID, const ch
 	TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( globalIdentityChanged(const TQString&, const TQVariant& ) ), TQT_SLOT( slotGlobalIdentityChanged(const TQString&, const TQVariant& ) ));
 
 	m_openInboxAction = new KAction( i18n( "Open Inbo&x..." ), "mail_generic", 0, this, TQT_SLOT( slotOpenInbox() ), this, "m_openInboxAction" );
-	m_changeDNAction = new KAction( i18n( "&Change Display Name..." ), TQString::null, 0, this, TQT_SLOT( slotChangePublicName() ), this, "renameAction" );
+	m_changeDNAction = new KAction( i18n( "&Change Display Name..." ), TQString(), 0, this, TQT_SLOT( slotChangePublicName() ), this, "renameAction" );
 	m_startChatAction = new KAction( i18n( "&Start Chat..." ), "mail_generic", 0, this, TQT_SLOT( slotStartChat() ), this, "startChatAction" );
 
 
@@ -92,7 +92,7 @@ MSNAccount::MSNAccount( MSNProtocol *parent, const TQString& AccountID, const ch
 	m_reverseList = config->readListEntry(  "reverseList"  ) ;
 
 	// Load the avatar
-	m_pictureFilename = locateLocal( "appdata", "msnpicture-"+ accountId().lower().replace(TQRegExp("[./~]"),"-")  +".png"  );
+	m_pictureFilename = locateLocal( "appdata", "msnpicture-"+ accountId().lower().tqreplace(TQRegExp("[./~]"),"-")  +".png"  );
 	resetPictureObject(true);
 
 	static_cast<MSNContact *>( myself() )->setInfo( "PHH", config->readEntry("PHH") );
@@ -231,7 +231,7 @@ void MSNAccount::createNotificationServer( const TQString &host, uint port )
 	TQObject::connect( m_notifySocket, TQT_SIGNAL( errorMessage(int, const TQString& ) ), 
 		TQT_SLOT( slotErrorMessageReceived(int, const TQString& ) ) );
 
-	m_notifySocket->setStatus( m_connectstatus );
+	m_notifySocket->settqStatus( m_connectstatus );
 	m_notifySocket->connect(host, port);
 }
 
@@ -288,7 +288,7 @@ void MSNAccount::setOnlineStatus( const Kopete::OnlineStatus &status , const TQS
 	kdDebug( 14140 ) << k_funcinfo << status.description() << endl;
 
 	// HACK: When changing song, do don't anything while connected
-	if( reason.contains("[Music]") && ( status == MSNProtocol::protocol()->UNK || status == MSNProtocol::protocol()->CNT ) )
+	if( reason.tqcontains("[Music]") && ( status == MSNProtocol::protocol()->UNK || status == MSNProtocol::protocol()->CNT ) )
 		return;
 
 	// Only send personal message when logged.
@@ -296,7 +296,7 @@ void MSNAccount::setOnlineStatus( const Kopete::OnlineStatus &status , const TQS
 	{
 		// Only update the personal/status message, don't change the online status
 		// since it's the same.
-		if( reason.contains("[Music]") )
+		if( reason.tqcontains("[Music]") )
 		{
 			TQString personalMessage = reason.section("[Music]", 1);
 			setPersonalMessage( MSNProtocol::PersonalMessageMusic, personalMessage );
@@ -314,7 +314,7 @@ void MSNAccount::setOnlineStatus( const Kopete::OnlineStatus &status , const TQS
 		disconnect();
 	else if ( m_notifySocket )
 	{
-		m_notifySocket->setStatus( status );
+		m_notifySocket->settqStatus( status );
 	}
 	else
 	{
@@ -330,7 +330,7 @@ void MSNAccount::slotStartChat()
 
 	bool ok;
 	TQString handle = KInputDialog::getText( i18n( "Start Chat - MSN Plugin" ),
-		i18n( "Please enter the email address of the person with whom you want to chat:" ), TQString::null, &ok ).lower();
+		i18n( "Please enter the email address of the person with whom you want to chat:" ), TQString(), &ok ).lower();
 	if ( ok )
 	{
 		if ( MSNProtocol::validContactId( handle ) )
@@ -359,7 +359,7 @@ void MSNAccount::slotDebugRawCommand()
 	if ( result == TQDialog::Accepted && m_notifySocket )
 	{
 		m_notifySocket->sendCommand( dlg->command(), dlg->params(),
-					dlg->addId(), dlg->msg().replace( "\n", "\r\n" ).utf8() );
+					dlg->addId(), dlg->msg().tqreplace( "\n", "\r\n" ).utf8() );
 	}
 	delete dlg;
 #endif
@@ -409,7 +409,7 @@ void MSNAccount::slotNotifySocketClosed()
 	m_notifySocket->deleteLater();
 	m_notifySocket = 0l;
 	myself()->setOnlineStatus( MSNProtocol::protocol()->FLN );
-	setAllContactsStatus( MSNProtocol::protocol()->FLN );
+	setAllContactstqStatus( MSNProtocol::protocol()->FLN );
 	disconnected(reason);
 
 	
@@ -484,7 +484,7 @@ void MSNAccount::setPublicName( const TQString &publicName )
 {
 	if ( m_notifySocket )
 	{
-		m_notifySocket->changePublicName( publicName, TQString::null );
+		m_notifySocket->changePublicName( publicName, TQString() );
 	}
 }
 
@@ -503,7 +503,7 @@ void MSNAccount::setPersonalMessage( MSNProtocol::PersonalMessageType type, cons
 
 void MSNAccount::slotGroupAdded( const TQString& groupName, const TQString &groupGuid )
 {
-	if ( m_groupList.contains( groupGuid ) )
+	if ( m_groupList.tqcontains( groupGuid ) )
 	{
 		// Group can already be in the list since the idle timer does a 'List Groups'
 		// command. Simply return, don't issue a warning.
@@ -587,7 +587,7 @@ void MSNAccount::slotGroupAdded( const TQString& groupName, const TQString &grou
 	m_groupList.insert( groupGuid, fallBack );
 
 	// We have pending groups that we need add a contact to
-	if ( tmp_addToNewGroup.contains(groupName) )
+	if ( tmp_addToNewGroup.tqcontains(groupName) )
 	{
 		TQStringList list=tmp_addToNewGroup[groupName];
 		for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
@@ -596,12 +596,12 @@ void MSNAccount::slotGroupAdded( const TQString& groupName, const TQString &grou
 			kdDebug( 14140 ) << k_funcinfo << "Adding to new group: " << contactId <<  endl;
 			MSNContact *c = static_cast<MSNContact *>(contacts()[contactId]);
 			if(c && c->hasProperty(MSNProtocol::protocol()->propGuid.key()) )
-				notifySocket()->addContact( contactId, MSNProtocol::FL, TQString::null, c->guid(), groupGuid );
+				notifySocket()->addContact( contactId, MSNProtocol::FL, TQString(), c->guid(), groupGuid );
 			else
 			{
 				// If we get to here, we're currently adding a new contact, add the groupGUID to the groupList
 				// to add when contact will be added to contactlist.
-				if( tmp_addNewContactToGroup.contains( contactId ) )
+				if( tmp_addNewContactToGroup.tqcontains( contactId ) )
 					tmp_addNewContactToGroup[contactId].append(groupGuid);
 				else
 					tmp_addNewContactToGroup.insert(contactId, TQStringList(groupGuid) );
@@ -613,7 +613,7 @@ void MSNAccount::slotGroupAdded( const TQString& groupName, const TQString &grou
 
 void MSNAccount::slotGroupRenamed( const TQString &groupGuid, const TQString& groupName )
 {
-	if ( m_groupList.contains( groupGuid ) )
+	if ( m_groupList.tqcontains( groupGuid ) )
 	{
 		m_groupList[ groupGuid ]->setPluginData( protocol(), accountId() + " id", groupGuid );
 		m_groupList[ groupGuid ]->setPluginData( protocol(), accountId() + " displayName", groupName );
@@ -627,7 +627,7 @@ void MSNAccount::slotGroupRenamed( const TQString &groupGuid, const TQString& gr
 
 void MSNAccount::slotGroupRemoved( const TQString& groupGuid )
 {
-	if ( m_groupList.contains( groupGuid ) )
+	if ( m_groupList.tqcontains( groupGuid ) )
 	{
 		m_groupList[ groupGuid ]->setPluginData( protocol(), TQMap<TQString,TQString>() );
 		m_groupList.remove( groupGuid );
@@ -638,7 +638,7 @@ void MSNAccount::addGroup( const TQString &groupName, const TQString& contactToA
 {
 	if ( !contactToAdd.isNull()  )
 	{
-		if( tmp_addToNewGroup.contains(groupName) )
+		if( tmp_addToNewGroup.tqcontains(groupName) )
 		{
 			tmp_addToNewGroup[groupName].append(contactToAdd);
 			//A group with the same name is about to be added,
@@ -664,7 +664,7 @@ void MSNAccount::slotKopeteGroupRenamed( Kopete::Group *g )
 	{
 		if ( !g->pluginData( protocol(), accountId() + " id" ).isEmpty() &&
 			g->displayName() != g->pluginData( protocol(), accountId() + " displayName" ) &&
-			m_groupList.contains( g->pluginData( protocol(), accountId() + " id" ) ) )
+			m_groupList.tqcontains( g->pluginData( protocol(), accountId() + " id" ) ) )
 		{
 			notifySocket()->renameGroup( g->displayName(), g->pluginData( protocol(), accountId() + " id" ) );
 		}
@@ -683,7 +683,7 @@ void MSNAccount::slotKopeteGroupRemoved( Kopete::Group *g )
 	if ( !g->pluginData( protocol(), accountId() + " id" ).isEmpty() )
 	{
 		TQString groupGuid = g->pluginData( protocol(), accountId() + " id" );
-		if ( !m_groupList.contains( groupGuid ) )
+		if ( !m_groupList.tqcontains( groupGuid ) )
 		{
 			// the group is maybe already removed in the server
 			slotGroupRemoved( groupGuid );
@@ -703,7 +703,7 @@ void MSNAccount::slotKopeteGroupRemoved( Kopete::Group *g )
 
 			Kopete::Group::topLevel()->setPluginData( protocol(), accountId() + " id", "" );
 			Kopete::Group::topLevel()->setPluginData( protocol(), accountId() + " displayName", g->pluginData( protocol(), accountId() + " displayName" ) );
-			g->setPluginData( protocol(), accountId() + " id", TQString::null ); // the group should be soon deleted, but make sure
+			g->setPluginData( protocol(), accountId() + " id", TQString() ); // the group should be soon deleted, but make sure
 
 			return;
 		}
@@ -716,7 +716,7 @@ void MSNAccount::slotKopeteGroupRemoved( Kopete::Group *g )
 			for ( ; it.current(); ++it )
 			{
 				MSNContact *c = static_cast<MSNContact *>( it.current() );
-				if ( c && c->serverGroups().contains( groupGuid )  )
+				if ( c && c->serverGroups().tqcontains( groupGuid )  )
 				{
 					/** don't do that becasue theses may already have been sent
 					m_notifySocket->removeContact( c->contactId(), groupNumber, MSNProtocol::FL );
@@ -737,7 +737,7 @@ void MSNAccount::slotNewContactList()
 		for(TQMap<TQString, Kopete::Group*>::Iterator it=m_oldGroupList.begin() ; it != m_oldGroupList.end() ; ++it )
 		{	//they are about to be changed
 			if(it.data())
-				it.data()->setPluginData( protocol(), accountId() + " id", TQString::null );
+				it.data()->setPluginData( protocol(), accountId() + " id", TQString() );
 		}
 
 		m_allowList.clear();
@@ -745,9 +745,9 @@ void MSNAccount::slotNewContactList()
 		m_reverseList.clear();
 		m_groupList.clear();
 		KConfigGroup *config=configGroup();
-		config->writeEntry( "blockList" , TQString::null ) ;
-		config->writeEntry( "allowList" , TQString::null );
-		config->writeEntry( "reverseList" , TQString::null );
+		config->writeEntry( "blockList" , TQString() ) ;
+		config->writeEntry( "allowList" , TQString() );
+		config->writeEntry( "reverseList" , TQString() );
 
 		// clear all date information which will be received.
 		// if the information is not anymore on the server, it will not be received
@@ -759,9 +759,9 @@ void MSNAccount::slotNewContactList()
 			c->setAllowed( false );
 			c->setReversed( false );
 			c->setDeleted( true );
-			c->setInfo( "PHH", TQString::null );
-			c->setInfo( "PHW", TQString::null );
-			c->setInfo( "PHM", TQString::null );
+			c->setInfo( "PHH", TQString() );
+			c->setInfo( "PHW", TQString() );
+			c->setInfo( "PHM", TQString() );
 			c->removeProperty( MSNProtocol::protocol()->propGuid );
 		}
 		m_newContactList=true;
@@ -804,11 +804,11 @@ void MSNAccount::slotContactListed( const TQString& handle, const TQString& publ
 			for ( TQStringList::ConstIterator it = contactGroups.begin(); it != contactGroups.end(); ++it )
 			{
 				TQString newServerGroupID =  *it;
-				if(m_groupList.contains(newServerGroupID))
+				if(m_groupList.tqcontains(newServerGroupID))
 				{
 					Kopete::Group *newServerGroup=m_groupList[ newServerGroupID ] ;
 					c->contactAddedToGroup( newServerGroupID, newServerGroup );
-					if( !c->metaContact()->groups().contains(newServerGroup) )
+					if( !c->metaContact()->groups().tqcontains(newServerGroup) )
 					{
 						// The contact has been added in a group by another client
 						c->metaContact()->addToGroup( newServerGroup );
@@ -822,7 +822,7 @@ void MSNAccount::slotContactListed( const TQString& handle, const TQString& publ
 				if(old_group)
 				{
 					TQString oldnewID=old_group->pluginData(protocol() , accountId() +" id");
-					if ( !oldnewID.isEmpty() && contactGroups.contains( oldnewID ) )
+					if ( !oldnewID.isEmpty() && contactGroups.tqcontains( oldnewID ) )
 						continue; //ok, it's correctn no need to do anything.
 
 					c->metaContact()->removeFromGroup( old_group );
@@ -851,7 +851,7 @@ void MSNAccount::slotContactListed( const TQString& handle, const TQString& publ
 				it != contactGroups.end(); ++it )
 			{
 				TQString groupGuid = *it;
-				if(m_groupList.contains(groupGuid))
+				if(m_groupList.tqcontains(groupGuid))
 				{
 					c->contactAddedToGroup( groupGuid, m_groupList[ groupGuid ] );
 					metaContact->addToGroup( m_groupList[ groupGuid ] );
@@ -874,21 +874,21 @@ void MSNAccount::slotContactListed( const TQString& handle, const TQString& publ
 		}
 	}
 	if ( lists & 2 )
-		slotContactAdded( handle, "AL", publicName, TQString::null, TQString::null );
+		slotContactAdded( handle, "AL", publicName, TQString(), TQString() );
 	else if(c)
 		c->setAllowed(false);
 	if ( lists & 4 )
-		slotContactAdded( handle, "BL", publicName, TQString::null, TQString::null );
+		slotContactAdded( handle, "BL", publicName, TQString(), TQString() );
 	else if(c)
 		c->setBlocked(false);
 	if ( lists & 8 )
-		slotContactAdded( handle, "RL", publicName, TQString::null, TQString::null );
+		slotContactAdded( handle, "RL", publicName, TQString(), TQString() );
 	else if(c)
 		c->setReversed(false);
 	if ( lists & 16 ) // This contact is on the pending list. Add to the reverse list and delete from the pending list
 	{
-		notifySocket()->addContact( handle, MSNProtocol::RL, TQString::null, TQString::null, TQString::null );
-		notifySocket()->removeContact( handle, MSNProtocol::PL, TQString::null, TQString::null );
+		notifySocket()->addContact( handle, MSNProtocol::RL, TQString(), TQString(), TQString() );
+		notifySocket()->removeContact( handle, MSNProtocol::PL, TQString(), TQString() );
 	}
 }
 
@@ -910,7 +910,7 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list,
 				c->removeProperty( Kopete::Global::Properties::self()->nickName() );
 			c->setProperty( MSNProtocol::protocol()->propGuid, contactGuid );
 			// Add the new contact to the group he belongs.
-			if ( tmp_addNewContactToGroup.contains(handle) )
+			if ( tmp_addNewContactToGroup.tqcontains(handle) )
 			{
 				TQStringList list = tmp_addNewContactToGroup[handle];
 				for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
@@ -919,10 +919,10 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list,
 					
 					// If the group didn't exist yet (yay for async operations), don't add the contact to the group
 					// Let slotGroupAdded do it.
-					if( m_groupList.contains(groupGuid) )
+					if( m_groupList.tqcontains(groupGuid) )
 					{
 						kdDebug( 14140 ) << k_funcinfo << "Adding " << handle << " to group: " << groupGuid <<  endl;
-						notifySocket()->addContact( handle, MSNProtocol::FL, TQString::null, contactGuid, groupGuid );
+						notifySocket()->addContact( handle, MSNProtocol::FL, TQString(), contactGuid, groupGuid );
 						
 						c->contactAddedToGroup( groupGuid, m_groupList[ groupGuid ] );
 						
@@ -951,14 +951,14 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list,
 				if( !c->hasProperty(MSNProtocol::protocol()->propGuid.key()) )
 					c->setProperty( MSNProtocol::protocol()->propGuid, contactGuid );
 
-				if ( c->onlineStatus() == MSNProtocol::protocol()->UNK )
+				if ( c->onlinetqStatus() == MSNProtocol::protocol()->UNK )
 					c->setOnlineStatus( MSNProtocol::protocol()->FLN );
 	
 				if ( c->metaContact() && c->metaContact()->isTemporary() )
-					c->metaContact()->setTemporary( false,  m_groupList.contains( groupGuid ) ?  m_groupList[ groupGuid ] : 0L );
+					c->metaContact()->setTemporary( false,  m_groupList.tqcontains( groupGuid ) ?  m_groupList[ groupGuid ] : 0L );
 				else
 				{
-					if(m_groupList.contains(groupGuid))
+					if(m_groupList.tqcontains(groupGuid))
 					{
 						if( c->metaContact() )
 							c->metaContact()->addToGroup( m_groupList[groupGuid] );
@@ -968,17 +968,17 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list,
 			}
 		}
 
-		if ( !handle.isEmpty() && !m_allowList.contains( handle ) && !m_blockList.contains( handle ) )
+		if ( !handle.isEmpty() && !m_allowList.tqcontains( handle ) && !m_blockList.tqcontains( handle ) )
 		{
 			kdDebug(14140) << k_funcinfo << "Trying to add contact to AL. " << endl;
-			notifySocket()->addContact(handle, MSNProtocol::AL, TQString::null, TQString::null, TQString::null );
+			notifySocket()->addContact(handle, MSNProtocol::AL, TQString(), TQString(), TQString() );
 		}
 	}
 	else if ( list == "BL" )
 	{
 		if ( contacts()[ handle ] )
 			static_cast<MSNContact *>( contacts()[ handle ] )->setBlocked( true );
-		if ( !m_blockList.contains( handle ) )
+		if ( !m_blockList.tqcontains( handle ) )
 		{
 			m_blockList.append( handle );
 			configGroup()->writeEntry( "blockList" , m_blockList ) ;
@@ -988,7 +988,7 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list,
 	{
 		if ( contacts()[ handle ] )
 			static_cast<MSNContact *>( contacts()[ handle ] )->setAllowed( true );
-		if ( !m_allowList.contains( handle ) )
+		if ( !m_allowList.tqcontains( handle ) )
 		{
 			m_allowList.append( handle );
 			configGroup()->writeEntry( "allowList" , m_allowList ) ;
@@ -1004,7 +1004,7 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list,
 			// 'new user' dialog, which makes it impossible to add those here.
 			// Not necessarily bad, but the usability effects need more thought
 			// before I declare it good :- )
-			if ( !m_allowList.contains( handle ) && !m_blockList.contains( handle ) )
+			if ( !m_allowList.tqcontains( handle ) && !m_blockList.tqcontains( handle ) )
 			{
 				TQString nick;			//in most case, the public name is not know
 				if(publicName!=handle)  // so we don't whos it if it is not know
@@ -1034,8 +1034,8 @@ void MSNAccount::slotContactRemoved( const TQString& handle, const TQString& lis
 	{
 		m_blockList.remove( handle );
 		configGroup()->writeEntry( "blockList" , m_blockList ) ;
-		if ( !m_allowList.contains( handle ) )
-			notifySocket()->addContact( handle, MSNProtocol::AL, TQString::null, TQString::null, TQString::null );
+		if ( !m_allowList.tqcontains( handle ) )
+			notifySocket()->addContact( handle, MSNProtocol::AL, TQString(), TQString(), TQString() );
 
 		if(c)
 			c->setBlocked( false );
@@ -1044,8 +1044,8 @@ void MSNAccount::slotContactRemoved( const TQString& handle, const TQString& lis
 	{
 		m_allowList.remove( handle );
 		configGroup()->writeEntry( "allowList" , m_allowList ) ;
-		if ( !m_blockList.contains( handle ) )
-			notifySocket()->addContact( handle, MSNProtocol::BL, TQString::null, TQString::null, TQString::null );
+		if ( !m_blockList.tqcontains( handle ) )
+			notifySocket()->addContact( handle, MSNProtocol::BL, TQString(), TQString(), TQString() );
 
 		if(c)
 			c->setAllowed( false );
@@ -1118,7 +1118,7 @@ void MSNAccount::slotContactRemoved( const TQString& handle, const TQString& lis
 					for ( ; it.current(); ++it )
 					{
 						MSNContact *c2 = static_cast<MSNContact *>( it.current() );
-						if ( c2->serverGroups().contains( *stringIt ) )
+						if ( c2->serverGroups().tqcontains( *stringIt ) )
 						{
 							still_have_contact=true;
 							break;
@@ -1189,7 +1189,7 @@ void MSNAccount::slotCreateChat( const TQString& ID, const TQString& address, co
 		if ( !ID.isEmpty() && notifyNewChat )
 		{
 			// this temporary message should open the window if they not exist
-			TQString body = i18n( "%1 has started a chat with you" ).arg( c->metaContact()->displayName() );
+			TQString body = i18n( "%1 has started a chat with you" ).tqarg( c->metaContact()->displayName() );
 			Kopete::Message tmpMsg = Kopete::Message( c, manager->members(), body, Kopete::Message::Internal, Kopete::Message::PlainText );
 			manager->appendMessage( tmpMsg );
 		}
@@ -1241,17 +1241,17 @@ void MSNAccount::slotContactAddedNotifyDialogClosed(const TQString& handle)
 
 	if ( !dialog->authorized() )
 	{
-		if ( m_allowList.contains( handle ) )
-			m_notifySocket->removeContact( handle, MSNProtocol::AL, TQString::null, TQString::null );
-		else if ( !m_blockList.contains( handle ) )
-			m_notifySocket->addContact( handle, MSNProtocol::BL, TQString::null, TQString::null, TQString::null );
+		if ( m_allowList.tqcontains( handle ) )
+			m_notifySocket->removeContact( handle, MSNProtocol::AL, TQString(), TQString() );
+		else if ( !m_blockList.tqcontains( handle ) )
+			m_notifySocket->addContact( handle, MSNProtocol::BL, TQString(), TQString(), TQString() );
 	}
 	else
 	{
-		if ( m_blockList.contains( handle ) )
-			m_notifySocket->removeContact( handle, MSNProtocol::BL, TQString::null, TQString::null );
-		else if ( !m_allowList.contains( handle ) )
-			m_notifySocket->addContact( handle, MSNProtocol::AL, TQString::null, TQString::null, TQString::null );
+		if ( m_blockList.tqcontains( handle ) )
+			m_notifySocket->removeContact( handle, MSNProtocol::BL, TQString(), TQString() );
+		else if ( !m_allowList.tqcontains( handle ) )
+			m_notifySocket->addContact( handle, MSNProtocol::AL, TQString(), TQString(), TQString() );
 	}
 
 	
@@ -1351,11 +1351,11 @@ void MSNAccount::addContactServerside(const TQString &contactId, TQPtrList<Kopet
 		if( !groupId.isEmpty() )
 		{
 			// Something got corrupted on contactlist.xml
-			if( !m_groupList.contains(groupId) )
+			if( !m_groupList.tqcontains(groupId) )
 			{
 				// Clear the group plugin data.
-				group->setPluginData( protocol() , accountId() + " id" , TQString::null);
-				group->setPluginData( protocol() , accountId() + " displayName" , TQString::null);
+				group->setPluginData( protocol() , accountId() + " id" , TQString());
+				group->setPluginData( protocol() , accountId() + " displayName" , TQString());
 				kdDebug( 14140 ) << k_funcinfo << " Group " << group->displayName() << " marked with id #" << groupId << " does not seems to be anymore on the server" << endl;
 
 				// Add the group on MSN server, will fix the corruption.
@@ -1365,7 +1365,7 @@ void MSNAccount::addContactServerside(const TQString &contactId, TQPtrList<Kopet
 			else
 			{
 				// Add the group that the contact belong to add it when we will receive the contact GUID.
-				if( tmp_addNewContactToGroup.contains( contactId ) )
+				if( tmp_addNewContactToGroup.tqcontains( contactId ) )
 					tmp_addNewContactToGroup[contactId].append(groupId);
 				else
 					tmp_addNewContactToGroup.insert(contactId, TQStringList(groupId) );
@@ -1383,7 +1383,7 @@ void MSNAccount::addContactServerside(const TQString &contactId, TQPtrList<Kopet
 
 	// After add the contact to the top-level, it will be moved to required groups later.
 	kdDebug( 14140 ) << k_funcinfo << "Add the contact on the server " << endl;
-	m_notifySocket->addContact( contactId, MSNProtocol::FL, contactId, TQString::null, TQString::null );
+	m_notifySocket->addContact( contactId, MSNProtocol::FL, contactId, TQString(), TQString() );
 }
 
 MSNContact *MSNAccount::findContactByGuid(const TQString &contactGuid)
@@ -1488,7 +1488,7 @@ void MSNAccount::resetPictureObject(bool silent, bool force)
 	if(old!=m_pictureObj && isConnected() && m_notifySocket && !silent)
 	{
 		//update the msn pict
-		m_notifySocket->setStatus( myself()->onlineStatus() );
+		m_notifySocket->settqStatus( myself()->onlinetqStatus() );
 	}
 }