* 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, 7 deletions

diff --git a/korganizer/koeventpopupmenu.h b/korganizer/koeventpopupmenu.h
index 8d4f2df2..96911b8c 100644
--- a/korganizer/koeventpopupmenu.h
+++ b/korganizer/koeventpopupmenu.h
@@ -31,6 +31,7 @@
 #include <tqdatetime.h>
 
 namespace KCal {
+class Calendar;
 class Incidence;
 }
 using namespace KCal;
@@ -46,7 +47,7 @@ class KOEventPopupMenu : public TQPopupMenu {
 
 
   public slots:
-    void showIncidencePopup( Incidence *, const TQDate & );
+    void showIncidencePopup( Calendar *, Incidence *, const TQDate & );
 
   protected slots:
     void popupShow();
@@ -62,17 +63,19 @@ class KOEventPopupMenu : public TQPopupMenu {
     void forward();
 
   signals:
-    void editIncidenceSignal(Incidence *);
-    void showIncidenceSignal(Incidence *);
-    void deleteIncidenceSignal(Incidence *);
-    void cutIncidenceSignal(Incidence *);
-    void copyIncidenceSignal(Incidence *);
+    void configChanged();
+    void editIncidenceSignal( Incidence *, const TQDate & );
+    void showIncidenceSignal( Incidence *, const TQDate & );
+    void deleteIncidenceSignal( Incidence * );
+    void cutIncidenceSignal( Incidence * );
+    void copyIncidenceSignal( Incidence * );
     void pasteIncidenceSignal();
-    void toggleAlarmSignal(Incidence *);
+    void toggleAlarmSignal( Incidence * );
     void dissociateOccurrenceSignal( Incidence *, const TQDate & );
     void dissociateFutureOccurrenceSignal( Incidence *, const TQDate & );
 
   private:
+    Calendar *mCalendar;
     Incidence *mCurrentIncidence;
     TQDate mCurrentDate;