1 files changed, 32 insertions, 25 deletions

diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index 1a9d16d..bca76e5 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -22,15 +22,22 @@
 
 #include <qlabel.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qdatetime.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qpoint.h>
-#include <qwidgetstack.h>
+#include <q3widgetstack.h>
 #include <qlayout.h>
 #include <qtimer.h>
-#include <qintdict.h>
+#include <q3intdict.h>
 #include <qpushbutton.h>
-#include <qvaluelist.h>
-#include <qptrvector.h>
+#include <q3valuelist.h>
+#include <q3ptrvector.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QFocusEvent>
+#include <QMouseEvent>
+#include <Q3PtrList>
+#include <Q3PopupMenu>
+#include <QKeyEvent>
 
 #include <libkcal/calendar.h>
@@ -73,5 +80,5 @@ private slots :
 };
 
-class KNoScrollListBox: public QListBox
+class KNoScrollListBox: public Q3ListBox
 {
     Q_OBJECT
@@ -104,5 +111,5 @@ class KNoScrollListBox: public QListBox
 
 
-class MonthViewItem: public QListBoxItem
+class MonthViewItem: public Q3ListBoxItem
 {
   public:
@@ -127,6 +134,6 @@ class MonthViewItem: public QListBoxItem
   protected:
     virtual void paint(QPainter *);
-    virtual int height(const QListBox *) const;
-    virtual int width(const QListBox *) const;
+    virtual int height(const Q3ListBox *) const;
+    virtual int width(const Q3ListBox *) const;
 
   private:
@@ -199,13 +206,13 @@ public slots:
     void repaintfinishUpdateCell();
   protected slots: 
-    void defaultAction( QListBoxItem * );
-    void contextMenu( QListBoxItem * );
-    void selection( QListBoxItem * );
-    void cellClicked( QListBoxItem * );
+    void defaultAction( Q3ListBoxItem * );
+    void contextMenu( Q3ListBoxItem * );
+    void selection( Q3ListBoxItem * );
+    void cellClicked( Q3ListBoxItem * );
     void newEvent();
     
   private:
     int mdayCount;
-    QPtrList <MonthViewItem> mAvailItemList; 
+    Q3PtrList <MonthViewItem> mAvailItemList; 
     KOMonthView *mMonthView;
     int currentPalette; 
@@ -248,5 +255,5 @@ class KOMonthView: public KOEventView
 
     /** returns the currently selected events */
-    virtual QPtrList<Incidence> selectedIncidences();
+    virtual Q3PtrList<Incidence> selectedIncidences();
 
     /** returns dates of the currently selected events */
@@ -270,5 +277,5 @@ class KOMonthView: public KOEventView
     virtual void updateConfig();
     virtual void showDates(const QDate &start, const QDate &end);
-    virtual void showEvents(QPtrList<Event> eventList);
+    virtual void showEvents(Q3PtrList<Event> eventList);
 
     void changeEventDisplay(Event *, int);
@@ -312,5 +319,5 @@ class KOMonthView: public KOEventView
     int currentWeek();
     bool clPending;
-    QWidgetStack * mWidStack;
+    Q3WidgetStack * mWidStack;
     QWidget* mMonthView;
     QWidget* mWeekView;
@@ -326,10 +333,10 @@ class KOMonthView: public KOEventView
     void doComputeLayoutWeek();
 
-    QPtrVector<MonthViewCell> mCells;
-    QPtrVector<QLabel> mDayLabels;
-    QPtrVector<KOWeekButton> mWeekLabels;
-    QPtrVector<MonthViewCell> mCellsW;
-    QPtrVector<QLabel> mDayLabelsW;
-    QPtrVector<KOWeekButton> mWeekLabelsW;
+    Q3PtrVector<MonthViewCell> mCells;
+    Q3PtrVector<QLabel> mDayLabels;
+    Q3PtrVector<KOWeekButton> mWeekLabels;
+    Q3PtrVector<MonthViewCell> mCellsW;
+    Q3PtrVector<QLabel> mDayLabelsW;
+    Q3PtrVector<KOWeekButton> mWeekLabelsW;
 
     bool mShortDayLabelsM;
@@ -343,5 +350,5 @@ class KOMonthView: public KOEventView
     bool mFlagKeyPressed;
     KOEventPopupMenu *mContextMenu;
-    QPopupMenu *mNewItemMenu;
+    Q3PopupMenu *mNewItemMenu;
     void keyPressEvent ( QKeyEvent * ) ;
     void keyReleaseEvent ( QKeyEvent * ) ;