1 files changed, 47 insertions, 46 deletions

diff --git a/core/pim/datebook/datebookweeklst.h b/core/pim/datebook/datebookweeklst.h
index 3bc7f2f..38d7777 100644
--- a/core/pim/datebook/datebookweeklst.h
+++ b/core/pim/datebook/datebookweeklst.h
@@ -14,30 +14,31 @@
 
 class QDateTime;
 class DateBookDB;
+class DateBookDBHoliday;
 
 class DateBookWeekLstHeader: public DateBookWeekLstHeaderBase
 {
     Q_OBJECT
 public:
     DateBookWeekLstHeader(bool onM, QWidget* parent = 0, const char* name = 0,
-			  WFlags fl = 0 );
+              WFlags fl = 0 );
     ~DateBookWeekLstHeader();
     void setDate(const QDate &d);
 
 public slots:
-	void nextWeek();
-	void prevWeek();
-	void nextMonth();
-	void prevMonth();
-	void pickDate();
-	void setDate(int y, int m, int d);
+    void nextWeek();
+    void prevWeek();
+    void nextMonth();
+    void prevMonth();
+    void pickDate();
+    void setDate(int y, int m, int d);
 signals:
-	void dateChanged(QDate &newdate);
-	void setDbl(bool on);
+    void dateChanged(QDate &newdate);
+    void setDbl(bool on);
 private:
-	QDate date;
-//	bool onMonday;
-	bool bStartOnMonday;
+    QDate date;
+//  bool onMonday;
+    bool bStartOnMonday;
 };
 
 class DateBookWeekLstDayHdr: public DateBookWeekLstDayHdrBase
@@ -45,15 +46,15 @@ class DateBookWeekLstDayHdr: public DateBookWeekLstDayHdrBase
     Q_OBJECT
 public:
     DateBookWeekLstDayHdr(const QDate &d, bool onM,
-			  QWidget* parent = 0, const char* name = 0,
-			  WFlags fl = 0 );
+              QWidget* parent = 0, const char* name = 0,
+              WFlags fl = 0 );
 public slots:
     void showDay();
     void newEvent();
 signals:
     void showDate(int y, int m, int d);
     void addEvent(const QDateTime &start, const QDateTime &stop,
-		  const QString &str, const QString &location);
+          const QString &str, const QString &location);
 private:
     QDate date;
 };
@@ -63,8 +64,8 @@ class DateBookWeekLstEvent: public Opie::Ui::OClickableLabel
   Q_OBJECT
 public:
     DateBookWeekLstEvent(const EffectiveEvent &ev, int weeklistviewconfig =1,
-			 QWidget* parent = 0, const char* name = 0,
-			 WFlags fl = 0);
+             QWidget* parent = 0, const char* name = 0,
+             WFlags fl = 0);
 signals:
     void editEvent(const Event &e);
     void duplicateEvent(const Event &e);
@@ -88,32 +89,32 @@ class DateBookWeekLstView: public QWidget
     Q_OBJECT
 public:
     DateBookWeekLstView(QValueList<EffectiveEvent> &ev, const QDate &d, bool onM,
-			QWidget* parent = 0, const char* name = 0,
-			WFlags fl = 0 );
+            QWidget* parent = 0, const char* name = 0,
+            WFlags fl = 0 );
     ~DateBookWeekLstView();
 signals:
-	void editEvent(const Event &e);
-	void duplicateEvent(const Event &e);
-	void removeEvent(const Event &e);
-	void beamEvent(const Event &e);
-	void redraw();
-	void showDate(int y, int m, int d);
-	void addEvent(const QDateTime &start, const QDateTime &stop,
-	const QString &str, const QString &location);
+    void editEvent(const Event &e);
+    void duplicateEvent(const Event &e);
+    void removeEvent(const Event &e);
+    void beamEvent(const Event &e);
+    void redraw();
+    void showDate(int y, int m, int d);
+    void addEvent(const QDateTime &start, const QDateTime &stop,
+    const QString &str, const QString &location);
 private:
-	bool bStartOnMonday;
+    bool bStartOnMonday;
 protected slots:
-	void keyPressEvent(QKeyEvent *);
+    void keyPressEvent(QKeyEvent *);
 };
 
 class DateBookWeekLstDblView: public QWidget {
         Q_OBJECT
 public:
     DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
-			   QValueList<EffectiveEvent> &ev2,
-			   QDate &d, bool onM,
-			   QWidget* parent = 0, const char* name = 0,
-			   WFlags fl = 0 );
+               QValueList<EffectiveEvent> &ev2,
+               QDate &d, bool onM,
+               QWidget* parent = 0, const char* name = 0,
+               WFlags fl = 0 );
 signals:
     void editEvent(const Event &e);
     void duplicateEvent(const Event &e);
@@ -122,7 +123,7 @@ signals:
     void redraw();
     void showDate(int y, int m, int d);
     void addEvent(const QDateTime &start, const QDateTime &stop,
-		  const QString &str, const QString &location);
+          const QString &str, const QString &location);
 };
 
 class DateBookWeekLst : public QWidget
@@ -130,9 +131,9 @@ class DateBookWeekLst : public QWidget
     Q_OBJECT
 
 public:
-    DateBookWeekLst( bool ampm, bool onM, DateBookDB *newDB,
-		     QWidget *parent = 0,
-		     const char *name = 0 );
+    DateBookWeekLst( bool ampm, bool onM, DateBookDBHoliday *newDB,
+             QWidget *parent = 0,
+             const char *name = 0 );
     ~DateBookWeekLst();
     void setDate( int y, int w );
     void setDate(const QDate &d );
@@ -149,21 +150,21 @@ protected slots:
     void setDbl(bool on);
 
 signals:
-	void showDate(int y, int m, int d);
-	void addEvent(const QDateTime &start, const QDateTime &stop,
-	const QString &str, const QString &location);
-	void editEvent(const Event &e);
-	void duplicateEvent(const Event &e);
-	void removeEvent(const Event &e);
-	void beamEvent(const Event &e);
+    void showDate(int y, int m, int d);
+    void addEvent(const QDateTime &start, const QDateTime &stop,
+    const QString &str, const QString &location);
+    void editEvent(const Event &e);
+    void duplicateEvent(const Event &e);
+    void removeEvent(const Event &e);
+    void beamEvent(const Event &e);
 
 private:
-    DateBookDB *db;
+    DateBookDBHoliday *db;
     int startTime;
     bool ampm;
     bool bStartOnMonday;
     bool dbl;
-	QDate bdate;
+    QDate bdate;
     int year, _week,dow;
     DateBookWeekLstHeader *header;
     QWidget *view;