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

diff --git a/korganizer/koeditorrecurrence.h b/korganizer/koeditorrecurrence.h
index 0ce9c6dda..05074cdd9 100644
--- a/korganizer/koeditorrecurrence.h
+++ b/korganizer/koeditorrecurrence.h
@@ -297,6 +297,9 @@ class KOEditorRecurrence : public QWidget
 
     bool doesRecur();
 
+    void saveValues();
+    void restoreValues();
+
   public slots:
     void setRecurrenceEnabled( bool );
     void setDateTimes( const TQDateTime &start, const TQDateTime &end );
@@ -311,6 +314,7 @@ class KOEditorRecurrence : public QWidget
     void showRecurrenceRangeDialog();
 
   private:
+    Recurrence mSaveRec;
     TQCheckBox *mEnabledCheck;
 
     TQGroupBox *mTimeGroupBox;
@@ -345,8 +349,13 @@ class KOEditorRecurrenceDialog : public KDialogBase
     KOEditorRecurrenceDialog( TQWidget *parent );
     KOEditorRecurrence* editor() const { return mRecurrence; }
 
+  protected slots:
+    void slotOk();
+    void slotCancel();
+
   private:
     KOEditorRecurrence *mRecurrence;
+    bool mRecurEnabled;
 };
 
 #endif