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

diff --git a/korganizer/korganizer_part.h b/korganizer/korganizer_part.h
index 25a4b9c4b..ad6a45081 100644
--- a/korganizer/korganizer_part.h
+++ b/korganizer/korganizer_part.h
@@ -51,6 +51,8 @@ namespace KOrg {
 class CalendarViewBase;
 }
 
+class TQDate;
+
 class KOrganizerPart: public KParts::ReadOnlyPart,
                       public KOrg::MainWindow
 {
@@ -81,10 +83,12 @@ class KOrganizerPart: public KParts::ReadOnlyPart,
     virtual KActionCollection *getActionCollection() const { return actionCollection(); }
     virtual void showStatusMessage( const TQString &message );
 
+    virtual bool isCurrentlyActivePart();
+
     void setTitle();
 
   public slots:
-    void slotChangeInfo( Incidence * );
+    void slotChangeInfo( Incidence *incidence, const TQDate & );
 
   protected:
     virtual bool openFile();