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

diff --git a/kmail/customtemplates.h b/kmail/customtemplates.h
index dc454bf6..a8c24061 100644
--- a/kmail/customtemplates.h
+++ b/kmail/customtemplates.h
@@ -26,6 +26,8 @@
 #include "customtemplates_base.h"
 #include "templatesinsertcommand.h"
 
+#include <kshortcut.h>
+
 struct CustomTemplateItem;
 typedef TQDict<CustomTemplateItem> CustomTemplateItemList;
 class KShortcut;
@@ -59,20 +61,29 @@ class CustomTemplates : public CustomTemplatesBase
     void slotListSelectionChanged();
     void slotTypeActivated( int index );
     void slotShortcutCaptured( const KShortcut &shortcut );
-
+  void slotNameChanged( const TQString& );
   signals:
 
     void changed();
 
   protected:
 
+    void setRecipientsEditsEnabled( bool enabled );
+
     TQListViewItem *mCurrentItem;
     CustomTemplateItemList mItemList;
 
+    /// These templates will be deleted when we're saving.
+    TQStringList mItemsToDelete;
+
     TQPixmap mReplyPix;
     TQPixmap mReplyAllPix;
     TQPixmap mForwardPix;
 
+    /// Whether or not to emit the changed() signal. This is useful to disable when loading
+    /// templates, which changes the UI without user action
+    bool mBlockChangeSignal;
+
 };
 
 struct CustomTemplateItem
@@ -81,12 +92,15 @@ struct CustomTemplateItem
   CustomTemplateItem( const TQString &name,
                       const TQString &content,
                       KShortcut &shortcut,
-                      CustomTemplates::Type type ) :
-    mName( name ), mContent( content ), mShortcut(shortcut), mType( type ) {}
+                      CustomTemplates::Type type,
+                      TQString to, TQString cc ) :
+    mName( name ), mContent( content ), mShortcut(shortcut), mType( type ),
+    mTo( to ), mCC( cc ) {}
 
   TQString mName, mContent;
   KShortcut mShortcut;
   CustomTemplates::Type mType;
+  TQString mTo, mCC;
 };
 
 #endif // CUSTOMTEMPLATES_H