1 files changed, 17 insertions, 15 deletions

diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 60b1276..b4eada7 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -25,11 +25,13 @@
 #define CALENDARVIEW_H
 
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlayout.h>
 #include <qwidget.h>
-#include <qptrlist.h>
-#include <qvbox.h>
+#include <q3ptrlist.h>
+#include <q3vbox.h>
 #include <qmap.h>
 #include <qscrollbar.h>
+//Added by qt3to4:
+#include <QKeyEvent>
 #ifndef DESKTOP_VERSION
 #include <qtopia/ir.h> 
@@ -48,5 +50,5 @@
 //#include <koprefs.h>
 
-class QWidgetStack;
+class Q3WidgetStack;
 class QSplitter;
 class KopiCalendarFile;
@@ -85,11 +87,11 @@ using namespace KCal;
 */
 
-#include <qtextbrowser.h>
+#include <q3textbrowser.h>
 #include <qtextcodec.h>
 
-class MissedAlarmTextBrowser : public QTextBrowser {
+class MissedAlarmTextBrowser : public Q3TextBrowser {
     Q_OBJECT
   public:
-    MissedAlarmTextBrowser(QWidget *parent, QPtrList<Incidence> alarms ,QDateTime start);
+    MissedAlarmTextBrowser(QWidget *parent, Q3PtrList<Incidence> alarms ,QDateTime start);
     ~MissedAlarmTextBrowser();
     void setSource(const QString & n);
@@ -97,5 +99,5 @@ class MissedAlarmTextBrowser : public QTextBrowser {
  private:
     Incidence * getNextInc(QDateTime start );
-    QPtrList<Incidence> mAlarms;
+    Q3PtrList<Incidence> mAlarms;
   signals:
     void showIncidence( QString uid);
@@ -128,5 +130,5 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     QDate endDate();
 
-    QWidgetStack *viewStack();
+    Q3WidgetStack *viewStack();
     QWidget *leftFrame();
 
@@ -442,5 +444,5 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     void editFilters();
     void toggleFilerEnabled();
-    QPtrList<CalFilter> filters();
+    Q3PtrList<CalFilter> filters();
     void toggleFilter();
     void showFilter(bool visible);
@@ -496,5 +498,5 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     void beamCalendar() ;
     void beamFilteredCalendar() ;
-    void beamIncidenceList(QPtrList<Incidence>) ;
+    void beamIncidenceList(Q3PtrList<Incidence>) ;
     void manageCategories();
     void editCategories();
@@ -576,5 +578,5 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     
     QDateTime loadedFileVersion;
-    void checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete );
+    void checkExternSyncEvent( Q3PtrList<Event> lastSync , Incidence* toDelete );
     void checkExternalId( Incidence * inc );
     int mGlobalSyncMode;
@@ -594,8 +596,8 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     QSplitter    *mLeftSplitter;
     KDGanttMinimizeSplitter  *mLeftFrame, *mMainFrame;
-    QWidgetStack *mRightFrame;
+    Q3WidgetStack *mRightFrame;
 
     KDatePicker* mDatePicker;
-    QVBox* mDateFrame;
+    Q3VBox* mDateFrame;
 
     DateNavigatorContainer *mDateNavigator;       // widget showing small month view.
@@ -619,5 +621,5 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
 
     // Calendar filters
-    QPtrList<CalFilter> mFilters;
+    Q3PtrList<CalFilter> mFilters;
 
     // various housekeeping variables.