* 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, 41 insertions, 2 deletions

diff --git a/kaddressbook/undocmds.h b/kaddressbook/undocmds.h
index 192a4e80b..43f6aae99 100644
--- a/kaddressbook/undocmds.h
+++ b/kaddressbook/undocmds.h
@@ -32,6 +32,8 @@
 
 #include <kabc/addressbook.h>
 #include <kabc/addressee.h>
+#include <kabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define
+
 #include <kcommand.h>
 
 #include "kablock.h"
@@ -48,9 +50,9 @@ class Command : public KCommand
   protected:
     KABC::AddressBook *addressBook() const { return mAddressBook; }
     KABLock *lock() const { return KABLock::self( mAddressBook ); }
-
+  bool resourceExist( KABC::Resource *resource );
   private:
-    KABC::AddressBook *mAddressBook;
+    KABC::AddressBook* mAddressBook;
 };
 
 class DeleteCommand : public Command
@@ -94,7 +96,11 @@ class CutCommand : public Command
   private:
     KABC::Addressee::List mAddresseeList;
     TQStringList mUIDList;
+#if defined(KABC_VCARD_ENCODING_FIX)
+    TQByteArray mClipText;
+#else
     TQString mClipText;
+#endif
     TQString mOldText;
 };
 
@@ -127,4 +133,37 @@ class EditCommand : public Command
     KABC::Addressee mNewAddressee;
 };
 
+class CopyToCommand : public Command
+{
+    public:
+        CopyToCommand( KABC::AddressBook *addressBook, const TQStringList &uidList,
+                               KABC::Resource *resource );
+
+        virtual TQString name() const;
+        virtual void unexecute();
+        virtual void execute();
+
+    private:
+        KABC::Addressee::List mAddresseeList;
+        TQStringList mUIDList;
+        KABC::Resource *mResource;
+};
+
+class MoveToCommand : public Command
+{
+    public:
+        MoveToCommand( KAB::Core *core, const TQStringList &uidList,
+                               KABC::Resource *resource );
+
+        virtual TQString name() const;
+        virtual void unexecute();
+        virtual void execute();
+        void moveContactTo( KABC::Resource *resource );
+
+    private:
+        KABC::Addressee::List mAddresseeList;
+        TQStringList mUIDList;
+        KABC::Resource *mResource;
+        KAB::Core *mCore;
+};
 #endif