1 files changed, 21 insertions, 21 deletions

diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp
index 26d16b28..a081a8db 100644
--- a/kopete/protocols/jabber/jabbertransport.cpp
+++ b/kopete/protocols/jabber/jabbertransport.cpp
@@ -38,11 +38,11 @@
 
 #include "xmpp_tasks.h"
 
-JabberTransport::JabberTransport (JabberAccount * parentAccount, const XMPP::RosterItem & item, const TQString& gateway_type)
-	: Kopete::Account ( parentAccount->protocol(), parentAccount->accountId()+"/"+ item.jid().bare() )
+JabberTransport::JabberTransport (JabberAccount * tqparentAccount, const XMPP::RosterItem & item, const TQString& gateway_type)
+	: Kopete::Account ( tqparentAccount->protocol(), tqparentAccount->accountId()+"/"+ item.jid().bare() )
 {
 	m_status=Creating;
-	m_account = parentAccount;
+	m_account = tqparentAccount;
 	m_account->addTransport( this,item.jid().bare() );
 	
 	JabberContact *myContact = m_account->contactPool()->addContact ( item , Kopete::ContactList::self()->myself(), false );
@@ -88,11 +88,11 @@ JabberTransport::JabberTransport (JabberAccount * parentAccount, const XMPP::Ros
 	m_status=Normal;
 }
 
-JabberTransport::JabberTransport( JabberAccount * parentAccount, const TQString & _accountId )
-	: Kopete::Account ( parentAccount->protocol(), _accountId )
+JabberTransport::JabberTransport( JabberAccount * tqparentAccount, const TQString & _accountId )
+	: Kopete::Account ( tqparentAccount->protocol(), _accountId )
 {
 	m_status=Creating;
-	m_account = parentAccount;
+	m_account = tqparentAccount;
 	
 	const TQString contactJID_s = configGroup()->readEntry("GatewayJID");
 	
@@ -123,11 +123,11 @@ JabberTransport::~JabberTransport ()
 
 KActionMenu *JabberTransport::actionMenu ()
 {
-	KActionMenu *menu = new KActionMenu( accountId(), myself()->onlineStatus().iconFor( this ),  this );
+	KActionMenu *menu = new KActionMenu( accountId(), myself()->onlinetqStatus().iconFor( this ),  this );
 	TQString nick = myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString();
 
-	menu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ),
-	nick.isNull() ? accountLabel() : i18n( "%2 <%1>" ).arg( accountLabel(), nick )
+	menu->popupMenu()->insertTitle( myself()->onlinetqStatus().iconFor( myself() ),
+	nick.isNull() ? accountLabel() : i18n( "%2 <%1>" ).tqarg( accountLabel(), nick )
 								  );
 	
 	TQPtrList<KAction> *customActions = myself()->customContextMenuActions(  );
@@ -203,44 +203,44 @@ void JabberTransport::setOnlineStatus( const Kopete::OnlineStatus& status  , con
 		return;
 	}
 
-	XMPP::Status xmppStatus ( "", reason );
+	XMPP::tqStatus xmpptqStatus ( "", reason );
 
 	switch ( status.internalStatus () )
 	{
 		case JabberProtocol::JabberFreeForChat:
-			xmppStatus.setShow ( "chat" );
+			xmpptqStatus.setShow ( "chat" );
 			break;
 
 		case JabberProtocol::JabberOnline:
-			xmppStatus.setShow ( "" );
+			xmpptqStatus.setShow ( "" );
 			break;
 
 		case JabberProtocol::JabberAway:
-			xmppStatus.setShow ( "away" );
+			xmpptqStatus.setShow ( "away" );
 			break;
 
 		case JabberProtocol::JabberXA:
-			xmppStatus.setShow ( "xa" );
+			xmpptqStatus.setShow ( "xa" );
 			break;
 
 		case JabberProtocol::JabberDND:
-			xmppStatus.setShow ( "dnd" );
+			xmpptqStatus.setShow ( "dnd" );
 			break;
 
 		case JabberProtocol::JabberInvisible:
-			xmppStatus.setIsInvisible ( true );
+			xmpptqStatus.setIsInvisible ( true );
 			break;
 	}
 
 	if ( !isConnected () )
 	{
 		// we are not connected yet, so connect now
-		m_initialPresence = xmppStatus;
+		m_initialPresence = xmpptqStatus;
 		connect ();
 	}
 	else
 	{
-		setPresence ( xmppStatus );
+		setPresence ( xmpptqStatus );
 	}
 #endif
 }
@@ -277,7 +277,7 @@ void JabberTransport::removeAllContacts( )
 
 /*	if ( ! task->success ())
 	KMessageBox::queuedMessageBox ( 0L, KMessageBox::Error,
-									i18n ("An error occured when trying to remove the transport:\n%1").arg(task->statusString()),
+									i18n ("An error occured when trying to remove the transport:\n%1").tqarg(task->statusString()),
 									i18n ("Jabber Service Unregistration"));
 	*/ //we don't really care, we remove everithing anyway.
 
@@ -298,7 +298,7 @@ TQString JabberTransport::legacyId( const XMPP::Jid & jid )
 	if(jid.node().isEmpty())
 		return TQString();
 	TQString node = jid.node();
-	return node.replace("%","@");
+	return node.tqreplace("%","@");
 }
 
 void JabberTransport::jabberAccountRemoved( )
@@ -328,7 +328,7 @@ void JabberTransport::eatContacts( )
 		{
 			XMPP::RosterItem item=contact->rosterItem();
 			Kopete::MetaContact *mc=contact->metaContact();
-			Kopete::OnlineStatus status = contact->onlineStatus();
+			Kopete::OnlineStatus status = contact->onlinetqStatus();
 			kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << item.jid().full() << " will be soon eat  - " << contact << endl;
 			delete contact;
 			Kopete::Contact *c2=account()->contactPool()->addContact( item , mc , false ); //not sure this is false;