summaryrefslogtreecommitdiffstats
path: root/kopete/libkopete/kopetemetacontact.cpp
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-09-03 20:02:44 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-09-03 21:01:29 +0200
commit45971e65a6114fbd1f91ae354da485450001166f (patch)
treeb607ce9f3b683a89478b8c21c6bc9a53bf6b7a44 /kopete/libkopete/kopetemetacontact.cpp
parentc26bb519a8aebc04ffe39d0b6c784a1c1e915202 (diff)
downloadtdenetwork-45971e65a6114fbd1f91ae354da485450001166f.tar.gz
tdenetwork-45971e65a6114fbd1f91ae354da485450001166f.zip
Additional k => tde renaming and fixes
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 65d61106..68b77535 100644
--- a/kopete/libkopete/kopetemetacontact.cpp
+++ b/kopete/libkopete/kopetemetacontact.cpp
@@ -30,7 +30,7 @@
#include <tdemessagebox.h>
#include <tdeversion.h>
-#include "kabcpersistence.h"
+#include "tdeabcpersistence.h"
#include "kopetecontactlist.h"
#include "kopetecontact.h"
#include "kopeteaccountmanager.h"
@@ -74,7 +74,7 @@ class MetaContact::Private
Contact *displayNameSourceContact;
Contact *photoSourceContact;
- // used when source is kabc
+ // used when source is tdeabc
TQString metaContactId;
// used when source is custom
@@ -93,7 +93,7 @@ class MetaContact::Private
TQString photoSourcePID, photoSourceAID, photoSourceCID;
// The photo cache. Reduce disk access and CPU usage.
- Picture customPicture, contactPicture, kabcPicture;
+ Picture customPicture, contactPicture, tdeabcPicture;
};
MetaContact::MetaContact()
@@ -610,8 +610,8 @@ TQString MetaContact::displayName() const
PropertySource source = displayNameSource();
if ( source == SourceKABC )
{
- // kabc source, try to get from addressbook
- // if the metacontact has a kabc association
+ // tdeabc source, try to get from addressbook
+ // if the metacontact has a tdeabc association
if ( !metaContactId().isEmpty() )
return nameFromKABC(metaContactId());
}
@@ -652,7 +652,7 @@ TQString nameFromKABC( const TQString &id ) /*const*/
return theAddressee.formattedName();
}
}
- // no kabc association, return null image
+ // no tdeabc association, return null image
return TQString();
}
@@ -700,7 +700,7 @@ Picture &MetaContact::picture() const
{
if ( photoSource() == SourceKABC )
{
- return d->kabcPicture;
+ return d->tdeabcPicture;
}
else if ( photoSource() == SourceContact )
{
@@ -762,7 +762,7 @@ TQImage photoFromKABC( const TQString &id ) /*const*/
}
}
}
- // no kabc association, return null image
+ // no tdeabc association, return null image
return TQImage();
}
@@ -1190,7 +1190,7 @@ bool MetaContact::fromXML( const TQDomElement& element )
else
{
// lets do the best conversion for the old name tracking
- // if the custom display name is the same as kabc name, set the source to kabc
+ // if the custom display name is the same as tdeabc name, set the source to tdeabc
if ( !d->metaContactId.isEmpty() && ( d->displayName == nameFromKABC(d->metaContactId)) )
setDisplayNameSource(SourceKABC);
else
@@ -1304,7 +1304,7 @@ void MetaContact::slotUpdateAddressBookPicture()
if ( pic.data().isNull() && pic.url().isEmpty() )
pic = theAddressee.logo();
- d->kabcPicture.setPicture(pic);
+ d->tdeabcPicture.setPicture(pic);
}
}
}
@@ -1350,13 +1350,13 @@ void MetaContact::setMetaContactId( const TQString& newMetaContactId )
return;
// 1) Check the Id is not already used by another contact
- // 2) cause a kabc write ( only in response to metacontactLVIProps calling this, or will
+ // 2) cause a tdeabc write ( only in response to metacontactLVIProps calling this, or will
// write be called twice when creating a brand new MC? )
- // 3) What about changing from one valid kabc to another, are kabc fields removed?
- // 4) May be called with Null to remove an invalid kabc uid by KMC::toKABC()
+ // 3) What about changing from one valid tdeabc to another, are tdeabc fields removed?
+ // 4) May be called with Null to remove an invalid tdeabc uid by KMC::toKABC()
// 5) Is called when reading the saved contact list
- // Don't remove IM addresses from kabc if we are changing contacts;
+ // Don't remove IM addresses from tdeabc if we are changing contacts;
// other programs may have written that data and depend on it
d->metaContactId = newMetaContactId;
KABCPersistence::self()->write( this );
@@ -1412,8 +1412,8 @@ void MetaContact::setPhotoSyncedWithKABC(bool b)
{
// Some protocols like MSN save the photo as a url in
// contact properties, we should not use this url
- // to sync with kabc but try first to embed the
- // photo data in the kabc addressee, because it could
+ // to sync with tdeabc but try first to embed the
+ // photo data in the tdeabc addressee, because it could
// be remote resource and the local url makes no sense
TQImage fallBackImage = TQImage(newValue.toString());
if(fallBackImage.isNull())