more AB sync

1 files changed, 39 insertions, 0 deletions

diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index c34f671..711c261 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -68,2 +68,3 @@ struct Addressee::AddresseeData : public KShared
   QString sortString;
+  QString externalUID;
   KURL url;
@@ -273,2 +274,28 @@ void Addressee::computeCsum(const QString &dev)
 }
+
+void Addressee::mergeContact( Addressee ad )
+{
+#if 0
+    if ( !mData->name.isEmpty() ) l.append(mData->name);
+    if ( !mData->formattedName.isEmpty() ) l.append(mData->formattedName  );
+    if ( !mData->familyName.isEmpty()  ) l.append( mData->familyName );
+    if ( !mData->givenName.isEmpty() ) l.append(mData->givenName  );
+    if ( !mData->additionalName  ) l.append( mData->additionalName );
+    if ( !mData->prefix.isEmpty()  ) l.append( mData->prefix );
+    if ( !mData->suffix.isEmpty()  ) l.append( mData->suffix );
+    if ( !mData->nickName.isEmpty()  ) l.append( mData->nickName );
+    if ( mData->birthday.isValid()  ) l.append( mData->birthday.toString() );
+    if ( !mData->mailer.isEmpty() ) l.append( mData->mailer );
+    if ( mData->timeZone.isValid() ) l.append( mData->timeZone.asString() );
+    if ( mData->geo.isValid() ) l.append( mData->geo.asString() );
+    if ( !mData->title .isEmpty() ) l.append( mData->title );
+    if ( !mData->role.isEmpty() ) l.append( mData->role );
+    if ( !mData->organization.isEmpty() ) l.append( mData->organization ); 
+    if ( !mData->note.isEmpty() ) l.append( mData->note ); 
+    if ( !mData->productId.isEmpty() ) l.append(mData->productId ); 
+    if ( !mData->sortString.isEmpty() ) l.append( mData->sortString ); 
+    if ( mData->secrecy.isValid() ) l.append( mData->secrecy.asString()); 
+#endif
+}
+
 void Addressee::removeID(const QString &prof)
@@ -325,2 +352,14 @@ QString Addressee::IDStr() const
 
+void Addressee::setExternalUID( const QString &id )
+{
+  if ( id == mData->externalUID ) return;
+  detach();
+  mData->empty = false;
+  mData->externalUID = id;
+}
+
+QString Addressee::externalUID() const
+{
+  return mData->externalUID;
+}