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

diff --git a/kmailcvt/filters.hxx b/kmailcvt/filters.hxx
index 203f3d7b..dc51f8c9 100644
--- a/kmailcvt/filters.hxx
+++ b/kmailcvt/filters.hxx
@@ -67,10 +67,13 @@ class Filter
     TQString author() const { return m_author; }
     TQString name() const { return m_name; }
     TQString info() const { return m_info; }
-    
+
+    virtual bool needsSecondPage();
+
     int count_duplicates; //to count all duplicate messages
-    
+
   protected:
+    void showKMailImportArchiveDialog( FilterInfo* info );
     bool addMessage( FilterInfo* info,
                      const TQString& folder,
                      const TQString& msgFile,
@@ -79,7 +82,6 @@ class Filter
                      		    const TQString& folder,
                      		    const TQString& msgFile,
                                 const TQString& msgStatusFlags = TQString());
-    bool endImport();
   private:
     TQString m_name;
     TQString m_author;
@@ -112,7 +114,7 @@ public:
 	    for(unsigned int i=0; i<size; i++) d[i]=s[i];
 	} ;
 
-	/** Assignment operator. Does the same thing as 
+	/** Assignment operator. Does the same thing as
 	*   the copy constructor.
 	*/
 	FolderStructureBase &operator =(const FolderStructureBase &s)