Added new hidden vCard URI parameter for certain CardDAV systems (such as Zimbra) that do not handle UID properly

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1141499 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 32 insertions, 0 deletions

diff --git a/kabc/scripts/addressee.src.cpp b/kabc/scripts/addressee.src.cpp
index 887290c8f..1735da995 100644
--- a/kabc/scripts/addressee.src.cpp
+++ b/kabc/scripts/addressee.src.cpp
@@ -47,6 +47,7 @@ KABC::SortMode *Addressee::mSortMode = 0;
 struct Addressee::AddresseeData : public KShared
 {
   QString uid;
+  QString uri;
   --VARIABLES--
 
   PhoneNumber::List phoneNumbers;
@@ -180,6 +181,24 @@ QString Addressee::uidLabel()
   return i18n("Unique Identifier");
 }
 
+void Addressee::setUri( const QString &id )
+{
+  if ( id == mData->uri ) return;
+  detach();
+  mData->empty = false;
+  mData->uri = id;
+}
+
+QString Addressee::uri() const
+{
+  return mData->uri;
+}
+
+QString Addressee::uriLabel()
+{
+  return i18n("Unique Resource Identifier");
+}
+
 --DEFINITIONS--
 
 void Addressee::setNameFromString( const QString &s )
diff --git a/kabc/scripts/addressee.src.h b/kabc/scripts/addressee.src.h
index abceb052a..edb63ae60 100644
--- a/kabc/scripts/addressee.src.h
+++ b/kabc/scripts/addressee.src.h
@@ -110,6 +110,19 @@ class KABC_EXPORT Addressee
      */
     static QString uidLabel();
 
+    /**
+      Set unique resource identifier.
+     */
+    void setUri( const QString &uid );
+    /**
+      Return unique resource identifier.
+     */
+    QString uri() const;
+    /**
+      Return translated label for uri field.
+     */
+    static QString uriLabel();
+
     --DECLARATIONS--
     /**
       Set name fields by parsing the given string and trying to associate the