* 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, 23 insertions, 18 deletions

diff --git a/kmail/vcardviewer.h b/kmail/vcardviewer.h
index 2fdcd090a..48da60ba3 100644
--- a/kmail/vcardviewer.h
+++ b/kmail/vcardviewer.h
@@ -22,6 +22,7 @@
 
 #include <kdialogbase.h>
 #include <kabc/addressee.h>
+#include <kabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define
 
 #include <tqvaluelist.h>
 
@@ -33,24 +34,28 @@ namespace KPIM {
 
 namespace KMail {
 
-  class VCardViewer : public KDialogBase
-  {
-     Q_OBJECT
-     public:
-       VCardViewer(TQWidget *parent, const TQString& vCard, const char* name);
-       virtual ~VCardViewer();
-
-     protected:
-       virtual void slotUser1();
-       virtual void slotUser2();
-       virtual void slotUser3();
-
-     private:
-       KPIM::AddresseeView *  mAddresseeView;
-       KABC::Addressee::List  mAddresseeList;
-
-       TQValueListIterator<KABC::Addressee> itAddresseeList;
-  };
+class VCardViewer : public KDialogBase
+{
+  Q_OBJECT
+  public:
+#if defined(KABC_VCARD_ENCODING_FIX)
+    VCardViewer( TQWidget *parent, const TQByteArray &vCard, const char *name );
+#else
+    VCardViewer( TQWidget *parent, const TQString &vCard, const char *name );
+#endif
+    virtual ~VCardViewer();
+
+  protected:
+    virtual void slotUser1();
+    virtual void slotUser2();
+    virtual void slotUser3();
+
+  private:
+    KPIM::AddresseeView *mAddresseeView;
+    KABC::Addressee::List mAddresseeList;
+
+    TQValueListIterator<KABC::Addressee> itAddresseeList;
+};
 
 }