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

diff --git a/korganizer/koagendaitem.h b/korganizer/koagendaitem.h
index fc774dd1f..f15594428 100644
--- a/korganizer/koagendaitem.h
+++ b/korganizer/koagendaitem.h
@@ -34,6 +34,7 @@ class TQDragEnterEvent;
 class TQDropEvent;
 
 namespace KCal {
+class Calendar;
 class Incidence;
 }
 using namespace KCal;
@@ -75,8 +76,10 @@ class KOAgendaItem : public TQWidget, public KOrg::CellItem
 {
     Q_OBJECT
   public:
-    KOAgendaItem(Incidence *incidence, const TQDate &qd, TQWidget *parent, const char *name=0,
-                 WFlags f=0 );
+    KOAgendaItem( Calendar *calendar, Incidence *incidence, const TQDate &qd,
+                  TQWidget *parent,
+                  int itemPos, int itemCount,
+                  const char *name = 0, WFlags f = 0 );
 
     int cellXLeft() const { return mCellXLeft; }
     int cellXRight() const { return mCellXRight; }
@@ -85,6 +88,9 @@ class KOAgendaItem : public TQWidget, public KOrg::CellItem
     int cellHeight() const;
     int cellWidth() const;
 
+    int itemPos() const { return mItemPos; }
+    int itemCount() const { return mItemCount; }
+
     void setCellXY(int X, int YTop, int YBottom);
     void setCellY(int YTop, int YBottom);
     void setCellX(int XLeft, int XRight);
@@ -173,15 +179,19 @@ class KOAgendaItem : public TQWidget, public KOrg::CellItem
   private:
     int mCellXLeft, mCellXRight;
     int mCellYTop, mCellYBottom;
-    int mSubCell;  // subcell number of this item
-    int mSubCells;  // Total number of subcells in cell of this item
 
+    Calendar *mCalendar;
     Incidence *mIncidence; // corresponding event or todo
     TQDate mDate; //date this events occurs (for recurrence)
     TQString mLabelText;
     bool mIconAlarm, mIconRecur, mIconReadonly;
     bool mIconReply, mIconGroup, mIconGroupTentative;
-    bool mIconOrganizer;
+    bool mIconOrganizer, mSpecialEvent;
+
+    // For incidences that expand through more than 1 day
+    // Will be 1 for single day incidences
+    int mItemPos;
+    int mItemCount;
 
     // Multi item pointers
     MultiItemInfo* mMultiItemInfo;