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

diff --git a/kmail/editorwatcher.h b/kmail/editorwatcher.h
index e0d609051..839386f84 100644
--- a/kmail/editorwatcher.h
+++ b/kmail/editorwatcher.h
@@ -39,7 +39,15 @@ class EditorWatcher : public QObject
 {
   Q_OBJECT
   public:
-    EditorWatcher( const KURL &url, const TQString &mimeType, bool openWith, TQObject *parent = 0 );
+    /**
+     * Constructs an EditorWatcher.
+     * @param parent the parent object of this EditorWatcher, which will take care of deleting
+     *               this EditorWatcher if the parent is deleted.
+     * @param parentWidget the parent widget of this EditorWatcher, which will be used as the parent
+     *                     widget for message dialogs.
+     */
+    EditorWatcher( const KURL &url, const TQString &mimeType, bool openWith,
+                   TQObject *parent, TQWidget *parentWidget );
     bool start();
     bool fileChanged() const { return mFileModified; }
   signals:
@@ -55,6 +63,7 @@ class EditorWatcher : public QObject
     TQString mMimeType;
     bool mOpenWith;
     KProcess *mEditor;
+    TQWidget *mParentWidget;
 
     int mInotifyFd;
     int mInotifyWatch;