summaryrefslogtreecommitdiffstats
path: root/kopete/libkopete/kopetemetacontact.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/libkopete/kopetemetacontact.cpp')
-rw-r--r--kopete/libkopete/kopetemetacontact.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/kopete/libkopete/kopetemetacontact.cpp b/kopete/libkopete/kopetemetacontact.cpp
index a031f5bd..c671ace4 100644
--- a/kopete/libkopete/kopetemetacontact.cpp
+++ b/kopete/libkopete/kopetemetacontact.cpp
@@ -127,7 +127,7 @@ MetaContact::~MetaContact()
void MetaContact::addContact( Contact *c )
{
- if( d->contacts.tqcontains( c ) )
+ if( d->contacts.contains( c ) )
{
kdWarning(14010) << "Ignoring attempt to add duplicate contact " << c->contactId() << "!" << endl;
}
@@ -193,7 +193,7 @@ void MetaContact::updateOnlineStatus()
void MetaContact::removeContact(Contact *c, bool deleted)
{
- if( !d->contacts.tqcontains( c ) )
+ if( !d->contacts.contains( c ) )
{
kdDebug(14010) << k_funcinfo << " Contact is not in this metaContact " << endl;
}
@@ -640,7 +640,7 @@ TQString MetaContact::displayName() const
TQString nameFromKABC( const TQString &id ) /*const*/
{
KABC::AddressBook* ab = KABCPersistence::self()->addressBook();
- if ( ! id.isEmpty() && !id.tqcontains(':') )
+ if ( ! id.isEmpty() && !id.contains(':') )
{
KABC::Addressee theAddressee = ab->findByUid(id);
if ( theAddressee.isEmpty() )
@@ -666,7 +666,7 @@ TQString nameFromContact( Kopete::Contact *c) /*const*/
contactName = c->property( Global::Properties::self()->nickName()).value().toString();
//the replace is there to workaround the Bug 95444
- return contactName.isEmpty() ? c->contactId() : contactName.tqreplace('\n',TQString::fromUtf8(""));
+ return contactName.isEmpty() ? c->contactId() : contactName.replace('\n',TQString::fromUtf8(""));
}
KURL MetaContact::customPhoto() const
@@ -739,7 +739,7 @@ TQImage photoFromContact( Kopete::Contact *contact) /*const*/
TQImage photoFromKABC( const TQString &id ) /*const*/
{
KABC::AddressBook* ab = KABCPersistence::self()->addressBook();
- if ( ! id.isEmpty() && !id.tqcontains(':') )
+ if ( ! id.isEmpty() && !id.contains(':') )
{
KABC::Addressee theAddressee = ab->findByUid(id);
if ( theAddressee.isEmpty() )
@@ -859,14 +859,14 @@ void MetaContact::slotPropertyChanged( Contact* subcontact, const TQString &key,
void MetaContact::moveToGroup( Group *from, Group *to )
{
- if ( !from || !groups().tqcontains( from ) )
+ if ( !from || !groups().contains( from ) )
{
// We're adding, not moving, because 'from' is illegal
addToGroup( to );
return;
}
- if ( !to || groups().tqcontains( to ) )
+ if ( !to || groups().contains( to ) )
{
// We're removing, not moving, because 'to' is illegal
removeFromGroup( from );
@@ -890,7 +890,7 @@ void MetaContact::moveToGroup( Group *from, Group *to )
void MetaContact::removeFromGroup( Group *group )
{
- if ( !group || !groups().tqcontains( group ) || ( isTemporary() && group->type() == Group::Temporary ) )
+ if ( !group || !groups().contains( group ) || ( isTemporary() && group->type() == Group::Temporary ) )
{
return;
}
@@ -912,13 +912,13 @@ void MetaContact::removeFromGroup( Group *group )
void MetaContact::addToGroup( Group *to )
{
- if ( !to || groups().tqcontains( to ) )
+ if ( !to || groups().contains( to ) )
return;
if ( d->temporary && to->type() != Group::Temporary )
return;
- if ( d->groups.tqcontains( Group::topLevel() ) )
+ if ( d->groups.contains( Group::topLevel() ) )
{
d->groups.remove( Group::topLevel() );
emit removedFromGroup( this, Group::topLevel() );
@@ -1058,7 +1058,7 @@ bool MetaContact::fromXML( const TQDomElement& element )
// return false;
//the replace is there to workaround the Bug 95444
- d->displayName = contactElement.text().tqreplace('\n',TQString::fromUtf8(""));
+ d->displayName = contactElement.text().replace('\n',TQString::fromUtf8(""));
if ( contactElement.hasAttribute(NSCID_ELEM) && contactElement.hasAttribute(NSPID_ELEM) && contactElement.hasAttribute(NSAID_ELEM))
{
@@ -1291,7 +1291,7 @@ void MetaContact::slotUpdateAddressBookPicture()
{
KABC::AddressBook* ab = KABCPersistence::self()->addressBook();
TQString id = metaContactId();
- if ( !id.isEmpty() && !id.tqcontains(':') )
+ if ( !id.isEmpty() && !id.contains(':') )
{
KABC::Addressee theAddressee = ab->findByUid(id);
if ( theAddressee.isEmpty() )