1 files changed, 31 insertions, 29 deletions

diff --git a/core/pim/datebook/datebookday.h b/core/pim/datebook/datebookday.h
index c8cb26b..3e44364 100644
--- a/core/pim/datebook/datebookday.h
+++ b/core/pim/datebook/datebookday.h
@@ -42,14 +42,14 @@ class DateBookDayViewQuickLineEdit : public QLineEdit
 {
-	Q_OBJECT
+    Q_OBJECT
 public:
-	DateBookDayViewQuickLineEdit(const QDateTime &start, const QDateTime &end,QWidget * parent, const char *name=0);
+    DateBookDayViewQuickLineEdit(const QDateTime &start, const QDateTime &end,QWidget * parent, const char *name=0);
 protected:
-	Event quickEvent;
-	int active;
-	void focusOutEvent( QFocusEvent *e );
+    Event quickEvent;
+    int active;
+    void focusOutEvent( QFocusEvent *e );
 protected slots:
-	void slotReturnPressed(void);
+    void slotReturnPressed(void);
         void finallyCallClose();
 signals:
-	void insertEvent(const Event &e);
+    void insertEvent(const Event &e);
 };
@@ -69,3 +69,3 @@ public slots:
     void moveDown();
-	void slotDateChanged( int year, int month, int day );
+    void slotDateChanged( int year, int month, int day );
 
@@ -75,3 +75,3 @@ signals:
 protected slots:
-	void slotChangeClock( bool );
+    void slotChangeClock( bool );
 protected:
@@ -86,4 +86,4 @@ private:
     bool ampm;
-	QDate currDate;
-	DateBookDayViewQuickLineEdit *quickLineEdit;
+    QDate currDate;
+    DateBookDayViewQuickLineEdit *quickLineEdit;
 };
@@ -159,15 +159,15 @@ class WidgetListClass : public QList<DateBookDayWidget>
 {
-	private:
+    private:
 
-	int compareItems( QCollection::Item s1, QCollection::Item s2 )
-	{
-		//hmm, don't punish me for that ;)
-		if (reinterpret_cast<DateBookDayWidget*>(s1)->geometry().height() > reinterpret_cast<DateBookDayWidget*>(s2)->geometry().height())
-		{
-			return -1;
-		} else
-		{
-			return 1;
-		}
-	}
+    int compareItems( QCollection::Item s1, QCollection::Item s2 )
+    {
+        //hmm, don't punish me for that ;)
+        if (reinterpret_cast<DateBookDayWidget*>(s1)->geometry().height() > reinterpret_cast<DateBookDayWidget*>(s2)->geometry().height())
+        {
+            return -1;
+        } else
+        {
+            return 1;
+        }
+    }
 
@@ -182,5 +182,6 @@ class DateBookDay : public QVBox
 public:
-    DateBookDay( bool ampm, bool startOnMonday, DateBookDB *newDb,
-		 QWidget *parent, const char *name );
+    DateBookDay( bool ampm, bool startOnMonday, DateBookDB *newDb,DateBookHoliday*newHdb,
+         QWidget *parent, const char *name );
     void selectedDates( QDateTime &start, QDateTime &end );
+
     QDate date() const;
@@ -201,3 +202,3 @@ public slots:
     void slotWeekChanged( bool bStartOnMonday );
-    void updateView();	//updates TimeMarker and DayWidget-colors
+    void updateView();  //updates TimeMarker and DayWidget-colors
 
@@ -227,8 +228,9 @@ private:
     DateBookDB *db;
-    WidgetListClass widgetList;	//reimplemented QList for sorting widgets by height
+    WidgetListClass widgetList; //reimplemented QList for sorting widgets by height
     int startTime;
-    bool jumpToCurTime;	//should we jump to current time in dayview?
+    bool jumpToCurTime; //should we jump to current time in dayview?
     int rowStyle;
     DateBookDayWidget *selectedWidget; //actual selected widget (obviously)
-    DateBookDayTimeMarker *timeMarker;	//marker for current time
+    DateBookDayTimeMarker *timeMarker;  //marker for current time
+    DateBookHoliday*_holiday_db;
 };