1 files changed, 39 insertions, 31 deletions

diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index a533d8b..6756216 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -1,13 +1,21 @@
 #ifndef KORGE_MAINWINDOW_H
 #define KORGE_MAINWINDOW_H
 
-#include <qmainwindow.h>
+#include <q3mainwindow.h>
 #include <qtimer.h>
-#include <qdict.h>
+#include <q3dict.h>
 #include <qfile.h>
 #include <qmenubar.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qregexp.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <QCloseEvent>
+#include <QResizeEvent>
+#include <QPixmap>
+#include <Q3PopupMenu>
+#include <QHideEvent>
+#include <QKeyEvent>
 
 #include <libkcal/incidence.h>
 #include <ksyncmanager.h>
@@ -15,12 +23,12 @@
 #ifndef DESKTOP_VERSION
 #include <qcopchannel_qws.h> 
 #endif
-class QAction;
+class Q3Action;
 class CalendarView;
 class KSyncProfile;
 #ifdef DESKTOP_VERSION
 
-#define QPEToolBar QToolBar
+#define QPEToolBar Q3ToolBar
 #endif
 class QPEToolBar;
 
@@ -31,7 +39,7 @@ class CalendarLocal;
 
 using namespace KCal;
 
-class MainWindow : public QMainWindow
+class MainWindow : public Q3MainWindow
 {
     Q_OBJECT
   public:
@@ -49,8 +57,8 @@ class MainWindow : public QMainWindow
     void updateFilterToolbar();
     virtual void showMaximized (); 
      void configureAgenda( int );
-    void recieve( const QCString& msg, const QByteArray& data );
-    void receiveStart( const QCString& msg, const QByteArray& data );
+    void recieve( const Q3CString& msg, const QByteArray& data );
+    void receiveStart( const Q3CString& msg, const QByteArray& data );
  protected slots: 
     void autoSaveWarning();
     void loadDataAfterStart();
@@ -124,7 +132,7 @@ class MainWindow : public QMainWindow
   private:
     bool mAutoSaveDisabled;
     bool checkAutosave();
-    QCString mCStringMess;
+    Q3CString mCStringMess;
     QByteArray mByteData;
 
     //void setMenuBar( QMenuBar * );
@@ -132,7 +140,7 @@ class MainWindow : public QMainWindow
 #ifndef DESKTOP_VERSION
     QCopChannel* infrared;
 #endif
-    QAction* brAction; 
+    Q3Action* brAction; 
     KSyncManager* mSyncManager;
     bool mClosed;
     void saveOnClose();
@@ -144,38 +152,38 @@ class MainWindow : public QMainWindow
     QPEToolBar *navigatorToolBar;
     QPEToolBar *filterToolBar;
     KMenuBar *filterMenubar;
-    QPopupMenu * filterPopupMenu;
-    QPopupMenu * mCurrentItemMenu;
+    Q3PopupMenu * filterPopupMenu;
+    Q3PopupMenu * mCurrentItemMenu;
     void initActions();
     void setDefaultPreferences(); 
     void resizeEvent( QResizeEvent* e);
     void keyPressEvent ( QKeyEvent * ) ;
     void keyReleaseEvent ( QKeyEvent * ) ;
-    QPopupMenu *configureToolBarMenu;
-    QPopupMenu *selectFilterMenu;
-    QPopupMenu *selectFilterMenuTB;
-    QPopupMenu *configureAgendaMenu, *syncMenu;
+    Q3PopupMenu *configureToolBarMenu;
+    Q3PopupMenu *selectFilterMenu;
+    Q3PopupMenu *selectFilterMenuTB;
+    Q3PopupMenu *configureAgendaMenu, *syncMenu;
     CalendarLocal *mCalendar;
     CalendarView *mView;
-    QAction *mNewSubTodoAction;
-    QAction *mWeekAction;
+    Q3Action *mNewSubTodoAction;
+    Q3Action *mWeekAction;
     QFont mWeekFont;
     QPixmap mWeekPixmap;
     QColor mWeekBgColor;
     
-    QAction *mShowAction;
-    QAction *mEditAction;
-    QAction *mDeleteAction;
-    QAction *mCloneAction;
-    QAction *mMoveAction;
-    QAction *mBeamAction;
-    QAction *mCancelAction;
-    QAction *mPrintSelAction;
-
-    QAction *mToggleNav;
-    QAction *mToggleFilter;
-    QAction *mToggleAllday;
-    QAction *actionFilterMenuTB;
+    Q3Action *mShowAction;
+    Q3Action *mEditAction;
+    Q3Action *mDeleteAction;
+    Q3Action *mCloneAction;
+    Q3Action *mMoveAction;
+    Q3Action *mBeamAction;
+    Q3Action *mCancelAction;
+    Q3Action *mPrintSelAction;
+
+    Q3Action *mToggleNav;
+    Q3Action *mToggleFilter;
+    Q3Action *mToggleAllday;
+    Q3Action *actionFilterMenuTB;
 
     void closeEvent( QCloseEvent* ce );
     QTimer mSaveTimer;