summaryrefslogtreecommitdiffstats
path: root/kaddressbook/addresseeutil.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 /kaddressbook/addresseeutil.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 'kaddressbook/addresseeutil.h')
-rw-r--r--kaddressbook/addresseeutil.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/kaddressbook/addresseeutil.h b/kaddressbook/addresseeutil.h
index 31d750e3f..5bcac3136 100644
--- a/kaddressbook/addresseeutil.h
+++ b/kaddressbook/addresseeutil.h
@@ -26,6 +26,7 @@
#include <tqstring.h>
#include <kabc/addressee.h>
+#include <kabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define
/**
This class provides some utility methods for transposing an
@@ -43,15 +44,23 @@ class AddresseeUtil
/**
Same as above function, except that an entire list of KABC::Addressee
objects will be converted to vCard and put in the string.
- */
+ */
+#if defined(KABC_VCARD_ENCODING_FIX)
+ static TQByteArray addresseesToClipboard( const KABC::Addressee::List &addrList );
+#else
static TQString addresseesToClipboard( const KABC::Addressee::List &addrList );
+#endif
/**
Convert a string from the clipboard into a list of addressee objects.
If the clipboard text was not a valid vcard, an empty list
will be returned.
*/
+#if defined(KABC_VCARD_ENCODING_FIX)
+ static KABC::Addressee::List clipboardToAddressees( const TQByteArray &clipboard );
+#else
static KABC::Addressee::List clipboardToAddressees( const TQString &clipboard );
+#endif
/**
Converts the list of addressee objects into a list of email addresses.