* 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, 16 insertions, 8 deletions

diff --git a/korganizer/kdatenavigator.h b/korganizer/kdatenavigator.h
index 047925895..682a93588 100644
--- a/korganizer/kdatenavigator.h
+++ b/korganizer/kdatenavigator.h
@@ -63,6 +63,14 @@ class KDateNavigator: public QFrame
     NavigatorBar *navigatorBar() const { return mNavigatorBar; }
     TQDate startDate() const;
     TQDate endDate() const;
+    void setUpdateNeeded();
+
+    /**
+       Returns the current displayed month.
+       It's a TQDate instead of uint so it can be easily feed to KCalendarSystem's
+       functions.
+    */
+    TQDate month() const;
 
   public slots:
     void selectDates( const KCal::DateList & );
@@ -75,24 +83,24 @@ class KDateNavigator: public QFrame
     void datesSelected( const KCal::DateList & );
     void incidenceDropped( Incidence *, const TQDate & );
     void incidenceDroppedMove( Incidence *, const TQDate & );
-    void weekClicked( const TQDate &);
+    void weekClicked( const TQDate & );
 
     void goPrevious();
     void goNext();
+    void nextMonthClicked();
+    void prevMonthClicked();
+    void nextYearClicked();
+    void prevYearClicked();
 
-    void goNextMonth();
-    void goPrevMonth();
-    void goNextYear();
-    void goPrevYear();
-
-    void goMonth( int month );
+    void monthSelected( int month );
+    void yearSelected( int year );
 
   protected:
     void updateDates();
 
     void wheelEvent( TQWheelEvent * );
 
-    bool eventFilter( TQObject *,TQEvent * );
+    bool eventFilter( TQObject *, TQEvent * );
 
     void setShowWeekNums( bool enabled );