Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 808e453c56036211f57482ed847d54aca01bba68.

1 files changed, 16 insertions, 16 deletions

diff --git a/kopete/libkopete/kopetemetacontact.cpp b/kopete/libkopete/kopetemetacontact.cpp
index 7bfd87e7..9ec2704c 100644
--- a/kopete/libkopete/kopetemetacontact.cpp
+++ b/kopete/libkopete/kopetemetacontact.cpp
@@ -58,7 +58,7 @@ class  MetaContact::Private
 	Private() :
 		photoSource(MetaContact::SourceCustom), displayNameSource(MetaContact::SourceCustom),
 		displayNameSourceContact(0L),  photoSourceContact(0L), temporary(false),
-		onlineStatus(Kopete::OnlineStatus::Offline), photoSyncedWithKABC(false)
+		onlinetqStatus(Kopete::OnlineStatus::Offline), photoSyncedWithKABC(false)
 	{}
 
 	~Private()
@@ -85,7 +85,7 @@ class  MetaContact::Private
 	TQMap<TQString, TQMap<TQString, TQString> > addressBook;
 	bool temporary;
 	
-	OnlineStatus::StatusType onlineStatus;
+	OnlineStatus::StatusType onlinetqStatus;
 	bool photoSyncedWithKABC;
 
 	// Used to set contact source at load.
@@ -171,22 +171,22 @@ void MetaContact::addContact( Contact *c )
 
 void MetaContact::updateOnlineStatus()
 {
-	Kopete::OnlineStatus::StatusType newStatus = Kopete::OnlineStatus::Unknown;
-	Kopete::OnlineStatus mostSignificantStatus;
+	Kopete::OnlineStatus::StatusType newtqStatus = Kopete::OnlineStatus::Unknown;
+	Kopete::OnlineStatus mostSignificanttqStatus;
 
 	for ( TQPtrListIterator<Contact> it( d->contacts ); it.current(); ++it )
 	{
 		// find most significant status
-		if ( it.current()->onlineStatus() > mostSignificantStatus )
-			mostSignificantStatus = it.current()->onlineStatus();
+		if ( it.current()->onlinetqStatus() > mostSignificanttqStatus )
+			mostSignificanttqStatus = it.current()->onlinetqStatus();
 	}
 
-	newStatus = mostSignificantStatus.status();
+	newtqStatus = mostSignificanttqStatus.status();
 
-	if( newStatus != d->onlineStatus )
+	if( newtqStatus != d->onlinetqStatus )
 	{
-		d->onlineStatus = newStatus;
-		emit onlineStatusChanged( this, d->onlineStatus );
+		d->onlinetqStatus = newtqStatus;
+		emit onlineStatusChanged( this, d->onlinetqStatus );
 	}
 }
 
@@ -415,14 +415,14 @@ Contact *MetaContact::preferredContact()
 			continue;
 		}
 
-		if( c->onlineStatus().status() > contact->onlineStatus().status()  )
+		if( c->onlinetqStatus().status() > contact->onlinetqStatus().status()  )
 			contact=c; //this contact has a better status
-		else if ( c->onlineStatus().status() == contact->onlineStatus().status() )
+		else if ( c->onlinetqStatus().status() == contact->onlinetqStatus().status() )
 		{
 			if( c->account()->priority() > contact->account()->priority() )
 				contact=c;
 			else if(  c->account()->priority() == contact->account()->priority()
-					&& c->onlineStatus().weight() > contact->onlineStatus().weight() )
+					&& c->onlinetqStatus().weight() > contact->onlinetqStatus().weight() )
 				contact = c;  //the weight is not supposed to follow the same scale for each protocol
 		}
 	}
@@ -513,7 +513,7 @@ TQString MetaContact::statusString() const
 
 OnlineStatus::StatusType MetaContact::status() const
 {
-	return d->onlineStatus;
+	return d->onlinetqStatus;
 }
 
 bool MetaContact::isOnline() const
@@ -566,7 +566,7 @@ void MetaContact::sendFile( const KURL &sourceURL, const TQString &altFileName,
 	Contact *contact = d->contacts.first();
 	for( TQPtrListIterator<Contact> it( d->contacts ) ; it.current(); ++it )
 	{
-		if( ( *it )->onlineStatus() > contact->onlineStatus() && ( *it )->canAcceptFiles() )
+		if( ( *it )->onlinetqStatus() > contact->onlinetqStatus() && ( *it )->canAcceptFiles() )
 			contact = *it;
 	}
 
@@ -1360,7 +1360,7 @@ void MetaContact::setMetaContactId( const TQString& newMetaContactId )
 	// other programs may have written that data and depend on it
 	d->metaContactId = newMetaContactId;
 	KABCPersistence::self()->write( this );
-	emit onlineStatusChanged( this, d->onlineStatus );
+	emit onlineStatusChanged( this, d->onlinetqStatus );
 	emit persistentDataChanged();
 }