summaryrefslogtreecommitdiffstats
path: root/libkdepim/kvcarddrag.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
commitcc29364f06178f8f6b457384f2ec37a042bd9d43 (patch)
tree7c77a3184c698bbf9d98cef09fb1ba8124daceba /libkdepim/kvcarddrag.h
parent4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff)
downloadtdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz
tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip
* 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
Diffstat (limited to 'libkdepim/kvcarddrag.h')
-rw-r--r--libkdepim/kvcarddrag.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/libkdepim/kvcarddrag.h b/libkdepim/kvcarddrag.h
index 55b3ef188..30d8dd742 100644
--- a/libkdepim/kvcarddrag.h
+++ b/libkdepim/kvcarddrag.h
@@ -26,6 +26,7 @@
#include <tqstring.h>
#include <kabc/addressee.h>
+#include <kabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define
#include <kdepimmacros.h>
class KVCardDragPrivate;
@@ -49,14 +50,21 @@ class KDE_EXPORT KVCardDrag : public QStoredDrag
/**
* Constructs a vcard drag with the @p addressee.
*/
+#if defined(KABC_VCARD_ENCODING_FIX)
+ KVCardDrag( const TQByteArray &content, TQWidget *dragsource = 0, const char *name = 0 );
+#else
KVCardDrag( const TQString &content, TQWidget *dragsource = 0, const char *name = 0 );
+#endif
virtual ~KVCardDrag() {}
/**
* Sets the vcard of the drag to @p content.
*/
+#if defined(KABC_VCARD_ENCODING_FIX)
+ void setVCard( const TQByteArray &content );
+#else
void setVCard( const TQString &content );
-
+#endif
/**
* Returns true if the MIME source @p e contains a vcard object.
*/
@@ -65,7 +73,11 @@ class KDE_EXPORT KVCardDrag : public QStoredDrag
/**
* Decodes the MIME source @p e and puts the resulting vcard into @p content.
*/
+#if defined(KABC_VCARD_ENCODING_FIX)
+ static bool decode( TQMimeSource *e, TQByteArray &content );
+#else
static bool decode( TQMimeSource *e, TQString &content );
+#endif
/**
* Decodes the MIME source @p e and puts the resulting vcard into @p addresseess.