summaryrefslogtreecommitdiffstats
path: root/kopete/libkopete/kopetemetacontact.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:49:40 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:49:40 -0600
commit808e453c56036211f57482ed847d54aca01bba68 (patch)
tree75515d5768dea10d4fbe4cd772e0a89c1c4b3aa9 /kopete/libkopete/kopetemetacontact.cpp
parentcd9b9ed7fd0ac8a75106148254aa58e2e5c04863 (diff)
downloadtdenetwork-808e453c56036211f57482ed847d54aca01bba68.tar.gz
tdenetwork-808e453c56036211f57482ed847d54aca01bba68.zip
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'kopete/libkopete/kopetemetacontact.cpp')
-rw-r--r--kopete/libkopete/kopetemetacontact.cpp32
1 files changed, 16 insertions, 16 deletions
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<TQString, TQMap<TQString, TQString> > 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<Contact> 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<Contact> 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();
}