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
@@ -1,236 +1,238 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef DATEBOOKDAY_H
 #define DATEBOOKDAY_H
 
 #include <qpe/event.h>
 
 #include <qdatetime.h>
 #include <qtable.h>
 #include <qvbox.h>
 #include <qlist.h>
 
 #include "datebook.h"
 #include <qlineedit.h>
 
 class DateBookDayHeader;
 class DateBookDB;
 class DatebookdayAllday;
 class QDateTime;
 class QMouseEvent;
 class QPaintEvent;
 class QResizeEvent;
 
 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);
 };
 
 
 class DateBookDayView : public QTable
 {
     Q_OBJECT
 public:
     DateBookDayView( bool hourClock, QWidget *parent, const char *name );
     bool whichClock() const;
 
     void setRowStyle( int style );
 
 public slots:
     void moveUp();
     void moveDown();
-	void slotDateChanged( int year, int month, int day );
+    void slotDateChanged( int year, int month, int day );
 
 signals:
     void sigColWidthChanged();
     void sigCapturedKey( const QString &txt );
 protected slots:
-	void slotChangeClock( bool );
+    void slotChangeClock( bool );
 protected:
     virtual void paintCell( QPainter *p, int row, int col, const QRect &cr, bool selected );
     virtual void paintFocus( QPainter *p, const QRect &cr );
 
     virtual void resizeEvent( QResizeEvent *e );
     void keyPressEvent( QKeyEvent *e );
     void contentsMouseReleaseEvent( QMouseEvent *e );
     void initHeader();
 private:
     bool ampm;
-	QDate currDate;
-	DateBookDayViewQuickLineEdit *quickLineEdit;
+    QDate currDate;
+    DateBookDayViewQuickLineEdit *quickLineEdit;
 };
 
 class DateBookDay;
 class DateBookDayWidget : public QWidget
 {
     Q_OBJECT
 
 public:
     DateBookDayWidget( const EffectiveEvent &e, DateBookDay *db );
     ~DateBookDayWidget();
 
     const QRect &geometry() { return geom; }
     void setGeometry( const QRect &r );
 
     const EffectiveEvent &event() const { return ev; }
 
 signals:
     void deleteMe( const Event &e );
     void duplicateMe( const Event &e );
     void editMe( const Event &e );
     void beamMe( const Event &e );
 
 protected:
     void paintEvent( QPaintEvent *e );
     void mousePressEvent( QMouseEvent *e );
 
 private:
     /**
      * Sets the text for an all day Event
      * All day events have no time associated
      */
     void setAllDayText( QString& text );
 
     /**
      * Sets the EventText
      * it got a start and an end Time
      */
     void setEventText( QString& text );
     EffectiveEvent ev;
     DateBookDay *dateBook;
     QString text;
     QRect geom;
 };
 
 //Marker for current time in the dayview
 class DateBookDayTimeMarker : public QWidget
 {
     Q_OBJECT
 
 public:
     DateBookDayTimeMarker( DateBookDay *db );
     ~DateBookDayTimeMarker();
 
     const QRect &geometry() { return geom; }
     void setGeometry( const QRect &r );
     void setTime( const QTime &t );
 
 signals:
 
 protected:
     void paintEvent( QPaintEvent *e );
 
 private:
     QRect geom;
     QTime time;
     DateBookDay *dateBook;
 };
 
 //reimplemented the compareItems function so that it sorts DayWidgets by geometry heights
 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;
+        }
+    }
 
 
 };
 
 class DateBookDay : public QVBox
 {
     Q_OBJECT
 
     friend class DateBookDayWidget; // for beam this occurence and access to DateBookDB
 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;
     DateBookDayView *dayView() const { return view; }
     void setStartViewTime( int startHere );
     int startViewTime() const;
     void setSelectedWidget( DateBookDayWidget * );
     DateBookDayWidget * getSelectedWidget( void );
     void setJumpToCurTime( bool bJump );
     void setRowStyle( int style );
     static QDate findRealStart( int uid, const QDate& isIncluded,
                                 DateBookDB* );
 
 public slots:
     void setDate( int y, int m, int d );
     void setDate( QDate );
     void redraw();
     void slotWeekChanged( bool bStartOnMonday );
-    void updateView();	//updates TimeMarker and DayWidget-colors
+    void updateView();  //updates TimeMarker and DayWidget-colors
 
 signals:
     void removeEvent( const Event& );
     void editEvent( const Event& );
     void duplicateEvent( const Event& );
     void beamEvent( const Event& );
     void newEvent();
     void sigNewEvent( const QString & );
 
 protected slots:
     void keyPressEvent(QKeyEvent *);
 
 private slots:
     void dateChanged( int y, int m, int d );
     void slotColWidthChanged() { relayoutPage(); };
 
 private:
     void getEvents();
     void relayoutPage( bool fromResize = false );
     DateBookDayWidget *intersects( const DateBookDayWidget *item, const QRect &geom );
     QDate currDate;
     DateBookDayView *view;
     DateBookDayHeader *header;
     DatebookdayAllday *m_allDays;
     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;
 };
 
 #endif