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

diff --git a/kmail/kmfolderdir.h b/kmail/kmfolderdir.h
index 72f4c4326..c93317e52 100644
--- a/kmail/kmfolderdir.h
+++ b/kmail/kmfolderdir.h
@@ -19,11 +19,16 @@ class KMFolderDir: public KMFolderNode, public KMFolderNodeList
 public:
   KMFolderDir( KMFolder * owner, KMFolderDir * parent = 0,
                const TQString& path = TQString::null,
-	       KMFolderDirType = KMStandardDir );
+               KMFolderDirType = KMStandardDir );
   virtual ~KMFolderDir();
 
   virtual bool isDir() const { return true; }
 
+  /**
+   * Adds the given subdirectory of this directory to the associated folder.
+   */
+  void addDirToParent( const TQString &dirName, KMFolder *parentFolder );
+
   /** Read contents of directory. */
   virtual bool reload();
 
@@ -39,9 +44,9 @@ public:
   /** Create a mail folder in this directory with given name. If sysFldr==TRUE
    the folder is marked as a (KMail) system folder.
    Returns Folder on success. */
-  virtual KMFolder* createFolder(const TQString& folderName,
-				 bool sysFldr=false,
-                                 KMFolderType folderType=KMFolderTypeMbox);
+  virtual KMFolder* createFolder( const TQString& folderName,
+                                  bool sysFldr=false,
+                                  KMFolderType folderType=KMFolderTypeMbox );
 
   /** Returns folder with given name or zero if it does not exist */
   virtual KMFolderNode* hasNamedFolder(const TQString& name);
@@ -67,9 +72,9 @@ class KMFolderRootDir: public KMFolderDir
   Q_OBJECT
 
 public:
-  KMFolderRootDir(KMFolderMgr* manager,
-		  const TQString& path=TQString::null,
-		  KMFolderDirType dirType = KMStandardDir);
+  KMFolderRootDir( KMFolderMgr* manager,
+                   const TQString& path=TQString::null,
+                   KMFolderDirType dirType = KMStandardDir );
   virtual ~KMFolderRootDir();
   virtual TQString path() const;