Rename old tq methods that no longer need a unique name

1 files changed, 12 insertions, 12 deletions

diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp
index 218c9aae..abec26bc 100644
--- a/kopete/protocols/jabber/jabbertransport.cpp
+++ b/kopete/protocols/jabber/jabbertransport.cpp
@@ -123,10 +123,10 @@ JabberTransport::~JabberTransport ()
 
 KActionMenu *JabberTransport::actionMenu ()
 {
-	KActionMenu *menu = new KActionMenu( accountId(), myself()->onlinetqStatus().iconFor( this ),  this );
+	KActionMenu *menu = new KActionMenu( accountId(), myself()->onlineStatus().iconFor( this ),  this );
 	TQString nick = myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString();
 
-	menu->popupMenu()->insertTitle( myself()->onlinetqStatus().iconFor( myself() ),
+	menu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ),
 	nick.isNull() ? accountLabel() : i18n( "%2 <%1>" ).tqarg( accountLabel(), nick )
 								  );
 	
@@ -203,44 +203,44 @@ void JabberTransport::setOnlineStatus( const Kopete::OnlineStatus& status  , con
 		return;
 	}
 
-	XMPP::tqStatus xmpptqStatus ( "", reason );
+	XMPP::Status xmppStatus ( "", reason );
 
 	switch ( status.internalStatus () )
 	{
 		case JabberProtocol::JabberFreeForChat:
-			xmpptqStatus.setShow ( "chat" );
+			xmppStatus.setShow ( "chat" );
 			break;
 
 		case JabberProtocol::JabberOnline:
-			xmpptqStatus.setShow ( "" );
+			xmppStatus.setShow ( "" );
 			break;
 
 		case JabberProtocol::JabberAway:
-			xmpptqStatus.setShow ( "away" );
+			xmppStatus.setShow ( "away" );
 			break;
 
 		case JabberProtocol::JabberXA:
-			xmpptqStatus.setShow ( "xa" );
+			xmppStatus.setShow ( "xa" );
 			break;
 
 		case JabberProtocol::JabberDND:
-			xmpptqStatus.setShow ( "dnd" );
+			xmppStatus.setShow ( "dnd" );
 			break;
 
 		case JabberProtocol::JabberInvisible:
-			xmpptqStatus.setIsInvisible ( true );
+			xmppStatus.setIsInvisible ( true );
 			break;
 	}
 
 	if ( !isConnected () )
 	{
 		// we are not connected yet, so connect now
-		m_initialPresence = xmpptqStatus;
+		m_initialPresence = xmppStatus;
 		connect ();
 	}
 	else
 	{
-		setPresence ( xmpptqStatus );
+		setPresence ( xmppStatus );
 	}
 #endif
 }
@@ -328,7 +328,7 @@ void JabberTransport::eatContacts( )
 		{
 			XMPP::RosterItem item=contact->rosterItem();
 			Kopete::MetaContact *mc=contact->metaContact();
-			Kopete::OnlineStatus status = contact->onlinetqStatus();
+			Kopete::OnlineStatus status = contact->onlineStatus();
 			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;