From 089118c18533dfa3e6ce5065dbebdd4db94051f1 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:33:51 -0600 Subject: Rename old tq methods that no longer need a unique name --- kopete/libkopete/kopetemetacontact.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'kopete/libkopete/kopetemetacontact.cpp') diff --git a/kopete/libkopete/kopetemetacontact.cpp b/kopete/libkopete/kopetemetacontact.cpp index 9ec2704c..7bfd87e7 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), - onlinetqStatus(Kopete::OnlineStatus::Offline), photoSyncedWithKABC(false) + onlineStatus(Kopete::OnlineStatus::Offline), photoSyncedWithKABC(false) {} ~Private() @@ -85,7 +85,7 @@ class MetaContact::Private TQMap > addressBook; bool temporary; - OnlineStatus::StatusType onlinetqStatus; + OnlineStatus::StatusType onlineStatus; bool photoSyncedWithKABC; // Used to set contact source at load. @@ -171,22 +171,22 @@ void MetaContact::addContact( Contact *c ) void MetaContact::updateOnlineStatus() { - Kopete::OnlineStatus::StatusType newtqStatus = Kopete::OnlineStatus::Unknown; - Kopete::OnlineStatus mostSignificanttqStatus; + Kopete::OnlineStatus::StatusType newStatus = Kopete::OnlineStatus::Unknown; + Kopete::OnlineStatus mostSignificantStatus; for ( TQPtrListIterator it( d->contacts ); it.current(); ++it ) { // find most significant status - if ( it.current()->onlinetqStatus() > mostSignificanttqStatus ) - mostSignificanttqStatus = it.current()->onlinetqStatus(); + if ( it.current()->onlineStatus() > mostSignificantStatus ) + mostSignificantStatus = it.current()->onlineStatus(); } - newtqStatus = mostSignificanttqStatus.status(); + newStatus = mostSignificantStatus.status(); - if( newtqStatus != d->onlinetqStatus ) + if( newStatus != d->onlineStatus ) { - d->onlinetqStatus = newtqStatus; - emit onlineStatusChanged( this, d->onlinetqStatus ); + d->onlineStatus = newStatus; + emit onlineStatusChanged( this, d->onlineStatus ); } } @@ -415,14 +415,14 @@ Contact *MetaContact::preferredContact() continue; } - if( c->onlinetqStatus().status() > contact->onlinetqStatus().status() ) + if( c->onlineStatus().status() > contact->onlineStatus().status() ) contact=c; //this contact has a better status - else if ( c->onlinetqStatus().status() == contact->onlinetqStatus().status() ) + else if ( c->onlineStatus().status() == contact->onlineStatus().status() ) { if( c->account()->priority() > contact->account()->priority() ) contact=c; else if( c->account()->priority() == contact->account()->priority() - && c->onlinetqStatus().weight() > contact->onlinetqStatus().weight() ) + && c->onlineStatus().weight() > contact->onlineStatus().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->onlinetqStatus; + return d->onlineStatus; } bool MetaContact::isOnline() const @@ -566,7 +566,7 @@ void MetaContact::sendFile( const KURL &sourceURL, const TQString &altFileName, Contact *contact = d->contacts.first(); for( TQPtrListIterator it( d->contacts ) ; it.current(); ++it ) { - if( ( *it )->onlinetqStatus() > contact->onlinetqStatus() && ( *it )->canAcceptFiles() ) + if( ( *it )->onlineStatus() > contact->onlineStatus() && ( *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->onlinetqStatus ); + emit onlineStatusChanged( this, d->onlineStatus ); emit persistentDataChanged(); } -- cgit v1.2.1