* 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, 49 deletions

diff --git a/kmail/kmfolderseldlg.h b/kmail/kmfolderseldlg.h
index 119ceff78..f1637a2f8 100644
--- a/kmail/kmfolderseldlg.h
+++ b/kmail/kmfolderseldlg.h
@@ -7,61 +7,16 @@
 #define kmfolderseldlg_h
 
 #include <kdialogbase.h>
-#include <kfoldertree.h>
+#include <simplefoldertree.h>
+#include <tqvaluelist.h>
+#include <tqguardedptr.h>
 
 class KMFolder;
 class KMFolderTree;
 class KMMainWidget;
+class SimpleFolderTree;
 
 namespace KMail {
-
-  class SimpleFolderTree : public KFolderTree
-  {
-    Q_OBJECT
-
-    public:
-      SimpleFolderTree( TQWidget * parent, KMFolderTree * folderTree,
-                        const TQString & preSelection, bool mustBeReadWrite );
-
-      /** Reload the tree and select what folders to show and what not */
-      void reload( bool mustBeReadWrite, bool showOutbox, bool showImapFolders,
-                   const TQString& preSelection = TQString::null );
-
-      /** Return the current folder */
-      const KMFolder * folder() const;
-
-      /** Set the current folder */
-      void setFolder( KMFolder* );
-      void setFolder( const TQString& idString );
-
-      /** Apply the given filter. */
-      void applyFilter( const TQString& filter );
-
-    public slots:
-      void addChildFolder();
-
-    protected slots:
-      void slotContextMenuRequested( TQListViewItem *, const TQPoint & );
-      virtual void recolorRows();
-
-    protected:
-      /** Read color options and set palette. */
-      virtual void readColorConfig(void);
-      virtual void keyPressEvent( TQKeyEvent *e );
-
-      /** Folder and path column IDs. */
-      friend class KMFolderSelDlg;
-      int mFolderColumn;
-      int mPathColumn;
-
-    private:
-      KMFolderTree* mFolderTree;
-      TQString mFilter;
-      bool mLastMustBeReadWrite;
-      bool mLastShowOutbox;
-      bool mLastShowImapFolders;
-};
-
   //-----------------------------------------------------------------------------
   class KMFolderSelDlg: public KDialogBase
   {