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
@@ -16,2 +16,3 @@ class QDateTime;
 class DateBookDB;
+class DateBookDBHoliday;
 
@@ -22,3 +23,3 @@ public:
     DateBookWeekLstHeader(bool onM, QWidget* parent = 0, const char* name = 0,
-                          WFlags fl = 0 );
+              WFlags fl = 0 );
     ~DateBookWeekLstHeader();
@@ -27,15 +28,15 @@ public:
 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;
 };
@@ -47,4 +48,4 @@ 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:
@@ -55,3 +56,3 @@ signals:
     void addEvent(const QDateTime &start, const QDateTime &stop,
-                  const QString &str, const QString &location);
+          const QString &str, const QString &location);
 private:
@@ -65,4 +66,4 @@ 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:
@@ -90,18 +91,18 @@ 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 *);
 };
@@ -112,6 +113,6 @@ 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:
@@ -124,3 +125,3 @@ signals:
     void addEvent(const QDateTime &start, const QDateTime &stop,
-                  const QString &str, const QString &location);
+          const QString &str, const QString &location);
 };
@@ -132,5 +133,5 @@ class DateBookWeekLst : public QWidget
 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();
@@ -151,12 +152,12 @@ protected slots:
 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;
@@ -165,3 +166,3 @@ private:
     bool dbl;
-        QDate bdate;
+    QDate bdate;
     int year, _week,dow;