1 files changed, 16 insertions, 16 deletions

diff --git a/kopete/protocols/groupwise/gwcontact.cpp b/kopete/protocols/groupwise/gwcontact.cpp
index d15c76b9..dd74fc67 100644
--- a/kopete/protocols/groupwise/gwcontact.cpp
+++ b/kopete/protocols/groupwise/gwcontact.cpp
@@ -47,18 +47,18 @@
 using namespace GroupWise;
 
 GroupWiseContact::GroupWiseContact( Kopete::Account* account, const TQString &dn, 
-			Kopete::MetaContact *parent, 
-			const int objectId, const int parentId, const int sequence )
-: Kopete::Contact( account, GroupWiseProtocol::dnToDotted( dn ), parent ), m_objectId( objectId ), m_parentId( parentId ),
+			Kopete::MetaContact *tqparent, 
+			const int objectId, const int tqparentId, const int sequence )
+: Kopete::Contact( account, GroupWiseProtocol::dnToDotted( dn ), tqparent ), m_objectId( objectId ), m_parentId( tqparentId ),
   m_sequence( sequence ), m_actionBlock( 0 ), m_archiving( false ), m_deleting( false ), m_messageReceivedOffline( false )
 {
-	if ( dn.find( '=' ) != -1 )
+	if ( dn.tqfind( '=' ) != -1 )
 	{
 		m_dn = dn;
 	}
 	connect( static_cast< GroupWiseAccount *>( account ), TQT_SIGNAL( privacyChanged( const TQString &, bool ) ),
 			TQT_SLOT( receivePrivacyChanged( const TQString &, bool ) ) );
-	setOnlineStatus( ( parent && parent->isTemporary() ) ? protocol()->groupwiseUnknown : protocol()->groupwiseOffline );
+	setOnlineStatus( ( tqparent && tqparent->isTemporary() ) ? protocol()->groupwiseUnknown : protocol()->groupwiseOffline );
 }
 
 GroupWiseContact::~GroupWiseContact()
@@ -96,17 +96,17 @@ void GroupWiseContact::updateDetails( const ContactDetails & details )
 	
 	TQMap<TQString, TQString>::Iterator it;
 	// work phone number
-	if ( ( it = m_serverProperties.find( "telephoneNumber" ) )
+	if ( ( it = m_serverProperties.tqfind( "telephoneNumber" ) )
 		!= m_serverProperties.end() )
 		setProperty( protocol()->propPhoneWork, it.data() );
 	
 	// mobile phone number
-	if ( ( it = m_serverProperties.find( "mobile" ) )
+	if ( ( it = m_serverProperties.tqfind( "mobile" ) )
 		!= m_serverProperties.end() )
 		setProperty( protocol()->propPhoneMobile, it.data() );
 	
 	// email
-	if ( ( it = m_serverProperties.find( "Internet EMail Address" ) )
+	if ( ( it = m_serverProperties.tqfind( "Internet EMail Address" ) )
 		!= m_serverProperties.end() )
 		setProperty( protocol()->propEmail, it.data() );
 		
@@ -134,9 +134,9 @@ bool GroupWiseContact::isReachable()
 	// in GWChatSession
 	// (This is a GroupWise rule, not a problem in Kopete)
 
-	if ( account()->isConnected() && ( isOnline() || messageReceivedOffline() ) /* && account()->myself()->onlineStatus() != protocol()->groupwiseAppearOffline */)
+	if ( account()->isConnected() && ( isOnline() || messageReceivedOffline() ) /* && account()->myself()->onlinetqStatus() != protocol()->groupwiseAppearOffline */)
 		return true;
-	if ( !account()->isConnected()/* || account()->myself()->onlineStatus() == protocol()->groupwiseAppearOffline*/ )
+	if ( !account()->isConnected()/* || account()->myself()->onlinetqStatus() == protocol()->groupwiseAppearOffline*/ )
 		return false;
 
 	// fallback, something went wrong
@@ -155,7 +155,7 @@ Kopete::ChatSession * GroupWiseContact::manager( Kopete::Contact::CanCreateFlags
 	Kopete::ContactPtrList chatMembers;
 	chatMembers.append( this );
 
-	return account()->chatSession( chatMembers, TQString::null, canCreate );
+	return account()->chatSession( chatMembers, TQString(), canCreate );
 }
 
 TQPtrList<KAction> *GroupWiseContact::customContextMenuActions() 
@@ -222,22 +222,22 @@ void GroupWiseContact::receivePrivacyChanged( const TQString & dn, bool allow )
 {
 	Q_UNUSED( allow );
 	if ( dn == m_dn )	// set the online status back to itself. this will set the blocking state
-		setOnlineStatus( this->onlineStatus() );
+		setOnlineStatus( this->onlinetqStatus() );
 }
 
 void GroupWiseContact::setOnlineStatus( const Kopete::OnlineStatus& status )
 {
 	setMessageReceivedOffline( false );
-	if ( status == protocol()->groupwiseAwayIdle && status != onlineStatus() )
+	if ( status == protocol()->groupwiseAwayIdle && status != onlinetqStatus() )
 		setIdleTime( 1 );
-	else if ( onlineStatus() == protocol()->groupwiseAwayIdle && status != onlineStatus() )
+	else if ( onlinetqStatus() == protocol()->groupwiseAwayIdle && status != onlinetqStatus() )
 		setIdleTime( 0 );
 	
 	if ( account()->isContactBlocked( m_dn ) && status.internalStatus() < 15 )
 	{
 		Kopete::Contact::setOnlineStatus(Kopete::OnlineStatus(status.status() , (status.weight()==0) ? 0 : (status.weight() -1)  ,
-			protocol() , status.internalStatus()+15 , TQString::fromLatin1("msn_blocked"),
-			i18n("%1|Blocked").arg( status.description() ) ) );
+			protocol() , status.internalStatus()+15 , TQString::tqfromLatin1("msn_blocked"),
+			i18n("%1|Blocked").tqarg( status.description() ) ) );
 	}
 	else
 	{