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

diff --git a/korganizer/koincidencetooltip.h b/korganizer/koincidencetooltip.h
index 11b5d39a3..348ab890b 100644
--- a/korganizer/koincidencetooltip.h
+++ b/korganizer/koincidencetooltip.h
@@ -27,6 +27,7 @@
 
 namespace KCal
 {
+class Calendar;
 class Incidence;
 }
 using namespace KCal;
@@ -39,19 +40,24 @@ class KOAgendaItem;
 class KOIncidenceToolTip : public QToolTip
 {
   public:
-    KOIncidenceToolTip(TQWidget * widget, TQToolTipGroup * group = 0 ):TQToolTip (widget, group),mText(0) {}
+    KOIncidenceToolTip( TQWidget *widget, Calendar *calendar, const TQDate &date, TQToolTipGroup *group = 0 )
+      : TQToolTip (widget, group), mCalendar( calendar ), mDate( date ), mText(0) {}
 /*    ~KOIncidenceToolTip();*/
 
   public:
-    static void add ( TQWidget * widget, Incidence *incidence,
-        TQToolTipGroup * group = 0, const TQString & longText = "" );
-    static void add( KOAgendaItem *item, Incidence *incidence = 0,
+    static void add ( TQWidget *widget, Calendar *calendar,
+                      Incidence *incidence, const TQDate &date=TQDate(),
+                      TQToolTipGroup *group = 0, const TQString &longText = "" );
+    static void add( KOAgendaItem *item, Calendar *calendar,
+                     Incidence *incidence = 0, const TQDate &date=TQDate(),
                      TQToolTipGroup *group = 0 );
 
     /* reimplmented from TQToolTip */
     void maybeTip( const TQPoint &pos );
 
   private:
+    Calendar *mCalendar;
+    TQDate mDate;
     TQString mText;
 };