* 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, 23 insertions, 0 deletions

diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h
index 32518cd75..3ff1d67de 100644
--- a/kmail/kmfolder.h
+++ b/kmail/kmfolder.h
@@ -353,6 +353,13 @@ public:
 
   /** Is the folder read-only? */
   bool isReadOnly() const;
+  /** Can we write into and delete from this folder (on IMAP that's not necessarily !isReadOnly()) */
+  bool isWritable() const;
+
+  bool mailCheckInProgress() const;
+
+  /** Can messages in this folder be deleted? */
+  bool canDeleteMessages() const;
 
   /** Returns true if the folder is a kmail system folder. These are
     the folders 'inbox', 'outbox', 'sent', 'trash', 'drafts', 'templates'.
@@ -532,6 +539,13 @@ public:
   /** Sets the move-in-progress flag. */
   void setMoveInProgress( bool b ) { mMoveInProgress = b; }
 
+  /**
+  * Returns true if the name is valid for a child of this folder.
+  * If the name contains invalid characters then false is returned and message will contain
+  * an explanation that can be presented to the user.
+  */
+  bool isValidName( const TQString &folderName, TQString &message );
+
 signals:
   /** Emitted when the status, name, or associated accounts of this
     folder changed. */
@@ -590,6 +604,15 @@ signals:
   /** Emitted when the folder's size changes. */
   void folderSizeChanged( KMFolder * );
 
+  /** Emitted when the no content state changed. */
+  void noContentChanged();
+
+  /**
+   *  Emiitted when the sync state, i.e. mailCheckInProgress(), changes.
+   *  Currently only supported for disconnected IMAP.
+   */
+  void syncStateChanged();
+
 public slots:
   /** Incrementally update the index if possible else call writeIndex */
   int updateIndex();