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

diff --git a/kmail/kmreadermainwin.h b/kmail/kmreadermainwin.h
index ba458eb0a..a4d8e9725 100644
--- a/kmail/kmreadermainwin.h
+++ b/kmail/kmreadermainwin.h
@@ -36,8 +36,16 @@ public:
 
   void setUseFixedFont( bool useFixedFont );
 
-  // take ownership of and show @param msg
-  void showMsg( const TQString & encoding, KMMessage *msg );
+  /**
+   * take ownership of and show @param msg
+   *
+   * The last two paramters, serNumOfOriginalMessage and nodeIdOffset, are needed when @p msg
+   * is derived from another message, e.g. the user views an encapsulated message in this window.
+   * Then, the reader needs to know about that original message, so those to paramters are passed
+   * onto setOriginalMsg() of KMReaderWin.
+   */
+  void showMsg( const TQString & encoding, KMMessage *msg,
+                unsigned long serNumOfOriginalMessage = 0, int nodeIdOffset = -1 );
 
   /**
    * Sets up action list for forward menu.
@@ -70,10 +78,19 @@ private slots:
 
   void slotFolderRemoved( TQObject* folderPtr );
 
+  /// This closes the window if the setting to close the window after replying or
+  /// forwarding is set.
+  void slotReplyOrForwardFinished();
+
 private:
   void initKMReaderMainWin();
   void setupAccel();
 
+  /**
+   * @see the KMMainWidget function with the same name.
+   */
+  void setupForwardActions();
+
   KMReaderWin *mReaderWin;
   KMMessage *mMsg;
   KURL mUrl;