* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


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

1 files changed, 14 insertions, 2 deletions

diff --git a/libkpimidentities/identity.h b/libkpimidentities/identity.h
index 236a2dc68..9baba4fac 100644
--- a/libkpimidentities/identity.h
+++ b/libkpimidentities/identity.h
@@ -206,8 +206,19 @@ public:
   void setPreferredCryptoMessageFormat( Kleo::CryptoMessageFormat format ) { mPreferredCryptoMessageFormat = format; }
 
   /** email address (without the user name - only name\@host) */
-  TQString emailAddr() const { return mEmailAddr; }
-  void setEmailAddr(const TQString&);
+  KDE_DEPRECATED TQString emailAddr() const { return primaryEmailAddress(); }
+  KDE_DEPRECATED void setEmailAddr( const TQString & email ) { setPrimaryEmailAddress( email ); }
+
+  /** primary email address (without the user name - only name\@host).
+      The primary email address is used for all outgoing mail. */
+  TQString primaryEmailAddress() const { return mEmailAddr; }
+  void setPrimaryEmailAddress( const TQString & email );
+
+  /** email address aliases */
+  const TQStringList & emailAliases() const { return mEmailAliases; }
+  void setEmailAliases( const TQStringList & );
+
+  bool matchesEmailAddress( const TQString & addr ) const;
 
   /** vCard to attach to outgoing emails */
   TQString vCardFile() const { return mVCardFile; }
@@ -295,6 +306,7 @@ protected:
   // and operator>> accordingly:
   uint mUoid;
   TQString mIdentity, mFullName, mEmailAddr, mOrganization;
+  TQStringList mEmailAliases;
   TQString mReplyToAddr;
   TQString mBcc;
   TQString mVCardFile;