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
@@ -15,4 +15,5 @@
 class QDateTime;
 class DateBookDB;
+class DateBookDBHoliday;
 
 class DateBookWeekLstHeader: public DateBookWeekLstHeaderBase
@@ -21,22 +22,22 @@ class DateBookWeekLstHeader: public DateBookWeekLstHeaderBase
 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;
 };
 
@@ -46,6 +47,6 @@ class DateBookWeekLstDayHdr: public DateBookWeekLstDayHdrBase
 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();
@@ -54,5 +55,5 @@ 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;
@@ -64,6 +65,6 @@ class DateBookWeekLstEvent: public Opie::Ui::OClickableLabel
 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);
@@ -89,20 +90,20 @@ class DateBookWeekLstView: public QWidget
 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 *);
 };
 
@@ -111,8 +112,8 @@ class DateBookWeekLstDblView: public QWidget {
 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);
@@ -123,5 +124,5 @@ 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);
 };
 
@@ -131,7 +132,7 @@ 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();
     void setDate( int y, int w );
@@ -150,19 +151,19 @@ 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;
     bool ampm;
     bool bStartOnMonday;
     bool dbl;
-        QDate bdate;
+    QDate bdate;
     int year, _week,dow;
     DateBookWeekLstHeader *header;