* 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, 4 insertions, 3 deletions

diff --git a/korganizer/komailclient.h b/korganizer/komailclient.h
index da71ecec1..3051bab7e 100644
--- a/korganizer/komailclient.h
+++ b/korganizer/komailclient.h
@@ -45,8 +45,8 @@ class KOMailClient
   protected:
     /** Send mail with specified from, to and subject field and body as text. If
      * bcc is set, send a blind carbon copy to the sender from */
-    bool send(const TQString &from,const TQString &to,const TQString &subject,
-              const TQString &body,bool bcc=false,
+    bool send(const TQString &from,const TQString &to,const TQString &cc,
+              const TQString &subject,const TQString &body,bool bcc=false,
               const TQString &attachment=TQString::null);
 
     int kMailOpenComposer(const TQString& to, const TQString& cc,
@@ -59,7 +59,8 @@ class KOMailClient
                           const TQCString& attachParamAttr,
                           const TQString& attachParamValue,
                           const TQCString& attachContDisp,
-                          const TQCString& attachCharset);
+                          const TQCString& attachCharset,
+                          uint identity);
     int kMailOpenComposer(const TQString& arg0,const TQString& arg1,
                           const TQString& arg2,const TQString& arg3,
                           const TQString& arg4,int arg5,const KURL& arg6);