106 files changed, 2091 insertions, 1688 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 8385bcc..c1a2f76 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -33,20 +33,26 @@
 #include <qapplication.h>
 #include <qradiobutton.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <qlayout.h>
 #include <qclipboard.h>
 #include <qcursor.h>
 #include <qmessagebox.h>
-#include <qprogressbar.h>
+#include <q3progressbar.h>
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
 #include <qtimer.h>
-#include <qwidgetstack.h>
+#include <q3widgetstack.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qregexp.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qfile.h>
 #include <qdir.h>
 #ifndef KORG_NOSPLITTER
 #include <qsplitter.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <QKeyEvent>
+#include <Q3Frame>
+#include <QLabel>
+#include <Q3ValueList>
 #endif
@@ -129,5 +135,5 @@
 #include <unistd.h>
 #else
-#include <qprocess.h>
+#include <q3process.h>
 #endif
@@ -141,5 +147,5 @@ extern int globalFlagBlockStartup;
-MissedAlarmTextBrowser::MissedAlarmTextBrowser(QWidget *parent, QPtrList<Incidence> alarms,QDateTime start ) : QTextBrowser(parent) 
+MissedAlarmTextBrowser::MissedAlarmTextBrowser(QWidget *parent, Q3PtrList<Incidence> alarms,QDateTime start ) : Q3TextBrowser(parent) 
 {
@@ -278,11 +284,11 @@ class KOBeamPrefs : public QDialog
    {
        setCaption( i18n("Beam Options") );
-        QVBoxLayout* lay = new QVBoxLayout( this );
+        Q3VBoxLayout* lay = new Q3VBoxLayout( this );
        lay->setSpacing( 3 );
        lay->setMargin( 3 );
-        QButtonGroup* format = new  QButtonGroup( 1, Horizontal, i18n("File format"), this );
+        Q3ButtonGroup* format = new  Q3ButtonGroup( 1, Qt::Horizontal, i18n("File format"), this );
        lay->addWidget( format ); 
        format->setExclusive ( true ) ;
-        QButtonGroup* time = new  QButtonGroup(1, Horizontal, i18n("Time format"), this );
+        Q3ButtonGroup* time = new  Q3ButtonGroup(1, Qt::Horizontal, i18n("Time format"), this );
        lay->addWidget( time ); time->setExclusive ( true ) ;
        vcal = new QRadioButton(" vCalendar ", format );
@@ -313,10 +319,10 @@ class KOCatPrefs : public QDialog
    {
        setCaption( i18n("Manage new Categories") );
-        QVBoxLayout* lay = new QVBoxLayout( this );
+        Q3VBoxLayout* lay = new Q3VBoxLayout( this );
        lay->setSpacing( 3 );
        lay->setMargin( 3 );
        QLabel * lab = new QLabel( i18n("After importing/loading/syncing there may be new categories in events or todos which are not added automatically to the category list. Please choose what to do <b>now</b>:"), this );
        lay->addWidget( lab ); 
-        QButtonGroup* format = new  QButtonGroup( 1, Horizontal, i18n("New categories not in list:"), this );
+        Q3ButtonGroup* format = new  Q3ButtonGroup( 1, Qt::Horizontal, i18n("New categories not in list:"), this );
        lay->addWidget( format ); 
        format->setExclusive ( true ) ;
@@ -374,5 +380,5 @@ void CalendarView::init()
    flag_clearallviewsupdateView = false;
    mNextAlarmDateTime = QDateTime::currentDateTime();
-    setFocusPolicy (NoFocus ); 
+    setFocusPolicy (Qt::NoFocus ); 
    mViewerCallerIsSearchDialog = false;
    mBlockShowDates = false;
@@ -395,5 +401,5 @@ void CalendarView::init()
    mNavigator = new DateNavigator( this, "datevav", mViewManager );
-    QBoxLayout *topLayout = (QBoxLayout*)layout();
+    Q3BoxLayout *topLayout = (Q3BoxLayout*)layout();
 #ifndef KORG_NOSPLITTER
    // create the main layout frames.
@@ -426,7 +432,7 @@ void CalendarView::init()
 #endif
    QWidget *rightBox = new QWidget( mPanner );
-    QBoxLayout *rightLayout = new QVBoxLayout( rightBox );
+    Q3BoxLayout *rightLayout = new Q3VBoxLayout( rightBox );
-    mRightFrame = new QWidgetStack( rightBox );
+    mRightFrame = new Q3WidgetStack( rightBox );
    rightLayout->addWidget( mRightFrame, 1 );
@@ -455,5 +461,5 @@ void CalendarView::init()
    topLayout->addWidget( mMainFrame );
 #ifdef DESKTOP_VERSION
-    mDateScrollBar = new QScrollBar ( 1, 365, 1,30, 200,QScrollBar::Horizontal, this );
+    mDateScrollBar = new QScrollBar ( 1, 365, 1,30, 200,Qt::Horizontal, this );
    topLayout->addWidget( mDateScrollBar ); 
    connect( mDateScrollBar, SIGNAL( valueChanged ( int )  ),this, SLOT( scrollBarValue( int )) );
@@ -502,6 +508,6 @@ void CalendarView::init()
    QWidget *rightBox = new QWidget( mMainFrame );
    //mainBoxLayout->addWidget ( rightBox, 10 );
-    QBoxLayout *rightLayout = new QVBoxLayout( rightBox );
+    Q3BoxLayout *rightLayout = new Q3VBoxLayout( rightBox );
-    mRightFrame = new QWidgetStack( rightBox );
+    mRightFrame = new Q3WidgetStack( rightBox );
    rightLayout->addWidget( mRightFrame, 10 );
@@ -617,7 +623,7 @@ void CalendarView::init()
    // kdDebug() << "CalendarView::CalendarView() done" << endl; 
-    mDateFrame = new QVBox(0,0,WType_Popup);
+    mDateFrame = new Q3VBox(0,0,Qt::WType_Popup);
    //mDateFrame->setFrameStyle(QFrame::PopupPanel | QFrame::Raised);
-    mDateFrame->setFrameStyle( QFrame::WinPanel |QFrame::Raised );
+    mDateFrame->setFrameStyle( Q3Frame::WinPanel |Q3Frame::Raised );
    mDateFrame->setLineWidth(3);
    mDateFrame->hide(); 
@@ -670,5 +676,5 @@ void CalendarView::nextConflict( bool all, bool allday )
    if ( flag_blockConflict ) return;
    flag_blockConflict = true;
-    QPtrList<Event> testlist = mCalendar->events();
+    Q3PtrList<Event> testlist = mCalendar->events();
    Event * test = testlist.first();
    while ( test ) {
@@ -686,5 +692,5 @@ void CalendarView::nextConflict( bool all, bool allday )
    Event * cE = 0;
    Event * cE2 = 0;
-    QPtrList<Event> testlist2 = testlist;
+    Q3PtrList<Event> testlist2 = testlist;
    test = testlist.first();
    bool skip = false;
@@ -836,5 +842,5 @@ void CalendarView::checkFiles()
 {
    QString message;
-    QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
+    Q3PtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
    KopiCalendarFile * cal = calendars.first();
    while ( cal ) {
@@ -858,5 +864,5 @@ void CalendarView::checkAlarms()
    config->setGroup( "AppRun" );
    QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) );
-    int daysto = dt.daysTo( QDate::currentDate() );
+    int daysto = dt.daysTo( (QDateTime)QDate::currentDate() );
    int days = config->readNumEntry( "LatestProgramStopDays" , daysto);
    dt =  dt.addDays( days );
@@ -868,6 +874,6 @@ void CalendarView::checkAlarms()
    qDebug("KO: Last termination on %s ", latest.toString().latin1());
    //qDebug("KO: Current Time %s ",QDateTime::currentDateTime().toString().latin1() );
-    QPtrList<Incidence> el = mCalendar->rawIncidences(); 
+    Q3PtrList<Incidence> el = mCalendar->rawIncidences(); 
-    QPtrList<Incidence> al;
+    Q3PtrList<Incidence> al;
    Incidence* inL = el.first(); 
    QDateTime cur = QDateTime::currentDateTime().addSecs(-59);
@@ -887,7 +893,7 @@ void CalendarView::checkAlarms()
    }
    if ( al.count() ) {
-        QDialog* dia = new QDialog( this, "huhu", false, WDestructiveClose | WStyle_StaysOnTop  );
+        QDialog* dia = new QDialog( this, "huhu", false, Qt::WDestructiveClose | Qt::WStyle_StaysOnTop  );
        dia->setCaption( i18n("KO/Pi: Missing alarms!") );
-        QVBoxLayout* lay = new QVBoxLayout( dia );
+        Q3VBoxLayout* lay = new Q3VBoxLayout( dia );
        lay->setSpacing( 0 );
        lay->setMargin( 0 );
@@ -1217,5 +1223,5 @@ void  CalendarView::computeAlarm( QString msg )
            }
 #else
-                QProcess* p = new QProcess();
+                Q3Process* p = new Q3Process();
                p->addArgument(  tempfilename.latin1()  );
                p->start();
@@ -1267,8 +1273,8 @@ void CalendarView::addSuspendAlarm(const QDateTime &qdt, const QString &noti  )
        QString fn = QDir::homeDirPath() + "/.kopi_suspend_alarm";
        QFile file( fn );
-        if (!file.open( IO_WriteOnly ) ) {
+        if (!file.open( QIODevice::WriteOnly ) ) {
            qDebug("KO: Error writing next suspend alarm file %s\nContent: \n%s ", fn.latin1(), mess.latin1());
        } else {
-            QTextStream ts( &file );
+            Q3TextStream ts( &file );
            ts << mess;
            file.close();
@@ -1295,8 +1301,8 @@ void CalendarView::addAlarm(const QDateTime &qdt, const QString &noti  )
        QString fn = QDir::homeDirPath() + "/.kopi_next_alarm";
        QFile file( fn );
-        if (!file.open( IO_WriteOnly ) ) {
+        if (!file.open( QIODevice::WriteOnly ) ) {
            qDebug("KO: Error writing next alarm file %s\nContent: \n%s ", fn.latin1(), mess.latin1());
        } else {
-            QTextStream ts( &file );
+            Q3TextStream ts( &file );
            ts << mess;
            file.close();
@@ -1571,5 +1577,5 @@ Event* CalendarView::getLastSyncEvent()
 // we check, if the to delete event has a id for a profile
 //  if yes, we set this id in the profile to delete
-void CalendarView::checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete )
+void CalendarView::checkExternSyncEvent( Q3PtrList<Event> lastSync , Incidence* toDelete )
 {
    if ( lastSync.count() == 0 ) {
@@ -1601,5 +1607,5 @@ void CalendarView::checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* t
 void CalendarView::checkExternalId( Incidence * inc )
 {
-    QPtrList<Event> lastSync = mCalendar->getExternLastSyncEvents() ;
+    Q3PtrList<Event> lastSync = mCalendar->getExternLastSyncEvents() ;
    checkExternSyncEvent( lastSync, inc );
@@ -1625,6 +1631,6 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
    Event* eventLSync;
    clearAllViews();
-    QPtrList<Event>  eventRSyncSharp = remote->getExternLastSyncEvents();
+    Q3PtrList<Event>  eventRSyncSharp = remote->getExternLastSyncEvents();
-    QPtrList<Event>  eventLSyncSharp = local->getExternLastSyncEvents();
+    Q3PtrList<Event>  eventLSyncSharp = local->getExternLastSyncEvents();
    bool fullDateRange = false;
    local->resetTempSyncStat();
@@ -1685,8 +1691,8 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
    //qDebug("*************************** ");
    qDebug("KO: mLastCalendarSync %s .Full: %d",mLastCalendarSync.toString().latin1(), fullDateRange);
-    QPtrList<Incidence> er = remote->rawIncidences(); 
+    Q3PtrList<Incidence> er = remote->rawIncidences(); 
    Incidence* inR = er.first();
    Incidence* inL;
-    QProgressBar bar( er.count(),0 );
+    Q3ProgressBar bar( er.count(),0 );
    bar.setCaption (i18n("Syncing - close to abort!") );
    
@@ -1832,5 +1838,5 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
        inR =  er.next();
    }
-    QPtrList<Incidence> el = local->rawIncidences(); 
+    Q3PtrList<Incidence> el = local->rawIncidences(); 
    inL = el.first();
    modulo = (el.count()/10)+1;
@@ -2049,5 +2055,5 @@ void CalendarView::syncExternal( int mode  )
            if ( mSyncManager->mWriteBackFile )
            {
-                QPtrList<Incidence> iL = mCalendar->rawIncidences(); 
+                Q3PtrList<Incidence> iL = mCalendar->rawIncidences(); 
                Incidence* inc = iL.first();
                if ( phoneFormat ) {
@@ -2116,5 +2122,5 @@ bool CalendarView::importBday()
        ++count;
    }
-    QProgressBar bar(count,0 );
+    Q3ProgressBar bar(count,0 );
    int w = 300;
    if ( QApplication::desktop()->width() < 320 )
@@ -2187,5 +2193,5 @@ void CalendarView::insertBirthdays(const QString& uid, const QStringList& birthd
    //qDebug("CalView 1 %i", count);
-    QProgressBar bar(count,0 );
+    Q3ProgressBar bar(count,0 );
    int w = 300;
    if ( QApplication::desktop()->width() < 320 )
@@ -2351,5 +2357,5 @@ void CalendarView::setSyncEventsReadOnly()
 bool CalendarView::loadCalendars()
 {
-    QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
+    Q3PtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
    KopiCalendarFile * cal = calendars.first();
    mCalendar->setDefaultCalendar( 1 );
@@ -2365,5 +2371,5 @@ bool CalendarView::loadCalendars()
 bool CalendarView::restoreCalendarSettings()
 {
-    QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
+    Q3PtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
    KopiCalendarFile * cal = calendars.first();
    while ( cal ) {
@@ -2530,5 +2536,5 @@ void CalendarView::watchSavedFile()
 bool CalendarView::checkAllFileVersions()
 {
-    QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
+    Q3PtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
    KopiCalendarFile * cal = calendars.first();
    mCalendar->setDefaultCalendar( 1 ); 
@@ -2592,5 +2598,5 @@ bool CalendarView::checkFileVersion(QString fn)
 bool CalendarView::saveCalendars()
 {
-    QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
+    Q3PtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
    KopiCalendarFile * cal = calendars.first();
    mCalendar->setDefaultCalendar( 1 ); 
@@ -2696,5 +2702,5 @@ void CalendarView::readSettings()
    config->setGroup("KOrganizer Geometry");
-    QValueList<int> sizes = config->readIntListEntry("Separator1");
+    Q3ValueList<int> sizes = config->readIntListEntry("Separator1");
    if (sizes.count() != 2) {
        sizes << mDateNavigator->minimumSizeHint().width();
@@ -2764,5 +2770,5 @@ void CalendarView::readSettings()
    int dateCount = config->readNumEntry( "ShownDatesCount", 7 );
-    QValueList<int> sizes = config->readIntListEntry("Left Splitter Frame");
+    Q3ValueList<int> sizes = config->readIntListEntry("Left Splitter Frame");
   
    int resetval = 0;
@@ -2843,5 +2849,5 @@ void CalendarView::writeSettings()
    config->setGroup( "AppRun" );
    QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) );
-    int days = dt.daysTo( QDate::currentDate() );
+    int days = dt.daysTo( (QDateTime)QDate::currentDate() );
    dt =  dt.addDays( days );
    int secs = dt.secsTo( QDateTime::currentDateTime() );
@@ -2870,7 +2876,7 @@ void CalendarView::writeSettings()
 #endif
-    QValueList<int> listINT = mLeftFrame->sizes();
+    Q3ValueList<int> listINT = mLeftFrame->sizes();
    config->writeEntry("Left Splitter Frame",listINT);
-    QValueList<int> listINT2 = mMainFrame->sizes();
+    Q3ValueList<int> listINT2 = mMainFrame->sizes();
    config->writeEntry("Main Splitter Frame",listINT2);
 #ifdef DESKTOP_VERSION
@@ -3167,5 +3173,5 @@ void CalendarView::checkConflictForEvent()
        }
    }
-    QPtrList<Event> testlist = mCalendar->events();
+    Q3PtrList<Event> testlist = mCalendar->events();
    Event * test = testlist.first();
    QDateTime conflict;
@@ -3429,5 +3435,5 @@ void  CalendarView::slotSelectPickerDate( QDate  d)
 void CalendarView::removeCategories()
 {
-    QPtrList<Incidence> incList  = mCalendar->rawIncidences(); 
+    Q3PtrList<Incidence> incList  = mCalendar->rawIncidences(); 
    QStringList catList = KOPrefs::instance()->mCustomCategories;
    QStringList catIncList;
@@ -3450,5 +3456,5 @@ void CalendarView::removeCategories()
 int CalendarView::addCategories()
 { 
-    QPtrList<Incidence> incList  = mCalendar->rawIncidences(); 
+    Q3PtrList<Incidence> incList  = mCalendar->rawIncidences(); 
    QStringList catList = KOPrefs::instance()->mCustomCategories;
    QStringList catIncList;
@@ -3508,5 +3514,5 @@ void CalendarView::manageCategories()
 void CalendarView::beamIncidence(Incidence * Inc) 
 {
-    QPtrList<Incidence> delSel ;
+    Q3PtrList<Incidence> delSel ;
    delSel.append(Inc);
    beamIncidenceList( delSel );
@@ -3514,5 +3520,5 @@ void CalendarView::beamIncidence(Incidence * Inc)
 void CalendarView::beamCalendar() 
 {
-    QPtrList<Incidence> delSel  = mCalendar->rawIncidences(); 
+    Q3PtrList<Incidence> delSel  = mCalendar->rawIncidences(); 
    //qDebug("beamCalendar()  ");
    beamIncidenceList( delSel );
@@ -3520,9 +3526,9 @@ void CalendarView::beamCalendar()
 void CalendarView::beamFilteredCalendar() 
 {
-    QPtrList<Incidence> delSel  = mCalendar->incidences(); 
+    Q3PtrList<Incidence> delSel  = mCalendar->incidences(); 
    //qDebug("beamFilteredCalendar()  ");
    beamIncidenceList( delSel );
 }
-void  CalendarView::beamIncidenceList(QPtrList<Incidence> delSel )
+void  CalendarView::beamIncidenceList(Q3PtrList<Incidence> delSel )
 {
    
@@ -4316,5 +4322,5 @@ void CalendarView::schedule_publish(Incidence *incidence)
    PublishDialog *publishdlg = new PublishDialog();
    if (incidence->attendeeCount()>0) {
-        QPtrList<Attendee> attendees = incidence->attendees();
+        Q3PtrList<Attendee> attendees = incidence->attendees();
        attendees.first();
        while ( attendees.current()!=0 ) {
@@ -4725,5 +4731,5 @@ void CalendarView::showDates(const DateList &selectedDates)
 }
-QPtrList<CalFilter> CalendarView::filters()
+Q3PtrList<CalFilter> CalendarView::filters()
 {
    return mFilters;
@@ -4766,5 +4772,5 @@ void CalendarView::showFilter(bool visible)
        mCalEditView->readConfig(); 
        mCalEditView->show(); 
-        QValueList<int> sizes;
+        Q3ValueList<int> sizes;
        sizes = mLeftFrame->sizes();
        if ( sizes.count() == 4 &&  sizes[3] < 20 ) {
@@ -4847,5 +4853,5 @@ void CalendarView::takeOverCalendar()
    clearAllViews();
-    QPtrList<Event> events = mCalendar->events();
+    Q3PtrList<Event> events = mCalendar->events();
    for(uint i=0; i<events.count(); ++i) {
        events.at(i)->setOrganizer(KOPrefs::instance()->email());
@@ -4854,5 +4860,5 @@ void CalendarView::takeOverCalendar()
    }
-    QPtrList<Todo> todos = mCalendar->todos();
+    Q3PtrList<Todo> todos = mCalendar->todos();
    for(uint i=0; i<todos.count(); ++i) {
        todos.at(i)->setOrganizer(KOPrefs::instance()->email());
@@ -4861,5 +4867,5 @@ void CalendarView::takeOverCalendar()
    }
-    QPtrList<Journal> journals = mCalendar->journals();
+    Q3PtrList<Journal> journals = mCalendar->journals();
    for(uint i=0; i<journals.count(); ++i) {
        journals.at(i)->setOrganizer(KOPrefs::instance()->email());
@@ -4876,5 +4882,5 @@ void CalendarView::showIntro()
 }
-QWidgetStack *CalendarView::viewStack()
+Q3WidgetStack *CalendarView::viewStack()
 {
    return mRightFrame;
@@ -5061,5 +5067,5 @@ bool  CalendarView::removeCompletedSubTodos( Todo* t )
 {
    bool deleteTodo = true;
-    QPtrList<Incidence> subTodos;
+    Q3PtrList<Incidence> subTodos;
    Incidence *aTodo;
    subTodos = t->relations();
@@ -5087,6 +5093,6 @@ void CalendarView::purgeCompleted()
    if (result == KMessageBox::Continue) {
-        QPtrList<Todo> todoCal;
+        Q3PtrList<Todo> todoCal;
-        QPtrList<Todo> rootTodos;
+        Q3PtrList<Todo> rootTodos;
        //QPtrList<Incidence> rel;
        Todo *aTodo;
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 <q3ptrlist.h>
-#include <qvbox.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.
diff --git a/korganizer/calprintbase.cpp b/korganizer/calprintbase.cpp
index 7b7d54c..ecb9e03 100644
--- a/korganizer/calprintbase.cpp
+++ b/korganizer/calprintbase.cpp
@@ -26,9 +26,11 @@
 #include <qpainter.h>
 #include <qlayout.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlabel.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
-#include <qintdict.h>
+#include <q3intdict.h>
 #include <qfontmetrics.h> 
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 #include <kglobal.h>
@@ -146,6 +148,6 @@ CalPrintBase::~CalPrintBase()
 QWidget *CalPrintBase::configWidget( QWidget *w )
 {
-  QFrame *wdg = new QFrame( w );
+  Q3Frame *wdg = new Q3Frame( w );
-  QVBoxLayout *layout = new QVBoxLayout( wdg );
+  Q3VBoxLayout *layout = new Q3VBoxLayout( wdg );
  QLabel *title = new QLabel( description(), wdg );
@@ -286,5 +288,5 @@ void CalPrintBase::drawSmallMonth(QPainter &p, const QDate &qd,
  //  int lineSpacing = p.fontMetrics().lineSpacing();
  const KCalendarSystem *calSys = KOGlobals::self()->calendarSystem();
-  p.drawText(x, y, width, height/4, AlignCenter, calSys->monthName( qd ) );
+  p.drawText(x, y, width, height/4, Qt::AlignCenter, calSys->monthName( qd ) );
  int cellWidth = width/7;
@@ -302,5 +304,5 @@ void CalPrintBase::drawSmallMonth(QPainter &p, const QDate &qd,
    tmpStr=calSys->weekDayName( monthDate2 )[0].upper();
    p.drawText(x+col*cellWidth, y+height/4, cellWidth, cellHeight,
-               AlignCenter, tmpStr);
+               Qt::AlignCenter, tmpStr);
    monthDate2 = monthDate2.addDays(1);
  }
@@ -319,5 +321,5 @@ void CalPrintBase::drawSmallMonth(QPainter &p, const QDate &qd,
      p.drawText( x+col*cellWidth,
                  y+height/4+cellHeight+(row*cellHeight),
-                  cellWidth, cellHeight, AlignCenter,
+                  cellWidth, cellHeight, Qt::AlignCenter,
                  tmpStr.setNum(monthDate.day()) );
      monthDate = monthDate.addDays(1);
@@ -359,5 +361,5 @@ void CalPrintBase::drawDaysOfWeekBox(QPainter &p, const QDate &qd,
 //               width-2, height-2,
 //               QBrush( Dense7Pattern ) );
-  p.drawText( x+5, y, width-10, height, AlignCenter | AlignVCenter,
+  p.drawText( x+5, y, width-10, height, Qt::AlignCenter | Qt::AlignVCenter,
             calSys->weekDayName( qd ) );
 }
@@ -402,8 +404,8 @@ void CalPrintBase::drawTimeLine(QPainter &p,
        }
        p.drawText(x+2, (int)currY+2, width/2-2, (int)cellHeight,
-                  AlignTop|AlignRight, numStr);
+                  Qt::AlignTop|Qt::AlignRight, numStr);
        p.setFont(QFont("helvetica", 10, QFont::Normal));
        p.drawText(x+width/2, (int)currY+2, width/2+2, (int)(cellHeight/2)-3,
-                  AlignTop | AlignLeft, "00");
+                  Qt::AlignTop | Qt::AlignLeft, "00");
      } else {
        QTime time( curTime.hour(), 0 );
@@ -411,5 +413,5 @@ void CalPrintBase::drawTimeLine(QPainter &p,
        p.setFont(QFont("helvetica", 14, QFont::Bold));
        p.drawText(x+2, (int)currY+2, width-4, (int)cellHeight/2-3,
-                  AlignTop|AlignLeft, numStr);
+                  Qt::AlignTop|Qt::AlignLeft, numStr);
      }
      currY+=cellHeight;
@@ -473,5 +475,5 @@ void CalPrintBase::drawAllDayBox(QPainter &p, Event::List &eventList,
       
        p.drawText( x+5, offset+5, width-10, height-10, 
-                    AlignCenter | AlignVCenter | AlignJustify | WordBreak,
+                    Qt::AlignCenter | Qt::AlignVCenter | Qt::AlignJustify | Qt::WordBreak,
                    text );
        // reset the colors
@@ -494,5 +496,5 @@ void CalPrintBase::drawAllDayBox(QPainter &p, Event::List &eventList,
        // p.fillRect(x+1, offset+1, width-2, height-2, QBrush(Dense5Pattern) );
      p.drawText( x+5, offset+5, width-10, height-10, 
-                  AlignLeft | AlignTop | AlignJustify , 
+                  Qt::AlignLeft | Qt::AlignTop | Qt::AlignJustify , 
                  multiDayStr);
    }
@@ -561,5 +563,5 @@ void CalPrintBase::drawAgendaDayBox( QPainter &p, Event::List &events,
  // overlapping events
-  QPtrList<KOrg::CellItem> cells;
+  Q3PtrList<KOrg::CellItem> cells;
  cells.setAutoDelete( true );
@@ -569,5 +571,5 @@ void CalPrintBase::drawAgendaDayBox( QPainter &p, Event::List &events,
  }
-  QPtrListIterator<KOrg::CellItem> it1( cells );
+  Q3PtrListIterator<KOrg::CellItem> it1( cells );
  for( it1.toFirst(); it1.current(); ++it1 ) {
    KOrg::CellItem *placeItem = it1.current();
@@ -594,5 +596,5 @@ void CalPrintBase::drawAgendaDayBox( QPainter &p, Event::List &events,
  }
  
-  p.setBrush( QBrush( NoBrush ) );
+  p.setBrush( QBrush( Qt::NoBrush ) );
 }
@@ -636,5 +638,5 @@ void CalPrintBase::drawAgendaItem( PrintCellItem *item, QPainter &p,
    p.drawRect( currentX, currentyPos+1, currentWidth+1, eventLength+1 );
    p.drawText( currentX+3, currentyPos+2, currentWidth-5, eventLength-3,
-                AlignLeft | AlignTop | AlignJustify | WordBreak,
+                Qt::AlignLeft | Qt::AlignTop | Qt::AlignJustify | Qt::TextWordWrap,
                text);
    // p.restore();
@@ -671,5 +673,5 @@ void CalPrintBase::drawDayBox(QPainter &p, const QDate &qd,
    p.setFont( QFont( "helvetica", 8, QFont::Bold, true ) );
-    p.drawText( x+5, y, width-25, mSubHeaderHeight, AlignLeft | AlignVCenter,
+    p.drawText( x+5, y, width-25, mSubHeaderHeight, Qt::AlignLeft | Qt::AlignVCenter,
                hstring );
  }
@@ -681,5 +683,5 @@ void CalPrintBase::drawDayBox(QPainter &p, const QDate &qd,
          dayNumStr = local->formatDate(qd, true);
  }
-  p.drawText(x+5, y, width-10, mSubHeaderHeight, AlignRight | AlignVCenter,
+  p.drawText(x+5, y, width-10, mSubHeaderHeight, Qt::AlignRight | Qt::AlignVCenter,
             dayNumStr);
  Event::List eventList;
@@ -725,5 +727,5 @@ void CalPrintBase::drawDayBox(QPainter &p, const QDate &qd,
    p.drawText(x+5, y+textY, width-10, lineSpacing,
-               AlignLeft|AlignBottom, outStr);
+               Qt::AlignLeft|Qt::AlignBottom, outStr);
    textY+=lineSpacing;
  }
@@ -744,5 +746,5 @@ void CalPrintBase::drawDayBox(QPainter &p, const QDate &qd,
      p.drawText(x+5, y+textY, width-10, lineSpacing,
-                AlignLeft|AlignBottom, text);
+                Qt::AlignLeft|Qt::AlignBottom, text);
      textY+=lineSpacing;
    }
@@ -850,5 +852,5 @@ void CalPrintBase::drawMonth(QPainter &p, const QDate &qd, bool weeknumbers,
      int calWeek = weekDate.weekNumber();
      QRect rc(x, y+yoffset+cellHeight*row, xoffset-1, cellHeight);
-      p.drawText( rc, AlignRight|AlignVCenter, QString::number(calWeek) );
+      p.drawText( rc, Qt::AlignRight|Qt::AlignVCenter, QString::number(calWeek) );
      weekDate = weekDate.addDays(7);
    }
@@ -898,5 +900,5 @@ void CalPrintBase::drawTodo( bool completed, int &count, Todo * item, QPainter &
  // This list keeps all starting points of the parent todos so the connection
  // lines of the tree can easily be drawn (needed if a new page is started)
-  static QPtrList<TodoParentStart> startPoints;
+  static Q3PtrList<TodoParentStart> startPoints;
  if (level<1) {
    startPoints.clear();
@@ -911,10 +913,10 @@ void CalPrintBase::drawTodo( bool completed, int &count, Todo * item, QPainter &
  }
  int left = possummary+(level*10);
-  rect = p.boundingRect(left, y, (posdue-left-5),-1, WordBreak, outStr);
+  rect = p.boundingRect(left, y, (posdue-left-5),-1, Qt::WordBreak, outStr);
  //qDebug("bottom1 %d ", rect.bottom() );
  if ( !item->description().isEmpty() && desc ) {
    outStr = item->description();
    rect = p.boundingRect( left+20, rect.bottom()+5, width-(left+10-x), -1,
-                           WordBreak, outStr );
+                           Qt::WordBreak, outStr );
  }
  //qDebug("bottom2 %d y+h %d   y %d  ph %d", rect.bottom(), y+height, y , pageHeight );
@@ -934,6 +936,5 @@ void CalPrintBase::drawTodo( bool completed, int &count, Todo * item, QPainter &
        else
          start = p.viewport().top();
-        p.moveTo( center, start );
+        p.drawLine( center, start, center, to );
-        p.lineTo( center, to );
        rct->mSamePage=false;
      }
@@ -952,10 +953,10 @@ void CalPrintBase::drawTodo( bool completed, int &count, Todo * item, QPainter &
  // Priority
  outStr.setNum(priority);
-  rect = p.boundingRect(pospriority, y + 10, 5, -1, AlignCenter, outStr);
+  rect = p.boundingRect(pospriority, y + 10, 5, -1, Qt::AlignCenter, outStr);
  // Make it a more reasonable size
  rect.setWidth(19);
  rect.setHeight(19);
  if ( priority > 0 && pospriority>=0 ) {
-    p.drawText(rect, AlignCenter, outStr);
+    p.drawText(rect, Qt::AlignCenter, outStr);
    p.drawRect(rect);
    // cross out the rectangle for completed items
@@ -965,5 +966,5 @@ void CalPrintBase::drawTodo( bool completed, int &count, Todo * item, QPainter &
    } else  if (item->cancelled() ) {
        QPen pen = p.pen();
-        p.setPen ( QPen ( black, 2) );
+        p.setPen ( QPen ( Qt::black, 2) );
        p.drawLine( rect.left()+2,rect.top()+rect.height()/2, rect.right()-2, +rect.top()+rect.height()/2 );
        p.setPen( pen );
@@ -982,7 +983,6 @@ void CalPrintBase::drawTodo( bool completed, int &count, Todo * item, QPainter &
    int to( rect.top() + (rect.height()/2)+1 );
    int endx( rect.left() );
-    p.moveTo(center, bottom);
+    p.drawLine(center,bottom, center,to);
-    p.lineTo(center, to);
+    p.drawLine(center,to, endx,to);
-    p.lineTo(endx, to);
  }
@@ -1000,7 +1000,7 @@ void CalPrintBase::drawTodo( bool completed, int &count, Todo * item, QPainter &
  }
  rect = p.boundingRect( left, rect.top(), (posdue-(left + rect.width() + 5)),
-    -1, WordBreak, outStr);
+    -1, Qt::WordBreak, outStr);
  QRect newrect;
-  p.drawText( rect, WordBreak, outStr, -1, &newrect );
+  p.drawText( rect, Qt::WordBreak, outStr, -1, &newrect );
  //ft.setStrikeOut(false);
  // p.setFont(ft);
@@ -1017,6 +1017,6 @@ void CalPrintBase::drawTodo( bool completed, int &count, Todo * item, QPainter &
    outStr = item->description();
    rect = p.boundingRect( left+20, y, x+width-(left+10), -1,
-                           WordBreak, outStr );
+                           Qt::WordBreak, outStr );
-    p.drawText( rect, WordBreak, outStr, -1, &newrect );
+    p.drawText( rect, Qt::WordBreak, outStr, -1, &newrect );
  }
@@ -1139,6 +1139,6 @@ void CalPrintBase::drawSplitHeaderRight( QPainter &p, const QDate &fd,
  KLocale *local = KGlobal::locale();
  QFont font("helvetica", 18, QFont::Bold);
-  QPen penA( black,0);
+  QPen penA( Qt::black,0);
-  QPen penB( black,3);
+  QPen penB( Qt::black,3);
  p.setFont(font);
  int lineSpacing = p.fontMetrics().lineSpacing();
@@ -1162,5 +1162,5 @@ void CalPrintBase::drawSplitHeaderRight( QPainter &p, const QDate &fd,
  lineSpacing = p.fontMetrics().lineSpacing();
-  p.drawText(0, lineSpacing * 0, width, lineSpacing, AlignRight |AlignTop, title );
+  p.drawText(0, lineSpacing * 0, width, lineSpacing, Qt::AlignRight |Qt::AlignTop, title );
  title.truncate(0);
@@ -1172,5 +1172,5 @@ void CalPrintBase::drawSplitHeaderRight( QPainter &p, const QDate &fd,
  p.setFont(QFont("Helvetica", 20, QFont::Bold, TRUE));
  title += QString::number(fd.year());
-  p.drawText(0, lineSpacing * 1, width, lineSpacing, AlignRight |AlignTop, title );
+  p.drawText(0, lineSpacing * 1, width, lineSpacing, Qt::AlignRight |Qt::AlignTop, title );
  mSubHeaderHeight = tempStore ;
 }
@@ -1198,5 +1198,5 @@ void CalPrintBase::drawSplitDay( QPainter &p, const QDate &qd, int width,
  p.setFont(QFont("helvetica", 12, QFont::Bold, true));
  p.drawText(offsetLeft, mHeaderHeight + 5, 
-          width, mSubHeaderHeight, AlignHCenter | AlignVCenter,
+          width, mSubHeaderHeight, Qt::AlignHCenter | Qt::AlignVCenter,
          dayName);
@@ -1255,8 +1255,8 @@ void CalPrintBase::drawSplitDay( QPainter &p, const QDate &qd, int width,
                 width-4, cheight);
      p.drawText(offsetLeft+12, offset+startMinuteOff+startTime*cellHeight+5, width-24, 
-                 cheight-10, AlignHCenter | AlignTop, text);
+                 cheight-10, Qt::AlignHCenter | Qt::AlignTop, text);
    }
  }
-  p.setBrush(QBrush(NoBrush));
+  p.setBrush(QBrush(Qt::NoBrush));
  mSubHeaderHeight = tempStore ;
 }
@@ -1275,10 +1275,10 @@ void CalPrintBase::drawSplitTimes( QPainter &p, int width, int timeWidth,
  QString numStr;
  for (int i = 0; i < hours; i++) {
-      p.setPen(QPen(black,1));
+      p.setPen(QPen(Qt::black,1));
      p.drawLine(0, offset+i*cellHeight, width, offset+i*cellHeight);
-      p.setPen(QPen(gray,0));
+      p.setPen(QPen(Qt::gray,0));
      p.drawLine(37, offset+i*cellHeight+(cellHeight/2),
                 width, offset+i*cellHeight+(cellHeight/2));
-      p.setPen(QPen(black,0));
+      p.setPen(QPen(Qt::black,0));
    if ( !KGlobal::locale()->use12Clock() ) {
@@ -1290,8 +1290,8 @@ void CalPrintBase::drawSplitTimes( QPainter &p, int width, int timeWidth,
      }
      p.drawText(0, offset+i*cellHeight, 33, cellHeight/2,
-                 AlignTop|AlignRight, numStr);
+                 Qt::AlignTop|Qt::AlignRight, numStr);
      p.setFont(QFont("helvetica", 12, QFont::Bold));
      p.drawText(37, offset+i*cellHeight, 45, cellHeight/2,
-                 AlignTop | AlignLeft, "00");
+                 Qt::AlignTop | Qt::AlignLeft, "00");
    } else {
      QTime time( i + startHour, 0 );
@@ -1299,5 +1299,5 @@ void CalPrintBase::drawSplitTimes( QPainter &p, int width, int timeWidth,
      p.setFont(QFont("helvetica", 12, QFont::Bold));
      p.drawText(4, offset+i*cellHeight, 70, cellHeight/2,
-                 AlignTop|AlignLeft, numStr);
+                 Qt::AlignTop|Qt::AlignLeft, numStr);
    }
  } mSubHeaderHeight = tempStore ;
diff --git a/korganizer/calprinter.cpp b/korganizer/calprinter.cpp
index 0cdf28e..d4bf988 100644
--- a/korganizer/calprinter.cpp
+++ b/korganizer/calprinter.cpp
@@ -22,6 +22,6 @@
 */
-#include <qvbuttongroup.h>
+// #include <qvbuttongroup.h>
-#include <qwidgetstack.h>
+#include <q3widgetstack.h>
 #include <qradiobutton.h>
 #include <qlayout.h>
@@ -29,6 +29,9 @@
 #include <qcombobox.h>
 #include <qlabel.h>
-#include <qvbox.h>
+#include <q3vbox.h>
 #include <qsplitter.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3PtrList>
 #include <kprinter.h>
@@ -175,12 +178,12 @@ void CalPrinter::updateConfig()
 /****************************************************************************/
-CalPrintDialog::CalPrintDialog( QPtrList<CalPrintBase> plugins, KPrinter *p,
+CalPrintDialog::CalPrintDialog( Q3PtrList<CalPrintBase> plugins, KPrinter *p,
                                QWidget *parent, const char *name )
  : KDialogBase( parent, name, /*modal*/true, i18n("Print"), Ok | Cancel ),
    mPrinter( p ), mPrintPlugins( plugins )
 {
-    QVBox *page = new QVBox(this);//makeVBoxMainWidget();
+    Q3VBox *page = new Q3VBox(this);//makeVBoxMainWidget();
    setMainWidget( page );
-  QHBox *printerLayout = new QHBox( page );
+  Q3HBox *printerLayout = new Q3HBox( page );
  mPrinterLabel = new QLabel( printerLayout );
@@ -192,7 +195,7 @@ CalPrintDialog::CalPrintDialog( QPtrList<CalPrintBase> plugins, KPrinter *p,
  QSplitter *splitter = new QSplitter( page );
-  splitter->setOrientation( QSplitter::Horizontal );
+  splitter->setOrientation( Qt::Horizontal );
-  mTypeGroup = new QVButtonGroup( i18n("View Type"), splitter, "buttonGroup" );
+  mTypeGroup = new Q3VButtonGroup( i18n("View Type"), splitter, "buttonGroup" );
  // use the minimal width possible = max width of the radio buttons, not extensible
 /*  mTypeGroup->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)4,
@@ -201,9 +204,9 @@ CalPrintDialog::CalPrintDialog( QPtrList<CalPrintBase> plugins, KPrinter *p,
  QWidget *splitterRight = new QWidget( splitter, "splitterRight" );
-  QGridLayout *splitterRightLayout = new QGridLayout( splitterRight );
+  Q3GridLayout *splitterRightLayout = new Q3GridLayout( splitterRight );
  splitterRightLayout->setMargin( marginHint() );
  splitterRightLayout->setSpacing( spacingHint() );
-  mConfigArea = new QWidgetStack( splitterRight, "configWidgetStack" );
+  mConfigArea = new Q3WidgetStack( splitterRight, "configWidgetStack" );
  splitterRightLayout->addMultiCellWidget( mConfigArea, 0,0, 0,1 );
diff --git a/korganizer/calprinter.h b/korganizer/calprinter.h
index 7b58f4f..e065779 100644
--- a/korganizer/calprinter.h
+++ b/korganizer/calprinter.h
@@ -1,2 +1,4 @@
+//Added by qt3to4:
+#include <QLabel>
 /*
    This file is part of KOrganizer.
@@ -29,5 +31,5 @@
 #ifndef KORG_NOPRINTER
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <kdialogbase.h>
@@ -39,6 +41,6 @@
 using namespace KCal;
-class QVButtonGroup;
+class Q3VButtonGroup;
-class QWidgetStack;
+class Q3WidgetStack;
 class KPrinter;
 class CalPrintDialog;
@@ -95,5 +97,5 @@ class CalPrinter : public QObject, public KOrg::CalPrinterBase
  protected:
-    QPtrList<CalPrintBase> mPrintPlugins;
+    Q3PtrList<CalPrintBase> mPrintPlugins;
  private:
@@ -110,5 +112,5 @@ class CalPrintDialog : public KDialogBase
    Q_OBJECT
  public:
-    CalPrintDialog( QPtrList<CalPrintBase> plugins, KPrinter *p,
+    CalPrintDialog( Q3PtrList<CalPrintBase> plugins, KPrinter *p,
                    QWidget *parent = 0, const char *name = 0 );
    virtual ~CalPrintDialog();
@@ -128,7 +130,7 @@ signals:
  private:
    KPrinter *mPrinter;
-    QVButtonGroup *mTypeGroup;
+    Q3VButtonGroup *mTypeGroup;
-    QWidgetStack *mConfigArea;
+    Q3WidgetStack *mConfigArea;
-    QPtrList<CalPrintBase> mPrintPlugins;
+    Q3PtrList<CalPrintBase> mPrintPlugins;
    QLabel *mPrinterLabel;
    QString mPreviewText;
diff --git a/korganizer/calprintplugins.cpp b/korganizer/calprintplugins.cpp
index bc35ca4..9b6dc6e 100644
--- a/korganizer/calprintplugins.cpp
+++ b/korganizer/calprintplugins.cpp
@@ -26,9 +26,9 @@
 #include <qpainter.h>
-#include <qdatetimeedit.h>
+#include <q3datetimeedit.h>
 #include <qdatetime.h>
 #include <qcheckbox.h>
 #include <qlineedit.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <kglobal.h>
diff --git a/korganizer/cellitem.cpp b/korganizer/cellitem.cpp
index 61d06ac..1fd703c 100644
--- a/korganizer/cellitem.cpp
+++ b/korganizer/cellitem.cpp
@@ -28,5 +28,7 @@
 #include <kdebug.h>
-#include <qintdict.h>
+#include <q3intdict.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 using namespace KOrg;
@@ -37,15 +39,15 @@ QString CellItem::label() const
 }
-QPtrList<CellItem> CellItem::placeItem( QPtrList<CellItem> cells,
+Q3PtrList<CellItem> CellItem::placeItem( Q3PtrList<CellItem> cells,
                                        CellItem *placeItem )
 {
  kdDebug(5855) << "Placing " << placeItem->label() << endl;
-  QPtrList<KOrg::CellItem> conflictItems;
+  Q3PtrList<KOrg::CellItem> conflictItems;
  int maxSubCells = 0;
-  QIntDict<KOrg::CellItem> subCellDict;
+  Q3IntDict<KOrg::CellItem> subCellDict;
  // Find all items which are in same cell
-  QPtrListIterator<KOrg::CellItem> it2( cells );
+  Q3PtrListIterator<KOrg::CellItem> it2( cells );
  for( it2.toFirst(); it2.current(); ++it2 ) {
    KOrg::CellItem *item = it2.current();
@@ -84,5 +86,5 @@ QPtrList<CellItem> CellItem::placeItem( QPtrList<CellItem> cells,
    placeItem->setSubCells( maxSubCells );
-    QPtrListIterator<KOrg::CellItem> it3( conflictItems );
+    Q3PtrListIterator<KOrg::CellItem> it3( conflictItems );
    for( it3.toFirst(); it3.current(); ++it3 ) {
      (*it3)->setSubCells( maxSubCells );
diff --git a/korganizer/cellitem.h b/korganizer/cellitem.h
index 72773d0..b917bd5 100644
--- a/korganizer/cellitem.h
+++ b/korganizer/cellitem.h
@@ -26,5 +26,5 @@
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 namespace KOrg {
@@ -54,5 +54,5 @@ class CellItem
      \return Placed items
    */
-    static QPtrList<CellItem> placeItem( QPtrList<CellItem> cells,
+    static Q3PtrList<CellItem> placeItem( Q3PtrList<CellItem> cells,
                                         CellItem *placeItem );
    
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index ea510f1..53507d3 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -35,4 +35,6 @@
 #include "datenavigatorcontainer.h"
 #include "koprefs.h"
+//Added by qt3to4:
+#include <QResizeEvent>
 DateNavigatorContainer::DateNavigatorContainer( QWidget *parent,
diff --git a/korganizer/datenavigatorcontainer.h b/korganizer/datenavigatorcontainer.h
index 87cc59f..75d387c 100644
--- a/korganizer/datenavigatorcontainer.h
+++ b/korganizer/datenavigatorcontainer.h
@@ -1,2 +1,5 @@
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <Q3PtrList>
 /*
    This file is part of KOrganizer.
@@ -101,5 +104,5 @@ class DateNavigatorContainer: public QWidget
    KCal::Calendar *mCalendar;
-    QPtrList<KDateNavigator> mExtraViews;
+    Q3PtrList<KDateNavigator> mExtraViews;
    int mHorizontalCount;
diff --git a/korganizer/filteredit_base.cpp b/korganizer/filteredit_base.cpp
index 505edf6..9425963 100644
--- a/korganizer/filteredit_base.cpp
+++ b/korganizer/filteredit_base.cpp
@@ -12,14 +12,19 @@
 #include <qvariant.h>
 #include <qpushbutton.h>
-#include <qframe.h>
+#include <q3frame.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
 #include <qradiobutton.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qlabel.h>
 #include <qcheckbox.h>
 #include <qlayout.h>
 #include <qtooltip.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
 #include "tr.h"
@@ -28,24 +33,24 @@
 *  name 'name' and widget flags set to 'f'.
 */
-FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl )
+FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, Qt::WFlags fl )
    : QWidget( parent, name, fl )
 {
    if ( !name )
        setName( "FilterEdit_base" );
-    FilterEdit_baseLayout = new QVBoxLayout( this, 0, 0, "FilterEdit_baseLayout"); 
+    FilterEdit_baseLayout = new Q3VBoxLayout( this, 0, 0, "FilterEdit_baseLayout"); 
-    mCriteriaFrame = new QFrame( this, "mCriteriaFrame" );
+    mCriteriaFrame = new Q3Frame( this, "mCriteriaFrame" );
-    mCriteriaFrame->setFrameShape( QFrame::StyledPanel );
+    mCriteriaFrame->setFrameShape( Q3Frame::StyledPanel );
-    mCriteriaFrame->setFrameShadow( QFrame::Raised );
+    mCriteriaFrame->setFrameShadow( Q3Frame::Raised );
-    mCriteriaFrameLayout = new QVBoxLayout( mCriteriaFrame, 3, 2, "mCriteriaFrameLayout"); 
+    mCriteriaFrameLayout = new Q3VBoxLayout( mCriteriaFrame, 3, 2, "mCriteriaFrameLayout"); 
-    ButtonGroup1 = new QButtonGroup( mCriteriaFrame, "ButtonGroup1" );
+    ButtonGroup1 = new Q3ButtonGroup( mCriteriaFrame, "ButtonGroup1" );
    ButtonGroup1->setColumnLayout(0, Qt::Vertical );
    ButtonGroup1->layout()->setSpacing( 6 );
    ButtonGroup1->layout()->setMargin( 6 );
-    ButtonGroup1Layout = new QGridLayout( ButtonGroup1->layout() );
+    ButtonGroup1Layout = new Q3GridLayout( ButtonGroup1->layout() );
    ButtonGroup1Layout->setAlignment( Qt::AlignTop );
-    layout4 = new QHBoxLayout( 0, 0, 6, "layout4"); 
+    layout4 = new Q3HBoxLayout( 0, 0, 6, "layout4"); 
    mCatShowCheck = new QRadioButton( ButtonGroup1, "mCatShowCheck" );
@@ -60,10 +65,10 @@ FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl )
    ButtonGroup1Layout->addLayout( layout4, 0, 0 );
-    mCatList = new QListBox( ButtonGroup1, "mCatList" );
+    mCatList = new Q3ListBox( ButtonGroup1, "mCatList" );
    ButtonGroup1Layout->addWidget( mCatList, 1, 0 );
    mCriteriaFrameLayout->addWidget( ButtonGroup1 );
-    layout7 = new QHBoxLayout( 0, 0, 6, "layout7"); 
+    layout7 = new Q3HBoxLayout( 0, 0, 6, "layout7"); 
    textLabel1 = new QLabel( mCriteriaFrame, "textLabel1" );
@@ -77,5 +82,5 @@ FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl )
    mCriteriaFrameLayout->addLayout( layout7 );
-    layout9 = new QHBoxLayout( 0, 0, 6, "layout9"); 
+    layout9 = new Q3HBoxLayout( 0, 0, 6, "layout9"); 
    textLabel1_2 = new QLabel( mCriteriaFrame, "textLabel1_2" );
@@ -92,5 +97,5 @@ FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl )
    mCriteriaFrameLayout->addLayout( layout9 );
-    layout2 = new QHBoxLayout( 0, 0, 0, "layout2"); 
+    layout2 = new Q3HBoxLayout( 0, 0, 0, "layout2"); 
    textLabel2 = new QLabel( mCriteriaFrame, "textLabel2" );
@@ -110,5 +115,4 @@ FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl )
    languageChange();
    resize( QSize(300, 200).expandedTo(minimumSizeHint()) );
-    clearWState( WState_Polished );
 }
diff --git a/korganizer/filteredit_base.h b/korganizer/filteredit_base.h
index 13a02c3..135f6fa 100644
--- a/korganizer/filteredit_base.h
+++ b/korganizer/filteredit_base.h
@@ -13,15 +13,21 @@
 #include <qvariant.h>
 #include <qwidget.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <Q3Frame>
+#include <Q3GridLayout>
+#include <Q3HBoxLayout>
+#include <QLabel>
-class QVBoxLayout;
+class Q3VBoxLayout;
-class QHBoxLayout;
+class Q3HBoxLayout;
-class QGridLayout;
+class Q3GridLayout;
 class QSpacerItem;
-class QFrame;
+class Q3Frame;
-class QButtonGroup;
+class Q3ButtonGroup;
 class QRadioButton;
 class QPushButton;
-class QListBox;
+class Q3ListBox;
-class QListBoxItem;
+class Q3ListBoxItem;
 class QLabel;
 class QCheckBox;
@@ -32,13 +38,13 @@ class FilterEdit_base : public QWidget
 public:
-    FilterEdit_base( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+    FilterEdit_base( QWidget* parent = 0, const char* name = 0, Qt::WFlags fl = 0 );
    ~FilterEdit_base();
-    QFrame* mCriteriaFrame;
+    Q3Frame* mCriteriaFrame;
-    QButtonGroup* ButtonGroup1;
+    Q3ButtonGroup* ButtonGroup1;
    QRadioButton* mCatShowCheck;
    QRadioButton* mCatHideCheck;
    QPushButton* mCatEditButton;
-    QListBox* mCatList;
+    Q3ListBox* mCatList;
    QLabel* textLabel1;
    QCheckBox* mRecurringCheck;
@@ -54,11 +60,11 @@ public:
 protected:
-    QVBoxLayout* FilterEdit_baseLayout;
+    Q3VBoxLayout* FilterEdit_baseLayout;
-    QVBoxLayout* mCriteriaFrameLayout;
+    Q3VBoxLayout* mCriteriaFrameLayout;
-    QGridLayout* ButtonGroup1Layout;
+    Q3GridLayout* ButtonGroup1Layout;
-    QHBoxLayout* layout4;
+    Q3HBoxLayout* layout4;
-    QHBoxLayout* layout7;
+    Q3HBoxLayout* layout7;
-    QHBoxLayout* layout9;
+    Q3HBoxLayout* layout9;
-    QHBoxLayout* layout2;
+    Q3HBoxLayout* layout2;
 protected slots:
diff --git a/korganizer/filtereditdialog.cpp b/korganizer/filtereditdialog.cpp
index df84911..a3cff49 100644
--- a/korganizer/filtereditdialog.cpp
+++ b/korganizer/filtereditdialog.cpp
@@ -27,6 +27,11 @@
 #include <qcheckbox.h>
 #include <qradiobutton.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3PtrList>
+#include <QDesktopWidget>
 #include <kdebug.h>
@@ -54,5 +59,5 @@ public:
 };
-FilterEditDialog::FilterEditDialog(QPtrList<CalFilter> *filters,QWidget *parent,
+FilterEditDialog::FilterEditDialog(Q3PtrList<CalFilter> *filters,QWidget *parent,
                                   const char *name) :
  KDialogBase(parent,name,true,i18n("Edit Calendar Filters"),
@@ -81,5 +86,5 @@ FilterEditDialog::FilterEditDialog(QPtrList<CalFilter> *filters,QWidget *parent,
  mEditor = new FilterEdit_base(mainWidget);
-  QGridLayout *topLayout = new QGridLayout(mainWidget,2,2);
+  Q3GridLayout *topLayout = new Q3GridLayout(mainWidget,2,2);
  topLayout->setSpacing(spacingHint());
  topLayout->addWidget(mSelectionCombo,0,0);
diff --git a/korganizer/filtereditdialog.h b/korganizer/filtereditdialog.h
index 42aa3da..c1a52ed 100644
--- a/korganizer/filtereditdialog.h
+++ b/korganizer/filtereditdialog.h
@@ -24,5 +24,5 @@
 #define _FILTEREDITDIALOG_H
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <kdialogbase.h>
@@ -47,5 +47,5 @@ class FilterEditDialog : public KDialogBase
    Q_OBJECT
  public:
-    FilterEditDialog(QPtrList<CalFilter> *,QWidget *parent=0, const char *name=0);
+    FilterEditDialog(Q3PtrList<CalFilter> *,QWidget *parent=0, const char *name=0);
    virtual ~FilterEditDialog();
@@ -75,5 +75,5 @@ class FilterEditDialog : public KDialogBase
  private:
-    QPtrList<CalFilter> *mFilters;
+    Q3PtrList<CalFilter> *mFilters;
    ComboFilterBox *mSelectionCombo;
diff --git a/korganizer/incomingdialog.cpp b/korganizer/incomingdialog.cpp
index fe78356..c2402d4 100644
--- a/korganizer/incomingdialog.cpp
+++ b/korganizer/incomingdialog.cpp
@@ -18,8 +18,10 @@
 */
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <qmap.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 #include <kglobal.h>
@@ -57,7 +59,7 @@
-ScheduleItemIn::ScheduleItemIn(QListView *parent,IncidenceBase *ev,
+ScheduleItemIn::ScheduleItemIn(Q3ListView *parent,IncidenceBase *ev,
                               Scheduler::Method method,ScheduleMessage::Status status)
-  : QListViewItem(parent)
+  : Q3ListViewItem(parent)
 {
  mIncidence = ev;
@@ -136,5 +138,5 @@ bool ScheduleItemVisitor::visit(Journal *)
 */
 IncomingDialog::IncomingDialog(Calendar *calendar,OutgoingDialog *outgoing,
-                QWidget* parent,const char* name,bool modal,WFlags fl) :
+                QWidget* parent,const char* name,bool modal,Qt::WFlags fl) :
  IncomingDialog_base(parent,name,modal,fl)
 {
@@ -146,10 +148,10 @@ IncomingDialog::IncomingDialog(Calendar *calendar,OutgoingDialog *outgoing,
  mScheduler = new DummyScheduler(mCalendar);
 #endif
-  mMessageListView->setColumnAlignment(1,AlignHCenter);
+  mMessageListView->setColumnAlignment(1,Qt::AlignHCenter);
-  mMessageListView->setColumnAlignment(2,AlignHCenter);
+  mMessageListView->setColumnAlignment(2,Qt::AlignHCenter);
-  mMessageListView->setColumnAlignment(3,AlignHCenter);
+  mMessageListView->setColumnAlignment(3,Qt::AlignHCenter);
-  mMessageListView->setColumnAlignment(4,AlignHCenter);
+  mMessageListView->setColumnAlignment(4,Qt::AlignHCenter);
-  QObject::connect(mMessageListView,SIGNAL(doubleClicked(QListViewItem *)),
+  QObject::connect(mMessageListView,SIGNAL(doubleClicked(Q3ListViewItem *)),
-                   this,SLOT(showEvent(QListViewItem *)));
+                   this,SLOT(showEvent(Q3ListViewItem *)));
  retrieve();
 }
@@ -170,5 +172,5 @@ void IncomingDialog::setOutgoingDialog(OutgoingDialog *outgoing)
 void IncomingDialog::retrieve()
 {
-  QPtrList <ScheduleMessage> messages = mScheduler->retrieveTransactions();
+  Q3PtrList <ScheduleMessage> messages = mScheduler->retrieveTransactions();
  ScheduleMessage *message;
@@ -253,5 +255,5 @@ void IncomingDialog::rejectMessage()
 }
-void IncomingDialog::showEvent(QListViewItem *item)
+void IncomingDialog::showEvent(Q3ListViewItem *item)
 {
  IncidenceBase *incidence = ((ScheduleItemIn *)item)->event();
@@ -270,5 +272,5 @@ bool IncomingDialog::incomeRefresh(ScheduleItemIn *item)
    //user interaction before??
    Attendee *att;
-    QPtrList<Attendee> attlist = ev->attendees();
+    Q3PtrList<Attendee> attlist = ev->attendees();
    for (att=attlist.first(); att; att=attlist.next()) {
      Event *event = new Event(*ev);
@@ -515,5 +517,5 @@ bool IncomingDialog::checkAttendeesInAddressbook(IncidenceBase *inc)
  KABC::AddressBook *add_book = KABC::StdAddressBook::self();
  KABC::Addressee::List addressList;
-  QPtrList <Attendee> attendees;
+  Q3PtrList <Attendee> attendees;
  Attendee *att;
  attendees = inc->attendees();
diff --git a/korganizer/incomingdialog.h b/korganizer/incomingdialog.h
index 413ce6a..e002b25 100644
--- a/korganizer/incomingdialog.h
+++ b/korganizer/incomingdialog.h
@@ -20,5 +20,5 @@
 #define INCOMINGDIALOG_H
-#include <qlistview.h>
+#include <q3listview.h>
 #include <libkcal/calendar.h>
@@ -30,8 +30,8 @@
 using namespace KCal;
-class ScheduleItemIn : public QListViewItem
+class ScheduleItemIn : public Q3ListViewItem
 {
  public:
-    ScheduleItemIn(QListView *parent,IncidenceBase *ev,Scheduler::Method method,
+    ScheduleItemIn(Q3ListView *parent,IncidenceBase *ev,Scheduler::Method method,
                   ScheduleMessage::Status status);
    virtual ~ScheduleItemIn() {}
@@ -73,5 +73,5 @@ class IncomingDialog : public IncomingDialog_base
  public:
    IncomingDialog(Calendar *calendar,OutgoingDialog *outgoing,
-            QWidget* parent=0,const char* name=0,bool modal=false,WFlags fl=0);
+            QWidget* parent=0,const char* name=0,bool modal=false,Qt::WFlags fl=0);
    ~IncomingDialog();
    
@@ -88,5 +88,5 @@ class IncomingDialog : public IncomingDialog_base
    void acceptMessage();
    void rejectMessage();
-    void showEvent(QListViewItem *);
+    void showEvent(Q3ListViewItem *);
  protected:
diff --git a/korganizer/incomingdialog_base.cpp b/korganizer/incomingdialog_base.cpp
index 8589803..5c5ace4 100644
--- a/korganizer/incomingdialog_base.cpp
+++ b/korganizer/incomingdialog_base.cpp
@@ -12,10 +12,12 @@
 #include <qvariant.h>
-#include <qheader.h>
+#include <q3header.h>
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qtooltip.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 /* 
@@ -26,5 +28,5 @@
 *  TRUE to construct a modal dialog.
 */
-IncomingDialog_base::IncomingDialog_base( QWidget* parent, const char* name, bool modal, WFlags fl )
+IncomingDialog_base::IncomingDialog_base( QWidget* parent, const char* name, bool modal, Qt::WFlags fl )
    : QDialog( parent, name, modal, fl )
@@ -32,5 +34,5 @@ IncomingDialog_base::IncomingDialog_base( QWidget* parent, const char* name, boo
    if ( !name )
        setName( "IncomingDialog_base" );
-    IncomingDialog_baseLayout = new QGridLayout( this, 1, 1, 11, 6, "IncomingDialog_baseLayout"); 
+    IncomingDialog_baseLayout = new Q3GridLayout( this, 1, 1, 11, 6, "IncomingDialog_baseLayout"); 
    PushButton4 = new QPushButton( this, "PushButton4" );
@@ -43,5 +45,5 @@ IncomingDialog_base::IncomingDialog_base( QWidget* parent, const char* name, boo
    IncomingDialog_baseLayout->addWidget( PushButton7, 5, 1 );
-    mMessageListView = new QListView( this, "mMessageListView" );
+    mMessageListView = new Q3ListView( this, "mMessageListView" );
    mMessageListView->addColumn( tr2i18n( "Summary" ) );
    mMessageListView->addColumn( tr2i18n( "Start Date" ) );
diff --git a/korganizer/incomingdialog_base.h b/korganizer/incomingdialog_base.h
index 7732384..537ef86 100644
--- a/korganizer/incomingdialog_base.h
+++ b/korganizer/incomingdialog_base.h
@@ -13,10 +13,14 @@
 #include <qvariant.h>
 #include <qdialog.h>
+//Added by qt3to4:
-class QVBoxLayout;
+#include <Q3VBoxLayout>
-class QHBoxLayout;
+#include <Q3GridLayout>
-class QGridLayout;
+#include <Q3HBoxLayout>
-class QListView;
-class QListViewItem;
+class Q3VBoxLayout;
+class Q3HBoxLayout;
+class Q3GridLayout;
+class Q3ListView;
+class Q3ListViewItem;
 class QPushButton;
@@ -26,10 +30,10 @@ class IncomingDialog_base : public QDialog
 public:
-    IncomingDialog_base( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    IncomingDialog_base( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, Qt::WFlags fl = 0 );
    ~IncomingDialog_base();
    QPushButton* PushButton4;
    QPushButton* PushButton7;
-    QListView* mMessageListView;
+    Q3ListView* mMessageListView;
    QPushButton* PushButton7_2;
    QPushButton* PushButton8;
@@ -37,5 +41,5 @@ public:
 protected:
-    QGridLayout* IncomingDialog_baseLayout;
+    Q3GridLayout* IncomingDialog_baseLayout;
 protected slots:
diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h
index 2ac9de1..c828573 100644
--- a/korganizer/interfaces/korganizer/baseview.h
+++ b/korganizer/interfaces/korganizer/baseview.h
@@ -25,6 +25,6 @@
 #include <qwidget.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 #include <klocale.h>
@@ -89,5 +89,5 @@ class BaseView : public QWidget
      more than one.
    */
-    virtual QPtrList<Incidence> selectedIncidences() = 0;
+    virtual Q3PtrList<Incidence> selectedIncidences() = 0;
  
    /**
@@ -154,5 +154,5 @@ class BaseView : public QWidget
      @param eventList a list of events to show.
    */
-    virtual void showEvents(QPtrList<Event> eventList) = 0;
+    virtual void showEvents(Q3PtrList<Event> eventList) = 0;
    /**
diff --git a/korganizer/interfaces/korganizer/calendarviewbase.h b/korganizer/interfaces/korganizer/calendarviewbase.h
index 3c715b1..1f49357 100644
--- a/korganizer/interfaces/korganizer/calendarviewbase.h
+++ b/korganizer/interfaces/korganizer/calendarviewbase.h
@@ -24,4 +24,6 @@
 #include <qwidget.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
@@ -41,5 +43,5 @@ class CalendarViewBase : public QWidget
  public:
    CalendarViewBase(QWidget *parent, const char *name) :
-        QWidget(parent,name) {new QVBoxLayout(this);}
+        QWidget(parent,name) {new Q3VBoxLayout(this);}
    virtual ~CalendarViewBase() {};
  
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 5269af7..2814c61 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -27,12 +27,19 @@
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qvbox.h>
+#include <q3vbox.h>
 #include <qfile.h>
 #include <qdir.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qtextcodec.h>
 #include <qpixmap.h>
 #include <qpushbutton.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <Q3Frame>
+#include <QKeyEvent>
+#include <QEvent>
+#include <Q3VBoxLayout>
 #include <kdebug.h>
@@ -58,5 +65,5 @@
 #endif
 JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
-  QFrame(parent)
+  Q3Frame(parent)
 {
@@ -71,5 +78,5 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
  mJournal = 0;
  visibleMode = true;
-  QHBox * vb = new QHBox ( this );
+  Q3HBox * vb = new Q3HBox ( this );
  QPixmap iconp;
  vb->setMargin ( KDialog::marginHint()-1 );
@@ -130,5 +137,5 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
  //mCalendarBox->setMaximumWidth( maxwid/2 -20 );
  mEditor->setWordWrap( KTextEdit::WidgetWidth );
-  QBoxLayout *topLayout = new QVBoxLayout(this);
+  Q3BoxLayout *topLayout = new Q3VBoxLayout(this);
  topLayout->addWidget(vb);
  topLayout->addWidget(mEditor);
@@ -136,5 +143,5 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
  installEventFilter(this);
  mTitle->installEventFilter(this);
-  setFocusPolicy (QWidget::NoFocus); 
+  setFocusPolicy (Qt::NoFocus); 
  connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) );
@@ -169,5 +176,5 @@ void JournalEntry::resizeEvent(QResizeEvent* e )
    //qDebug("MAXXX %d ", QApplication::desktop()->width());
 #endif
-    QFrame::resizeEvent( e ); 
+    Q3Frame::resizeEvent( e ); 
 }
 QSize JournalEntry::sizeHint() const
@@ -187,5 +194,5 @@ void JournalEntry::slotSaveTemplate()
    QFile fileIn( fileName );
-    if (!fileIn.open( IO_WriteOnly ) ) {
+    if (!fileIn.open( QIODevice::WriteOnly ) ) {
        KMessageBox::error( this, i18n("Error saving template file\n '%1'.")
                            .arg( fileName ) );
@@ -193,5 +200,5 @@ void JournalEntry::slotSaveTemplate()
    } 
    // QString text;
-    QTextStream tsIn( &fileIn );
+    Q3TextStream tsIn( &fileIn );
    tsIn.setCodec( QTextCodec::codecForName("utf8") );
    tsIn << mEditor->text();
@@ -209,10 +216,10 @@ void JournalEntry::slotLoadTemplate()
        return;
    QFile fileIn( fileName );
-    if (!fileIn.open( IO_ReadOnly ) ) {
+    if (!fileIn.open( QIODevice::ReadOnly ) ) {
        KMessageBox::error( this, i18n("Error loading template file\n '%1'.")
                            .arg( fileName ) );
        return;
    }
-    QTextStream tsIn( &fileIn );
+    Q3TextStream tsIn( &fileIn );
    tsIn.setCodec( QTextCodec::codecForName("utf8") );
    QString text =  tsIn.read();
@@ -317,9 +324,9 @@ bool JournalEntry::eventFilter( QObject *o, QEvent *e )
 //  kdDebug() << "JournalEntry::event received " << e->type() << endl;
    if ( isVisible() ) {
-        mEditor->setFocusPolicy (QWidget::StrongFocus); 
+        mEditor->setFocusPolicy (Qt::StrongFocus); 
-        mTitle->setFocusPolicy (QWidget::StrongFocus); 
+        mTitle->setFocusPolicy (Qt::StrongFocus); 
    } else {
-        mEditor->setFocusPolicy (QWidget::NoFocus); 
+        mEditor->setFocusPolicy (Qt::NoFocus); 
-        mTitle->setFocusPolicy (QWidget::NoFocus); 
+        mTitle->setFocusPolicy (Qt::NoFocus); 
    }
  if ( e->type() == QEvent::FocusOut ) {
@@ -336,5 +343,5 @@ bool JournalEntry::eventFilter( QObject *o, QEvent *e )
  }
-  return QFrame::eventFilter( o, e );    // standard event processing
+  return Q3Frame::eventFilter( o, e );    // standard event processing
 }
diff --git a/korganizer/journalentry.h b/korganizer/journalentry.h
index ee17da8..0adebe9 100644
--- a/korganizer/journalentry.h
+++ b/korganizer/journalentry.h
@@ -26,5 +26,10 @@
 // Widget showing one Journal entry
-#include <qframe.h>
+#include <q3frame.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QEvent>
+#include <QLabel>
+#include <QKeyEvent>
 #include <libkcal/calendar.h>
@@ -38,5 +43,5 @@ class KOLocationBox;
 using namespace KCal;
-class JournalEntry : public QFrame {
+class JournalEntry : public Q3Frame {
    Q_OBJECT
  public:
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index 6697602..ecc7a2f 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -23,10 +23,14 @@
 #include <qstring.h>
-#include <qkeycode.h>
+#include <qnamespace.h>
 #include <qlayout.h>
 #include <qtimer.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlabel.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <QWheelEvent>
+#include <Q3GridLayout>
+#include <QEvent>
 #include <kdebug.h>
@@ -47,10 +51,10 @@
 KDateNavigator::KDateNavigator( QWidget *parent, const char *name )
-  : QFrame(parent, name),
+  : Q3Frame(parent, name),
    updateTimer(0L)
 {
-    setFrameStyle(QFrame::NoFrame);
+    setFrameStyle(Q3Frame::NoFrame);
    QDate startDate = QDate::currentDate();
-  QGridLayout *topLayout = new QGridLayout(this,8,8);
+  Q3GridLayout *topLayout = new Q3GridLayout(this,8,8);
  if (! startDate.isValid()) {
@@ -82,5 +86,5 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name )
    headings[i] = new QLabel("",this);
    //headings[i]->setFont(QFont("Arial", 10, QFont::Bold));
-    headings[i]->setAlignment(AlignCenter);
+    headings[i]->setAlignment(Qt::AlignCenter);
    headings[i]->installEventFilter(this);
@@ -91,5 +95,5 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name )
  for( i = 0; i < 6; i++ ) {
    weeknos[i] = new QLabel(this);
-    weeknos[i]->setAlignment(AlignCenter );
+    weeknos[i]->setAlignment(Qt::AlignCenter );
    //weeknos[i]->setFont(QFont("Arial", 10));
    if(!m_bShowWeekNums) {
@@ -102,5 +106,5 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name )
  daymatrix = new KODayMatrix( this, "KDateNavigator::DayMatrix");
-  daymatrix->setFrameStyle(QFrame::Panel|QFrame::Sunken);
+  daymatrix->setFrameStyle(Q3Frame::Panel|Q3Frame::Sunken);
  daymatrix->setLineWidth(1);
diff --git a/korganizer/kdatenavigator.h b/korganizer/kdatenavigator.h
index 780ebb8..2cbca76 100644
--- a/korganizer/kdatenavigator.h
+++ b/korganizer/kdatenavigator.h
@@ -24,7 +24,10 @@
 #define KDATENAVIGATOR_H
-#include <qframe.h>
+#include <q3frame.h>
 #include <qdatetime.h>
 #include <qlabel.h>
+//Added by qt3to4:
+#include <QWheelEvent>
+#include <QEvent>
 #include <libkcal/calendar.h>
@@ -39,5 +42,5 @@ class KCalendarSystem;
 class NavigatorBar;
-class KDateNavigator: public QFrame
+class KDateNavigator: public Q3Frame
 {
    Q_OBJECT
@@ -134,6 +137,6 @@ class KDateNavigator: public QFrame
    NavigatorBar *mNavigatorBar;
-    QFrame *headingSep;
+    Q3Frame *headingSep;
-    QFrame *weeknumSep;
+    Q3Frame *weeknumSep;
    QLabel *headings[7];
    QLabel *weeknos[7];
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 1d4d6de..fe59787 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -30,10 +30,21 @@
 #undef protected 
 #endif
-#include <qintdict.h>
+#include <q3intdict.h>
 #include <qdatetime.h>
 #include <qapplication.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qpainter.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QLabel>
+#include <QPixmap>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <Q3MemArray>
+#include <QEvent>
+#include <Q3Frame>
+#include <Q3PtrList>
 #include <kdebug.h>
@@ -64,5 +75,5 @@ extern int globalFlagBlockStartup;
 ////////////////////////////////////////////////////////////////////////////
 MarcusBains::MarcusBains(KOAgenda *_agenda,const char *name)
-    : QFrame(_agenda->viewport(),name), agenda(_agenda)
+    : Q3Frame(_agenda->viewport(),name), agenda(_agenda)
 {
    setLineWidth(0);
@@ -170,6 +181,6 @@ void MarcusBains::updateLocation(bool recalculate)
 */
 KOAgenda::KOAgenda(int columns,int rows,int rowSize,QWidget *parent,
-                   const char *name,WFlags f) :
+                   const char *name,Qt::WFlags f) :
-  QScrollView(parent,name,f)
+  Q3ScrollView(parent,name,f)
 {
   
@@ -191,6 +202,6 @@ KOAgenda::KOAgenda(int columns,int rows,int rowSize,QWidget *parent,
  all-day events.
 */
-KOAgenda::KOAgenda(int columns,QWidget *parent,const char *name,WFlags f) :
+KOAgenda::KOAgenda(int columns,QWidget *parent,const char *name,Qt::WFlags f) :
-  QScrollView(parent,name,f)
+  Q3ScrollView(parent,name,f)
 {
    mAllAgendaPopup = 0;
@@ -232,5 +243,5 @@ void KOAgenda::init()
    connect(mPopupTimer , SIGNAL(timeout()), this, SLOT(popupMenu()));
-    mNewItemPopup = new QPopupMenu( this );
+    mNewItemPopup = new Q3PopupMenu( this );
    connect ( mNewItemPopup, SIGNAL (activated ( int )  ), this, SLOT ( newItem(int)) );
    QString pathString = "";
@@ -241,16 +252,16 @@ void KOAgenda::init()
        pathString += "iconsmini/";
    
-    mNewItemPopup->insertItem ( SmallIcon( pathString +"newevent" ), i18n("New Event..."), 1 ); 
+    mNewItemPopup->insertItem ( (QIcon)SmallIcon( pathString +"newevent" ), i18n("New Event..."), 1 ); 
-    mNewItemPopup->insertItem ( SmallIcon( pathString +"newtodo" ),  i18n("New Todo..."),2 ); 
+    mNewItemPopup->insertItem ( (QIcon)SmallIcon( pathString +"newtodo" ),  i18n("New Todo..."),2 ); 
    mNewItemPopup->insertSeparator ( ); 
-    mNewItemPopup->insertItem ( SmallIcon( pathString +"day" ),  i18n("Day view"),3 );  
+    mNewItemPopup->insertItem ( (QIcon)SmallIcon( pathString +"day" ),  i18n("Day view"),3 );  
-    mNewItemPopup->insertItem ( SmallIcon( pathString +"xdays" ),  i18n("Next days"),8 );  
+    mNewItemPopup->insertItem ( (QIcon)SmallIcon( pathString +"xdays" ),  i18n("Next days"),8 );  
-    mNewItemPopup->insertItem ( SmallIcon( pathString +"week" ),  i18n("Next week"),4 );  
+    mNewItemPopup->insertItem ( (QIcon)SmallIcon( pathString +"week" ),  i18n("Next week"),4 );  
-    mNewItemPopup->insertItem ( SmallIcon( pathString +"week" ),  i18n("Next two weeks"),5 );   
+    mNewItemPopup->insertItem ( (QIcon)SmallIcon( pathString +"week" ),  i18n("Next two weeks"),5 );   
-    mNewItemPopup->insertItem ( SmallIcon( pathString +"month" ),  i18n("This month"),6 );  
+    mNewItemPopup->insertItem ( (QIcon)SmallIcon( pathString +"month" ),  i18n("This month"),6 );  
-    mNewItemPopup->insertItem ( SmallIcon( pathString +"journal" ),  i18n("Journal view"),7 ); 
+    mNewItemPopup->insertItem ( (QIcon)SmallIcon( pathString +"journal" ),  i18n("Journal view"),7 ); 
 #ifndef _WIN32_
-  int wflags = viewport()-> getWFlags() |WRepaintNoErase;//WResizeNoErase
+    Qt::WindowFlags wflags = viewport()-> windowFlags() |Qt::WRepaintNoErase;//WResizeNoErase
-  viewport()->setWFlags ( wflags);
+  viewport()->setWindowFlags ( wflags);
 #endif
  mGridSpacingX = 80;
@@ -264,5 +275,5 @@ void KOAgenda::init()
  // Grab key strokes for keyboard navigation of agenda. Seems to have no
  // effect. Has to be fixed.
-  setFocusPolicy(WheelFocus);
+  setFocusPolicy(Qt::WheelFocus);
  connect(&mScrollUpTimer,SIGNAL(timeout()),SLOT(scrollUp()));
@@ -396,9 +407,9 @@ bool KOAgenda::eventFilter ( QObject *object, QEvent *event )
    case (QEvent::Leave):
        if (!mActionItem)
-            setCursor(arrowCursor);
+            setCursor(Qt::arrowCursor);
        return true;
    default:
-        return QScrollView::eventFilter(object,event);
+        return Q3ScrollView::eventFilter(object,event);
    }
 }
@@ -506,9 +517,9 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
    bool leftButt = false;
 #ifdef DESKTOP_VERSION
-    leftButt  = (me->button() == LeftButton);
+    leftButt  = (me->button() == Qt::LeftButton);
 #endif
    switch (me->type())  {
    case QEvent::MouseButtonPress:
-        if (me->button() == LeftButton) {
+        if (me->button() == Qt::LeftButton) {
            mPopupTimer->start( 600 );
            mLeftMouseDown = true;
@@ -579,8 +590,8 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
            mPopupItem = (KOAgendaItem *)object;
            mPopupKind = 1;
-            if (me->button() == RightButton) {
+            if (me->button() == Qt::RightButton) {
                mPopupKind = 3;
                popupMenu();
-            } else if (me->button() == LeftButton) {
+            } else if (me->button() == Qt::LeftButton) {
                mActionItem = (KOAgendaItem *)object;
                if (mActionItem) {
@@ -601,5 +612,5 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
            selectItem(0);
            mActionItem = 0;   
-            if (me->button() == RightButton) {
+            if (me->button() == Qt::RightButton) {
                int x,y;
                viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
@@ -612,6 +623,6 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
                mPopupKind = 4;
                popupMenu();
-            } else if (me->button() == LeftButton) {
+            } else if (me->button() == Qt::LeftButton) {
-                setCursor(arrowCursor);
+                setCursor(Qt::arrowCursor);
                startSelectAction(viewportPos);
            }
@@ -620,9 +631,9 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
    case QEvent::MouseButtonRelease:
-        if (me->button() == LeftButton ) {  
+        if (me->button() == Qt::LeftButton ) {  
            mPopupTimer->stop();
        }
        if (object != viewport()) { 
-            if (me->button() == LeftButton && mLeftMouseDown) {
+            if (me->button() == Qt::LeftButton && mLeftMouseDown) {
                if (mActionItem) {  
                    QPoint clipperPos = clipper()->mapFromGlobal(viewport()->mapToGlobal(viewportPos));
@@ -634,5 +645,5 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
                        placeSubCells( mActionItem );
                        // emit startDragSignal( mActionItem->incidence() );
-                        setCursor( arrowCursor );
+                        setCursor( Qt::arrowCursor );
                        mActionItem = 0;
                        mActionType = NOP;
@@ -646,9 +657,9 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
            
        } else { // ---------- viewport()
-           if (me->button() == LeftButton && mLeftMouseDown ) { //left click
+           if (me->button() == Qt::LeftButton && mLeftMouseDown ) { //left click
                endSelectAction( true ); // emit new event signal
            }
        }
-        if (me->button() == LeftButton) 
+        if (me->button() == Qt::LeftButton) 
            mLeftMouseDown = false;
       
@@ -851,13 +862,13 @@ void KOAgenda::startItemAction(QPoint viewportPos)
        mActionItem->cellX() == mCurrentCellX) {
      mActionType = RESIZELEFT;
-      setCursor(sizeHorCursor);
+      setCursor(Qt::sizeHorCursor);
    } else if ( allowResize && (mGridSpacingX - gridDistanceX) < mResizeBorderWidth &&
               mActionItem->cellXWidth() == mCurrentCellX) {
      mActionType = RESIZERIGHT;
-      setCursor(sizeHorCursor);
+      setCursor(Qt::sizeHorCursor);
    } else {
      mActionType = MOVE;
      mActionItem->startMove();
-      setCursor(sizeAllCursor);
+      setCursor(Qt::sizeAllCursor);
    }
  } else {
@@ -867,14 +878,14 @@ void KOAgenda::startItemAction(QPoint viewportPos)
        !mActionItem->firstMultiItem()) {
      mActionType = RESIZETOP;
-      setCursor(sizeVerCursor);
+      setCursor(Qt::sizeVerCursor);
    } else if (allowResize &&(mGridSpacingY - gridDistanceY) < mResizeBorderWidth &&
               mActionItem->cellYBottom() == mCurrentCellY &&
               !mActionItem->lastMultiItem())  {
      mActionType = RESIZEBOTTOM;
-      setCursor(sizeVerCursor);
+      setCursor(Qt::sizeVerCursor);
    } else {
      mActionType = MOVE;
      mActionItem->startMove();
-      setCursor(sizeAllCursor);
+      setCursor(Qt::sizeAllCursor);
    }
  }
@@ -907,5 +918,5 @@ void KOAgenda::performItemAction(QPoint viewportPos)
      placeSubCells( mActionItem );
      // emit startDragSignal( mActionItem->incidence() );
-      setCursor( arrowCursor );
+      setCursor( Qt::arrowCursor );
      mActionItem = 0;
      mActionType = NOP;
@@ -916,16 +927,16 @@ void KOAgenda::performItemAction(QPoint viewportPos)
    switch ( mActionType ) {
      case MOVE:
-        setCursor( sizeAllCursor );
+        setCursor( Qt::sizeAllCursor );
        break;
      case RESIZETOP:
      case RESIZEBOTTOM:
-        setCursor( sizeVerCursor );
+        setCursor( Qt::sizeVerCursor );
        break;
      case RESIZELEFT:
      case RESIZERIGHT:
-        setCursor( sizeHorCursor );
+        setCursor( Qt::sizeHorCursor );
        break;
      default:
-        setCursor( arrowCursor );
+        setCursor( Qt::arrowCursor );
    }
  }
@@ -972,5 +983,5 @@ void KOAgenda::performItemAction(QPoint viewportPos)
        gridToContents(mCurrentCellX,mActionItem->cellYTop(),x,y);
        //moveChild(mActionItem,childX(mActionItem),y);
-        QScrollView::moveChild( mActionItem,childX(mActionItem),y );
+        Q3ScrollView::moveChild( mActionItem,childX(mActionItem),y );
      }
    } else if (mActionType == RESIZEBOTTOM) {
@@ -1020,5 +1031,5 @@ void KOAgenda::endItemAction()
        KOAgendaItem *modifiedItem = placeItem;
        //emit itemModified( placeItem, mActionType /*KOGlobals::EVENTEDITED */);
-        QPtrList<KOAgendaItem> oldconflictItems ;//= placeItem->conflictItems();
+        Q3PtrList<KOAgendaItem> oldconflictItems ;//= placeItem->conflictItems();
        KOAgendaItem *item;
  
@@ -1111,5 +1122,5 @@ void KOAgenda::endItemAction()
    mScrollUpTimer.stop();
    mScrollDownTimer.stop();
-    setCursor( arrowCursor );
+    setCursor( Qt::arrowCursor );
    mActionItem = 0;
    mActionType = NOP;
@@ -1137,10 +1148,10 @@ void KOAgenda::setNoActionCursor(KOAgendaItem *moveItem,QPoint viewportPos)
    if (gridDistanceX < mResizeBorderWidth &&
        moveItem->cellX() == gx) {
-      setCursor(sizeHorCursor);
+      setCursor(Qt::sizeHorCursor);
    } else if ((mGridSpacingX - gridDistanceX) < mResizeBorderWidth &&
             moveItem->cellXWidth() == gx) {
-      setCursor(sizeHorCursor);
+      setCursor(Qt::sizeHorCursor);
    } else {
-      setCursor(arrowCursor);
+      setCursor(Qt::arrowCursor);
    }
  } else {
@@ -1149,11 +1160,11 @@ void KOAgenda::setNoActionCursor(KOAgendaItem *moveItem,QPoint viewportPos)
        moveItem->cellYTop() == gy &&
        !moveItem->firstMultiItem()) {
-      setCursor(sizeVerCursor);
+      setCursor(Qt::sizeVerCursor);
    } else if ((mGridSpacingY - gridDistanceY) < mResizeBorderWidth &&
               moveItem->cellYBottom() == gy &&
               !moveItem->lastMultiItem()) {
-      setCursor(sizeVerCursor);
+      setCursor(Qt::sizeVerCursor);
    } else {
-      setCursor(arrowCursor);
+      setCursor(Qt::arrowCursor);
    }
  }
@@ -1174,7 +1185,7 @@ void KOAgenda::placeSubCells(KOAgendaItem *placeItem)
 {
-    QPtrList<KOAgendaItem> conflictItems;
+    Q3PtrList<KOAgendaItem> conflictItems;
    int maxSubCells = 0;
-    QIntDict<KOAgendaItem> subCellDict(7);
+    Q3IntDict<KOAgendaItem> subCellDict(7);
    KOAgendaItem *item;
@@ -1241,5 +1252,5 @@ void KOAgenda::placeSubCells(KOAgendaItem *placeItem)
            if ( placeItem != item ) {
                KOAgendaItem *item2;
-                QPtrList<KOAgendaItem> conflictItems2 = item->conflictItems();
+                Q3PtrList<KOAgendaItem> conflictItems2 = item->conflictItems();
                for ( item2=conflictItems2.first(); item2 != 0;
                      item2=conflictItems2.next() ) {
@@ -1326,7 +1337,7 @@ void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch)
                    off += vySel;
                //qDebug("OFF %d %d %d", off,vySel, vy );  
-                bitBlt ( pd, vx, vy+off, &mPaintPixmap, cx, cy+off, cw , ch-off  ,CopyROP);
+                bitBlt ( pd, vx, vy+off, &mPaintPixmap, cx, cy+off, cw , ch-off  ,QPainter::CompositionMode_Source);
            } else {
-                bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP);
+                bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,QPainter::CompositionMode_Source);
            }
        }
@@ -1343,5 +1354,5 @@ void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch)
                    if ( hei < 5 ) p_hei = hei;
                    hei -= 5;
-                    bitBlt ( pd, vx+1, vy+offset, &mHighlightPixmap, 0, 0, mGridSpacingX-1, p_hei ,CopyROP); 
+                    bitBlt ( pd, vx+1, vy+offset, &mHighlightPixmap, 0, 0, mGridSpacingX-1, p_hei ,QPainter::CompositionMode_Source); 
                    offset += 5;
                }
@@ -1366,5 +1377,5 @@ void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch)
        // qDebug("  %d %d %d %d ",  cx, cy, cw,ch) ;
        if ( !(selectionX ==  cx &&  cy == mSelectionYTop  &&  cw ==mGridSpacingX && ch == mSelectionHeight ) )
-            bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP);
+            bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,QPainter::CompositionMode_Source);
    
        if ( mSelectionHeight > 0 ) { 
@@ -1380,5 +1391,5 @@ void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch)
                    if ( hei < 5 ) p_hei = hei;
                    hei -= 5;
-                    bitBlt ( pd, vx+1, vy+offset, &mHighlightPixmap, 0, 0, mGridSpacingX-1, p_hei ,CopyROP); 
+                    bitBlt ( pd, vx+1, vy+offset, &mHighlightPixmap, 0, 0, mGridSpacingX-1, p_hei ,QPainter::CompositionMode_Source); 
                    offset += 5;
                }
@@ -1577,12 +1588,12 @@ void KOAgenda::drawContentsToPainter( QPainter* paint, bool backgroundOnly )// i
    if ( lGridSpacingY > 0 ) {
        while (y < cy + ch) {
-            p->setPen( SolidLine );
+            p->setPen( Qt::SolidLine );
            p->drawLine(cx,y,cx+cw,y);
            y+=lGridSpacingY;
-            p->setPen( DotLine );
+            p->setPen( Qt::DotLine );
            p->drawLine(cx,y,cx+cw,y);
            y+=lGridSpacingY;
        } 
-        p->setPen( SolidLine );
+        p->setPen( Qt::SolidLine );
    }
    mPixPainter.end() ;
@@ -1718,5 +1729,5 @@ void KOAgenda::updateTodo( Todo * todo, int days, bool remove)
        mUnusedItems.append( item );
        mItems.remove( item );
-        QPtrList<KOAgendaItem> oldconflictItems = item->conflictItems();
+        Q3PtrList<KOAgendaItem> oldconflictItems = item->conflictItems();
        KOAgendaItem *itemit; 
        //globalFlagBlockAgendaItemPaint = 1;
@@ -1748,5 +1759,5 @@ void KOAgenda::updateTodo( Todo * todo, int days, bool remove)
    //qDebug("updateTodo+++++++++++++++++++++++++++++++++++++ ");
    QDate currentDate = QDate::currentDate();
-    bool overdue = (!todo->isCompleted()) && (todo->dtDue() < currentDate)&&  ( KOPrefs::instance()->mShowTodoInAgenda );
+    bool overdue = (!todo->isCompleted()) && (todo->dtDue() < (QDateTime)currentDate)&&  ( KOPrefs::instance()->mShowTodoInAgenda );
    QDateTime dt;
    if ( todo->hasCompletedDate() )
@@ -1780,5 +1791,5 @@ void KOAgenda::updateTodo( Todo * todo, int days, bool remove)
    qApp->processEvents();
    globalFlagBlockAgendaItemPaint = 0; 
-    QPtrList<KOAgendaItem> oldconflictItems = item->conflictItems();
+    Q3PtrList<KOAgendaItem> oldconflictItems = item->conflictItems();
    KOAgendaItem *itemit; 
    for ( itemit=oldconflictItems.first(); itemit != 0;
@@ -1868,5 +1879,5 @@ void KOAgenda::insertMultiItem (Event *event,QDate qd,int XBegin,int XEnd,
  int count = 0;
  KOAgendaItem *current = 0;
-  QPtrList<KOAgendaItem> multiItems;
+  Q3PtrList<KOAgendaItem> multiItems;
  for (cellX = XBegin;cellX <= XEnd;++cellX) {
    if (cellX == XBegin) cellYTop = YTop;
@@ -1928,5 +1939,5 @@ void KOAgenda::resizeEvent ( QResizeEvent *ev )
    mResizeTimer.start( 150 , true );
    computeSizes(); 
-    QScrollView::resizeEvent( ev );
+    Q3ScrollView::resizeEvent( ev );
    return;
@@ -2017,5 +2028,5 @@ void KOAgenda::popupAlarm()
    // TODO: deal correctly with multiple alarms
    Alarm* alarm;
-    QPtrList<Alarm> list(mClickedItem->incidence()->alarms());
+    Q3PtrList<Alarm> list(mClickedItem->incidence()->alarms());
    for(alarm=list.first();alarm;alarm=list.next()) {
        alarm->toggleAlarm();
@@ -2108,14 +2119,14 @@ void KOAgenda::keyPressEvent( QKeyEvent *kev )
 {
  switch(kev->key()) {
-    case Key_PageDown:
+      case Qt::Key_PageDown:
      verticalScrollBar()->addPage();
      break;
-    case Key_PageUp:
+      case Qt::Key_PageUp:
      verticalScrollBar()->subtractPage();
      break;
-    case Key_Down:
+      case Qt::Key_Down:
      verticalScrollBar()->addLine();
      break;
-    case Key_Up:
+      case Qt::Key_Up:
      verticalScrollBar()->subtractLine();
      break;
@@ -2147,5 +2158,5 @@ void KOAgenda::setDateList(const DateList &selectedDates)
 }
-void KOAgenda::setHolidayMask(QMemArray<bool> *mask)
+void KOAgenda::setHolidayMask(Q3MemArray<bool> *mask)
 {
  mHolidayMask = mask;
@@ -2163,5 +2174,5 @@ void KOAgenda::contentsMousePressEvent ( QMouseEvent *event )
 {
 
-  QScrollView::contentsMousePressEvent(event);
+  Q3ScrollView::contentsMousePressEvent(event);
 }
@@ -2197,5 +2208,5 @@ void KOAgenda::moveChild( QWidget *w, int x , int y )
 {
    ++x;
-    QScrollView::moveChild( w, x , y );
+    Q3ScrollView::moveChild( w, x , y );
 }
 #include <qmessagebox.h>
@@ -2203,5 +2214,5 @@ void KOAgenda::moveChild( QWidget *w, int x , int y )
 #include <qprinter.h>
 #include <qpainter.h>
-#include <qpaintdevicemetrics.h>
+#include <q3paintdevicemetrics.h>
 #endif
@@ -2232,5 +2243,5 @@ void KOAgenda::printSelection()
    }
    QPainter p( printer );
-    QPaintDeviceMetrics m = QPaintDeviceMetrics ( printer ); 
+    Q3PaintDeviceMetrics m = Q3PaintDeviceMetrics ( printer ); 
    QString date = i18n("Date range: ")+KGlobal::locale()->formatDate( mSelectedDates.first()  )+" - "+KGlobal::locale()->formatDate( mSelectedDates.last()  );
    //date += " --- printing time: " + KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), true );
diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h
index 380ce62..0708341 100644
--- a/korganizer/koagenda.h
+++ b/korganizer/koagenda.h
@@ -24,18 +24,27 @@
 #define KOAGENDA_H
-#include <qscrollview.h>
+#include <q3scrollview.h>
 #include <qtimer.h>
-#include <qmemarray.h>
+#include <q3memarray.h>
 #include <qpainter.h>
 #include <qpixmap.h>
-#include <qguardedptr.h>
+#include <qpointer.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <Q3Frame>
+#include <QLabel>
+#include <QMouseEvent>
+#include <Q3PtrList>
+#include <Q3PopupMenu>
+#include <QKeyEvent>
+#include <QEvent>
 #include "koagendaitem.h"
 #include "koeventview.h"
-class QPopupMenu;
+class Q3PopupMenu;
 class QTime;
 class KConfig;
-class QFrame;
+class Q3Frame;
 class KOAgenda;
 class KCal::Event;
@@ -44,5 +53,5 @@ class KCal::Todo;
 using namespace KCal;
-class MarcusBains : public QFrame {
+class MarcusBains : public Q3Frame {
    Q_OBJECT
  public:
@@ -64,5 +73,5 @@ class MarcusBains : public QFrame {
-class KOAgenda : public QScrollView
+class KOAgenda : public Q3ScrollView
 {
    Q_OBJECT
@@ -72,7 +81,7 @@ class KOAgenda : public QScrollView
    KOAgenda ( int columns, int rows, int columnSize, QWidget * parent=0,
-               const char * name=0, WFlags f=0 );
+               const char * name=0, Qt::WFlags f=0 );
    KOAgenda ( int columns, QWidget * parent=0,
-               const char * name=0, WFlags f=0 );
+               const char * name=0, Qt::WFlags f=0 );
    virtual ~KOAgenda();
    bool mInvalidPixmap;
@@ -118,5 +127,5 @@ class KOAgenda : public QScrollView
    void checkScrollBoundaries();
-    void setHolidayMask(QMemArray<bool> *);
+    void setHolidayMask(Q3MemArray<bool> *);
    void setDateList(const DateList &selectedDates);
    DateList dateList() const;
@@ -278,8 +287,8 @@ class KOAgenda : public QScrollView
    // The KOAgendaItem, which is being moved/resized
-    QGuardedPtr<KOAgendaItem> mActionItem;
+    QPointer<KOAgendaItem> mActionItem;
    // Currently selected item
-    QGuardedPtr<KOAgendaItem> mSelectedItem;
+    QPointer<KOAgendaItem> mSelectedItem;
    // The Marcus Bains Line widget.
@@ -292,14 +301,14 @@ class KOAgenda : public QScrollView
    // List of all Items contained in agenda
-    QPtrList<KOAgendaItem> mItems;
+    Q3PtrList<KOAgendaItem> mItems;
-    QPtrList<KOAgendaItem> mUnusedItems;
+    Q3PtrList<KOAgendaItem> mUnusedItems;
    KOAgendaItem* getNewItem(Incidence * event,QDate qd, QWidget* viewport);
-    QPopupMenu *mItemPopup; // Right mouse button popup menu for KOAgendaItems
+    Q3PopupMenu *mItemPopup; // Right mouse button popup menu for KOAgendaItems
-    QPopupMenu *mNewItemPopup;
+    Q3PopupMenu *mNewItemPopup;
    int mOldLowerScrollValue;
    int mOldUpperScrollValue;
    KOAgendaItem * getItemForTodo ( Todo * todo );
-    QMemArray<bool> *mHolidayMask;
+    Q3MemArray<bool> *mHolidayMask;
    int mCurPixWid;
    int mCurPixHei;
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 407424d..0f9a38f 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -20,11 +20,21 @@
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qhbox.h>
+#include <q3hbox.h>
-#include <qvbox.h>
+#include <q3vbox.h>
 #include <qtooltip.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
-#include <qdragobject.h>
+#include <q3dragobject.h>
 #include <qdrawutil.h> 
 #include <qpainter.h> 
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3PtrList>
+#include <QPixmap>
+#include <QDragEnterEvent>
+#include <QDropEvent>
+#include <QResizeEvent>
+#include <QMouseEvent>
+#include <QEvent>
+#include <QPaintEvent>
 #include <kiconloader.h>
@@ -58,8 +68,8 @@ QToolTipGroup *KOAgendaItem::mToolTipGroup = 0;
 //--------------------------------------------------------------------------
-class KOAgendaItemWhatsThis :public QWhatsThis
+class KOAgendaItemWhatsThis :public Q3WhatsThis
 {
 public:
-  KOAgendaItemWhatsThis( KOAgendaItem* view ) : QWhatsThis( view ),_view (view) { };
+  KOAgendaItemWhatsThis( KOAgendaItem* view ) : Q3WhatsThis( view ),_view (view) { };
 protected:
@@ -73,5 +83,5 @@ private:
 KOAgendaItem::KOAgendaItem(Incidence *incidence, QDate qd, QWidget *parent,bool allday,
-                           const char *name,WFlags) :
+                           const char *name,Qt::WFlags) :
    QWidget(parent, name), mIncidence(incidence), mDate(qd)
 {
@@ -80,6 +90,6 @@ KOAgendaItem::KOAgendaItem(Incidence *incidence, QDate qd, QWidget *parent,bool
 #endif
    mKOAgendaItemWhatsThis =  new KOAgendaItemWhatsThis(this);
-    int wflags = getWFlags() |WRepaintNoErase;// WResizeNoErase
+    Qt::WindowFlags wflags = windowFlags() |Qt::WRepaintNoErase;// WResizeNoErase
-    setWFlags ( wflags);
+    setWindowFlags ( wflags);
    mAllDay = allday;
    init ( incidence, qd );
@@ -104,5 +114,5 @@ void KOAgendaItem::initColor ()
         ( !((static_cast<Todo*>(mIncidence))->isCompleted()) &&
           ((static_cast<Todo*>(mIncidence))->dtDue().date() <=  QDate::currentDate()) ) ) {
-        if (  (static_cast<Todo*>(mIncidence))->dtDue() <  QDateTime::currentDateTime().date()) 
+        if (  (static_cast<Todo*>(mIncidence))->dtDue() <  (QDateTime)QDateTime::currentDateTime().date()) 
            mBackgroundColor = KOPrefs::instance()->mTodoOverdueColor ;
        else 
@@ -133,5 +143,5 @@ void KOAgendaItem::initColor ()
    mColorGroup  = QColorGroup( BackgroundColor.light(), 
                                BackgroundColor.dark(),BackgroundColor.light(),
-                                BackgroundColor.dark(),BackgroundColor, black, BackgroundColor) ;
+                                BackgroundColor.dark(),BackgroundColor, Qt::black, BackgroundColor) ;
    setBackgroundColor( mBackgroundColor );
    mWhiteText = (mBackgroundColor.red() + mBackgroundColor.green() + mBackgroundColor.blue() < 250);
@@ -229,5 +239,5 @@ bool KOAgendaItem::updateIcons(QPainter * p, bool horLayout)
    }
    if (mIncidence->isAlarmEnabled() && mIncidence->alarmEnabled()) {
-        p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, red );
+        p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, Qt::red );
        if ( horLayout )
            ++xOff;
@@ -236,5 +246,5 @@ bool KOAgendaItem::updateIcons(QPainter * p, bool horLayout)
    }
    if (mIncidence->doesRecur()) {
-        p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, blue );
+        p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, Qt::blue );
        if ( horLayout )
            ++xOff;
@@ -243,5 +253,5 @@ bool KOAgendaItem::updateIcons(QPainter * p, bool horLayout)
    }
    if (mIncidence->description().length() > 0) {
-        p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, darkGreen );
+        p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, Qt::darkGreen );
        if ( horLayout )
            ++xOff;
@@ -250,5 +260,5 @@ bool KOAgendaItem::updateIcons(QPainter * p, bool horLayout)
    }
   if (mIncidence->isReadOnly()) {
-        p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, white );
+        p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, Qt::white );
        if ( horLayout )
            ++xOff;
@@ -260,5 +270,5 @@ bool KOAgendaItem::updateIcons(QPainter * p, bool horLayout)
        
        if (mIncidence->organizer() == KOPrefs::instance()->email()) {
-            p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, black );
+            p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, Qt::black );
            if ( horLayout )
                ++xOff;
@@ -271,5 +281,5 @@ bool KOAgendaItem::updateIcons(QPainter * p, bool horLayout)
            } else {
-                p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, yellow  );
+                p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, Qt::yellow  );
                if ( horLayout )
                    ++xOff;
@@ -278,5 +288,5 @@ bool KOAgendaItem::updateIcons(QPainter * p, bool horLayout)
            }
-            p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, darkYellow );
+            p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, Qt::darkYellow );
            if ( horLayout )
                ++xOff;
@@ -421,7 +431,7 @@ void KOAgendaItem::paintMe( bool selected, QPainter* paint )
    int align;
 #ifndef DESKTOP_VERSION
-    align = ( AlignLeft|WordBreak|AlignTop);
+    align = ( Qt::AlignLeft|Qt::TextWordWrap|Qt::AlignTop);
 #else
-    align = ( AlignLeft|BreakAnywhere|WordBreak|AlignTop);
+    align = ( Qt::AlignLeft|Qt::TextWrapAnywhere|Qt::TextWordWrap|Qt::AlignTop);
 #endif
    if (  addIcon  ) {
@@ -436,5 +446,5 @@ void KOAgendaItem::paintMe( bool selected, QPainter* paint )
    } 
    if ( mWhiteText )
-        paint->setPen ( white); 
+        paint->setPen ( Qt::white); 
    if ( x < 0 ) {
        w = w+x-3;
@@ -445,7 +455,7 @@ void KOAgendaItem::paintMe( bool selected, QPainter* paint )
            w = parentWidget()->width() - 6;
 #ifndef DESKTOP_VERSION
-    align = ( AlignHCenter|WordBreak|AlignTop);
+    align = ( Qt::AlignHCenter|Qt::TextWordWrap|Qt::AlignTop);
 #else
-    align = ( AlignHCenter|BreakAnywhere|WordBreak|AlignTop);
+    align = ( Qt::AlignHCenter|Qt::TextWrapAnywhere|Qt::TextWordWrap|Qt::AlignTop);
 #endif
@@ -562,5 +572,5 @@ void KOAgendaItem::paintEvent ( QPaintEvent *e )
    }
    //qDebug("%d %d %d %d %d  %d %d",rx, ry, paintFrom, xx ,yPaintCoord+ry, rw, rh);
-    bitBlt (this, rx, ry, paintFrom, xx ,yPaintCoord+ry, rw, rh ,CopyROP); 
+    bitBlt (this, rx, ry, paintFrom, xx ,yPaintCoord+ry, rw, rh ,QPainter::CompositionMode_Source); 
 }
 void KOAgendaItem::computeText()
@@ -629,5 +639,5 @@ void KOAgendaItem::computeText()
        tipText += "\n"+i18n("Location: ")+mIncidence->location();
    }
-    QToolTip::add(this,tipText,toolTipGroup(),""); 
+    QToolTip::add(this,tipText /*TODO:hacker: ,toolTipGroup(),"" */); 
 #endif
 }
@@ -796,5 +806,5 @@ void KOAgendaItem::expandRight(int dx)
 QToolTipGroup *KOAgendaItem::toolTipGroup()
 {
-  if (!mToolTipGroup) mToolTipGroup = new QToolTipGroup(0);
+  /* TODO:hacker: if (!mToolTipGroup) mToolTipGroup = new QToolTipGroup(0); */
  return mToolTipGroup;
 }
@@ -804,5 +814,5 @@ void KOAgendaItem::dragEnterEvent( QDragEnterEvent *e )
 #ifndef KORG_NODND
  if ( ICalDrag::canDecode( e ) || VCalDrag::canDecode( e ) ||
-       !QTextDrag::canDecode( e ) ) {
+       !Q3TextDrag::canDecode( e ) ) {
    e->ignore();
    return;
@@ -816,5 +826,5 @@ void KOAgendaItem::dropEvent( QDropEvent *e )
 #ifndef KORG_NODND
  QString text;
-  if(QTextDrag::decode(e,text))
+  if(Q3TextDrag::decode(e,text))
  {
    kdDebug() << "Dropped : " << text << endl;
@@ -834,10 +844,10 @@ void KOAgendaItem::dropEvent( QDropEvent *e )
-QPtrList<KOAgendaItem> KOAgendaItem::conflictItems()
+Q3PtrList<KOAgendaItem> KOAgendaItem::conflictItems()
 {
  return mConflictItems;
 }
-void KOAgendaItem::setConflictItems(QPtrList<KOAgendaItem> ci)
+void KOAgendaItem::setConflictItems(Q3PtrList<KOAgendaItem> ci)
 {
  mConflictItems = ci;
diff --git a/korganizer/koagendaitem.h b/korganizer/koagendaitem.h
index 27ee720..17cf975 100644
--- a/korganizer/koagendaitem.h
+++ b/korganizer/koagendaitem.h
@@ -20,9 +20,16 @@
 #define KOAGENDAITEM_H
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlabel.h>
 #include <qpixmap.h>
 #include <qdatetime.h>
 #include <qpalette.h> 
+//Added by qt3to4:
+#include <QDropEvent>
+#include <QPaintEvent>
+#include <QResizeEvent>
+#include <Q3PtrList>
+#include <QEvent>
+#include <QDragEnterEvent>
 #include <libkcal/incidence.h>
@@ -46,5 +53,5 @@ class KOAgendaItem : public QWidget
  public:
    KOAgendaItem(Incidence *incidence, QDate qd, QWidget *parent, bool allday, const char *name=0,
-                 WFlags f=0 );
+                 Qt::WFlags f=0 );
    ~KOAgendaItem();
    QString getWhatsThisText();
@@ -97,6 +104,6 @@ class KOAgendaItem : public QWidget
    static QToolTipGroup *toolTipGroup();
    
-    QPtrList<KOAgendaItem> conflictItems();
+    Q3PtrList<KOAgendaItem> conflictItems();
-    void setConflictItems(QPtrList<KOAgendaItem>);
+    void setConflictItems(Q3PtrList<KOAgendaItem>);
    void addConflictItem(KOAgendaItem *ci);
    void paintMe( bool, QPainter* painter = 0 );
@@ -162,5 +169,5 @@ class KOAgendaItem : public QWidget
    QString mDisplayedText;
    bool mSelected;
-    QPtrList<KOAgendaItem> mConflictItems;
+    Q3PtrList<KOAgendaItem> mConflictItems;
 };
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 6e65a03..87993ae 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -22,8 +22,8 @@
 */
-#include <qhbox.h>
+#include <q3hbox.h>
-#include <qvbox.h>
+#include <q3vbox.h>
 #include <qlabel.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlayout.h>
 #ifndef KORG_NOSPLITTER
@@ -32,9 +32,21 @@
 #include <qfont.h>
 #include <qfontmetrics.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qtooltip.h>
 #include <qpainter.h>
 #include <qpushbutton.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QPixmap>
+#include <QMouseEvent>
+#include <Q3GridLayout>
+#include <Q3ValueList>
+#include <QKeyEvent>
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
+#include <QPaintEvent>
+#include <Q3PtrList>
 #include <kapplication.h>
@@ -79,6 +91,6 @@ using namespace KOrg;
 #define IDLETIMEOUT 45
-TimeLabels::TimeLabels(int rows,QWidget *parent,const char *name,WFlags f) :
+TimeLabels::TimeLabels(int rows,QWidget *parent,const char *name,Qt::WFlags f) :
-    QScrollView(parent,name,f)
+    Q3ScrollView(parent,name,f)
 {
    myPix.resize( 1, 1 );
@@ -96,5 +108,5 @@ TimeLabels::TimeLabels(int rows,QWidget *parent,const char *name,WFlags f) :
    resizeContents(50,mRows * mCellHeight);
-    viewport()->setBackgroundMode( PaletteBackground );
+    viewport()->setBackgroundMode( Qt::PaletteBackground );
 }
@@ -284,5 +296,5 @@ void TimeLabels::paintEvent(QPaintEvent*)
 EventIndicator::EventIndicator(Location loc,QWidget *parent,const char *name)
-    : QFrame(parent,name)
+    : Q3Frame(parent,name)
 {
    mColumns = 1;
@@ -394,5 +406,5 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
    }
-    QBoxLayout *topLayout = new QVBoxLayout(this);
+    Q3BoxLayout *topLayout = new Q3VBoxLayout(this);
    // Create day name labels for agenda columns
@@ -402,11 +414,11 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
    mSplitterAgenda->setMinimizeDirection ( KDGanttMinimizeSplitter::Up );
    topLayout->addWidget( mSplitterAgenda );
-    mAllDayFrame = new QHBox(mSplitterAgenda);
+    mAllDayFrame = new Q3HBox(mSplitterAgenda);
-    mAllDayFrame->setFocusPolicy(NoFocus);
+    mAllDayFrame->setFocusPolicy(Qt::NoFocus);
    QWidget *agendaFrame = new QWidget(mSplitterAgenda);
-    agendaFrame->setFocusPolicy(NoFocus);
+    agendaFrame->setFocusPolicy(Qt::NoFocus);
  
    // Create all-day agenda widget
-    mDummyAllDayLeft = new QVBox( mAllDayFrame );
+    mDummyAllDayLeft = new Q3VBox( mAllDayFrame );
    mExpandButton = new QPushButton(mDummyAllDayLeft);
@@ -421,7 +433,7 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
    mExpandButton->setFixedSize( widebut, widebut);
    connect( mExpandButton, SIGNAL( clicked() ), SIGNAL( toggleExpand() ) );
-    mExpandButton->setFocusPolicy(NoFocus);
+    mExpandButton->setFocusPolicy(Qt::NoFocus);
    mAllDayAgenda = new KOAgenda(1,mAllDayFrame);
-    mAllDayAgenda->setFocusPolicy(NoFocus);
+    mAllDayAgenda->setFocusPolicy(Qt::NoFocus);
    QLabel *dummyAllDayRight = new QLabel (mAllDayFrame);
@@ -430,5 +442,5 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
    // Create agenda frame
-    QGridLayout *agendaLayout = new QGridLayout(agendaFrame,4,3);
+    Q3GridLayout *agendaLayout = new Q3GridLayout(agendaFrame,4,3);
    //  QHBox *agendaFrame = new QHBox(splitterAgenda);
@@ -438,8 +450,8 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
    mEventIndicatorTop->setPaintWidget( mSplitterAgenda );
 #endif
-    mDayLabelsFrame = new QHBox(agendaFrame);
+    mDayLabelsFrame = new Q3HBox(agendaFrame);
    //topLayout->addWidget(mDayLabelsFrame);
-    mDayLabels = new QFrame (mDayLabelsFrame);
+    mDayLabels = new Q3Frame (mDayLabelsFrame);
-    mLayoutDayLabels = new QHBoxLayout(mDayLabels);
+    mLayoutDayLabels = new Q3HBoxLayout(mDayLabels);
    agendaLayout->addMultiCellWidget(mDayLabelsFrame ,0,0,0,2);
    agendaLayout->addWidget(mEventIndicatorTop,1,1);
@@ -461,10 +473,10 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
    agendaLayout->addMultiCellWidget(mAgenda,2,2,1,2);
    agendaLayout->setColStretch(1,1);
-    mAgenda->setFocusPolicy(NoFocus);
+    mAgenda->setFocusPolicy(Qt::NoFocus);
    // Create event context menu for agenda
    mAllAgendaPopup = eventPopup();
  
 #if 0
-    mAllAgendaPopup->addAdditionalItem(QIconSet(SmallIcon("bell")),
+    mAllAgendaPopup->addAdditionalItem(QIcon(SmallIcon("bell")),
                                    i18n("Toggle Alarm"),mAgenda,
                                    SLOT(popupAlarm()),true);
@@ -919,7 +931,7 @@ int KOAgendaView::currentDateCount()
 }
-QPtrList<Incidence> KOAgendaView::selectedIncidences()
+Q3PtrList<Incidence> KOAgendaView::selectedIncidences()
 {
-    QPtrList<Incidence> selected;
+    Q3PtrList<Incidence> selected;
    Incidence *incidence;
@@ -988,6 +1000,6 @@ void KOAgendaView::updateConfig()
    // ToolTips displaying summary of events
-    KOAgendaItem::toolTipGroup()->setEnabled(KOPrefs::instance()
+    /* TODO:hacker: KOAgendaItem::toolTipGroup()->setEnabled(KOPrefs::instance()
-                                             ->mEnableToolTips);
+                                             ->mEnableToolTips); */
  
    //setHolidayMasks();
@@ -1118,5 +1130,5 @@ void KOAgendaView::showDates( const QDate &start, const QDate &end )
-void KOAgendaView::showEvents(QPtrList<Event>)
+void KOAgendaView::showEvents(Q3PtrList<Event>)
 {
    kdDebug() << "KOAgendaView::showEvents() is not yet implemented" << endl;
@@ -1166,9 +1178,9 @@ void KOAgendaView::fillAgenda()
    mMaxY.resize(mSelectedDates.count());
-    QPtrList<Event> dayEvents;
+    Q3PtrList<Event> dayEvents;
    // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue.
    // Therefore, gtodoset all of them.
-    QPtrList<Todo> todos  = calendar()->todos();
+    Q3PtrList<Todo> todos  = calendar()->todos();
    mAgenda->setDateList(mSelectedDates);
@@ -1301,5 +1313,5 @@ void KOAgendaView::fillAgenda()
            // Already completed items can be displayed on their original due date
            //if not KOPrefs::instance()->mShowTodoInAgenda, show overdue in agenda
-            bool overdue = (!todo->isCompleted()) && (todo->dtDue() < today) && KOPrefs::instance()->mShowTodoInAgenda;
+            bool overdue = (!todo->isCompleted()) && (todo->dtDue() < (QDateTime)today) && KOPrefs::instance()->mShowTodoInAgenda;
            bool fillIn = false;
            if ( todo->hasCompletedDate() && todo->completed().date() == currentDate )
@@ -1504,5 +1516,5 @@ void KOAgendaView::readSettings(KConfig *config)
    //#ifndef KORG_NOSPLITTER
-    QValueList<int> sizes = config->readIntListEntry("Separator AgendaView");
+    Q3ValueList<int> sizes = config->readIntListEntry("Separator AgendaView");
    if (sizes.count() == 2) {
        if ( sizes[0] < 20 ) {
@@ -1525,5 +1537,5 @@ void KOAgendaView::writeSettings(KConfig *config)
    //#ifndef KORG_NOSPLITTER
-    QValueList<int> list = mSplitterAgenda->sizes();
+    Q3ValueList<int> list = mSplitterAgenda->sizes();
    config->writeEntry("Separator AgendaView",list);
    //qDebug("write %d %d ", list[0],list[1] );
@@ -1542,5 +1554,5 @@ void KOAgendaView::setHolidayMasks()
        bool showHoliday = false;
        if ( KOPrefs::instance()->mExcludeHolidays ) {
-            QPtrList<Event> events = calendar()->events( date, true );
+            Q3PtrList<Event> events = calendar()->events( date, true );
            Event *event;
            for( event = events.first(); event; event = events.next() ) {
@@ -1664,5 +1676,5 @@ void  KOAgendaView::updateTodo( Todo * t, int )
    }
    else {
-        bool overdue = (!t->isCompleted()) && (t->dtDue() < QDate::currentDate()) && KOPrefs::instance()->mShowTodoInAgenda ;
+        bool overdue = (!t->isCompleted()) && (t->dtDue() < (QDateTime)QDate::currentDate()) && KOPrefs::instance()->mShowTodoInAgenda ;
        if ( overdue && 
             QDate::currentDate() >= mSelectedDates.first() &&
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h
index 5e68146..3b871d9 100644
--- a/korganizer/koagendaview.h
+++ b/korganizer/koagendaview.h
@@ -24,8 +24,9 @@
 #define KOAGENDAVIEW_H
-#include <qscrollview.h>
+#include <q3scrollview.h>
 #include <qdatetime.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
+#include <Q3BoxLayout>
 #ifndef DESKTOP_VERSION
 #include <qksplitter.h>
@@ -33,10 +34,19 @@
 #include <qsplitter.h>
 #endif
-#include <qmemarray.h>
+#include <q3memarray.h>
+//Added by qt3to4:
+#include <QPaintEvent>
+#include <QResizeEvent>
+#include <Q3Frame>
+#include <QPixmap>
+#include <QLabel>
+#include <QMouseEvent>
+#include <Q3PtrList>
+#include <QKeyEvent>
 #include "koeventview.h"
-class QHBox;
+class Q3HBox;
-class QFrame;
+class Q3Frame;
 class QLabel;
 class QPushButton;
@@ -56,5 +66,5 @@ class KOAgendaButton : public QPushButton
        mNum = -3;
        setFlat( true );
-        setFocusPolicy(NoFocus); 
+        setFocusPolicy(Qt::NoFocus); 
        setSizePolicy(QSizePolicy( QSizePolicy::Expanding ,QSizePolicy::Expanding ));
        connect( this, SIGNAL( clicked() ), this, SLOT ( bClicked() ) );
@@ -71,8 +81,8 @@ private:
 };
-class TimeLabels : public QScrollView {
+class TimeLabels : public Q3ScrollView {
    Q_OBJECT
  public:
-    TimeLabels(int rows,QWidget *parent=0,const char *name=0,WFlags f=0);
+    TimeLabels(int rows,QWidget *parent=0,const char *name=0,Qt::WFlags f=0);
    void setCellHeight(int height);
@@ -114,5 +124,5 @@ class TimeLabels : public QScrollView {
 };
-class EventIndicator : public QFrame {
+class EventIndicator : public Q3Frame {
    Q_OBJECT
  public:
@@ -133,9 +143,9 @@ class EventIndicator : public QFrame {
    KDGanttMinimizeSplitter* mPaintWidget;
    int mColumns;
-    QHBox *mTopBox;
+    Q3HBox *mTopBox;
-    QBoxLayout *mTopLayout;
+    Q3BoxLayout *mTopLayout;
    Location mLocation;
    QPixmap mPixmap;
-    QMemArray<bool> mEnabled;
+    Q3MemArray<bool> mEnabled;
 };
@@ -160,5 +170,5 @@ class KOAgendaView : public KOEventView {
    /** returns the currently selected events */
-    virtual QPtrList<Incidence> selectedIncidences();
+    virtual Q3PtrList<Incidence> selectedIncidences();
    
    /** returns the currently selected events */
@@ -186,5 +196,5 @@ class KOAgendaView : 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 updateTodo( Todo *, int );
@@ -261,8 +271,8 @@ class KOAgendaView : public KOEventView {
    QDateTime mIdleStart;
    // view widgets
-    QFrame *mDayLabels;
+    Q3Frame *mDayLabels;
-    QHBox *mDayLabelsFrame;
+    Q3HBox *mDayLabelsFrame;
-    QBoxLayout *mLayoutDayLabels;
+    Q3BoxLayout *mLayoutDayLabels;
-    QFrame *mAllDayFrame;
+    Q3Frame *mAllDayFrame;
    KOAgenda *mAllDayAgenda;
    KOAgenda *mAgenda;
@@ -285,10 +295,10 @@ class KOAgendaView : public KOEventView {
    EventIndicator *mEventIndicatorBottom;
-    QMemArray<int> mMinY;
+    Q3MemArray<int> mMinY;
-    QMemArray<int> mMaxY;
+    Q3MemArray<int> mMaxY;
-    QMemArray<bool> mHolidayMask;
+    Q3MemArray<bool> mHolidayMask;
    
-    QPtrList<KOAgendaButton> mDayLabelsList;
+    Q3PtrList<KOAgendaButton> mDayLabelsList;
    QDateTime mTimeSpanBegin;
    QDateTime mTimeSpanEnd;
diff --git a/korganizer/kocounterdialog.h b/korganizer/kocounterdialog.h
index c8dcf45..493d9e1 100644
--- a/korganizer/kocounterdialog.h
+++ b/korganizer/kocounterdialog.h
@@ -23,5 +23,5 @@
 //
-#include <qtextview.h>
+#include <q3textview.h>
 #include <kdialogbase.h>
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 52fd1e8..4f681b3 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -25,7 +25,16 @@
 #include <qevent.h>
 #include <qpainter.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qtimer.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
+//Added by qt3to4:
+#include <QDragLeaveEvent>
+#include <Q3Frame>
+#include <QDragEnterEvent>
+#include <QDragMoveEvent>
+#include <QDropEvent>
+#include <QResizeEvent>
+#include <QMouseEvent>
+#include <QPaintEvent>
 #include <kglobal.h>
@@ -55,13 +64,13 @@
 DynamicTip::DynamicTip( QWidget * parent )
-    : QToolTip( parent )
+    /* TODO:hacker: : QToolTip( parent ) */
 {
    matrix = (KODayMatrix*)parent;
 }
-class KODaymatrixWhatsThis :public QWhatsThis
+class KODaymatrixWhatsThis :public Q3WhatsThis
 {
 public:
-    KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { ;};
+    KODaymatrixWhatsThis( KODayMatrix* view ) : Q3WhatsThis( view ),_view (view) { ;};
    ~KODaymatrixWhatsThis() { ;  };
@@ -92,5 +101,5 @@ void DynamicTip::maybeTip( const QPoint &pos )
  QString str = matrix->getHolidayLabel(col+row*7);
  if (str.isEmpty()) return;
-  tip(rct, str);
+  /* TODO:hacker: tip(rct, str);*/
 }
@@ -104,5 +113,5 @@ const int KODayMatrix::NUMDAYS = 42;
 KODayMatrix::KODayMatrix( QWidget *parent, const char *name )
-    : QFrame( parent, name , Qt::WRepaintNoErase ), mCalendar( 0 )
+    : Q3Frame( parent, name , Qt::WNoAutoErase ), mCalendar( 0 )
@@ -152,5 +161,5 @@ QString KODayMatrix::getWhatsThisText( QPoint p )
        return QString();
    QDate mDate = days[tmp];
-    QPtrList<Event> eventlist = mCalendar->events(mDate);
+    Q3PtrList<Event> eventlist = mCalendar->events(mDate);
    Event *event;
    QStringList mToolTip;
@@ -206,5 +215,5 @@ QString KODayMatrix::getWhatsThisText( QPoint p )
    mToolTip.sort();
    if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) {
-        QPtrList<Todo> todolist = mCalendar->todos(mDate);
+        Q3PtrList<Todo> todolist = mCalendar->todos(mDate);
        Todo  *todo;
        for(todo=todolist.first();todo != 0;todo=todolist.next()) { 
@@ -221,5 +230,5 @@ QString KODayMatrix::getWhatsThisText( QPoint p )
    }
    if (KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) {
-        QPtrList<Journal> j_list = mCalendar->journals4Date( mDate );
+        Q3PtrList<Journal> j_list = mCalendar->journals4Date( mDate );
        Journal *j = j_list.first();
        while ( j ) {
@@ -442,5 +451,5 @@ void KODayMatrix::updateViewTimed()
 int i;
    int timeSpan = NUMDAYS-1;
-    QPtrList<Event> events = mCalendar->events();
+    Q3PtrList<Event> events = mCalendar->events();
    Event *event;
    QDateTime dt;
@@ -527,5 +536,5 @@ void KODayMatrix::updateViewTimed()
        bDays.fill( false);
        // insert due todos
-        QPtrList<Todo> todos = mCalendar->todos( );
+        Q3PtrList<Todo> todos = mCalendar->todos( );
        Todo *todo;
        for(todo = todos.first(); todo; todo = todos.next()) {
@@ -552,5 +561,5 @@ void KODayMatrix::updateViewTimed()
        bDays.fill( false);
        // insert due todos
-        QPtrList<Journal> todos = mCalendar->journals( );
+        Q3PtrList<Journal> todos = mCalendar->journals( );
        Journal *todo;
        for(todo = todos.first(); todo; todo = todos.next()) {
@@ -576,5 +585,5 @@ void KODayMatrix::updateViewTimed()
    for(int i = 0; i < NUMDAYS; i++) {
        // if events are set for the day then remember to draw it bold
-        QPtrList<Event> eventlist = mCalendar->events(days[i]);
+        Q3PtrList<Event> eventlist = mCalendar->events(days[i]);
        Event *event;
        int numEvents = eventlist.count();
@@ -676,5 +685,5 @@ void KODayMatrix::updateEvents()
  for( int i = 0; i < NUMDAYS; i++ ) {
    // if events are set for the day then remember to draw it bold
-    QPtrList<Event>  eventlist = mCalendar->events( days[ i ] );
+    Q3PtrList<Event>  eventlist = mCalendar->events( days[ i ] );
    int numEvents = eventlist.count();
    Event *event;
@@ -740,5 +749,5 @@ void KODayMatrix::mousePressEvent (QMouseEvent* e)
 {
  
-    if ( e->button() == LeftButton )
+    if ( e->button() == Qt::LeftButton )
        mouseDown = true; 
  mSelStart = getDayIndexFrom(e->x(), e->y());
@@ -753,5 +762,5 @@ void KODayMatrix::mouseReleaseEvent (QMouseEvent* e)
 {
  mRedrawNeeded = true;
-  if ( e->button() == LeftButton )
+  if ( e->button() == Qt::LeftButton )
      if ( ! mouseDown ) {
          return;
@@ -1196,5 +1205,5 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
    }
    
-    bitBlt (this, pevent->rect().topLeft(), &myPix , pevent->rect() ,CopyROP);
+    bitBlt (this, pevent->rect().topLeft(), &myPix , pevent->rect() ,QPainter::CompositionMode_Source);
    mRedrawNeeded = false;
 }
@@ -1209,5 +1218,5 @@ void KODayMatrix::resizeEvent(QResizeEvent * e)
  daysize.setHeight(sz.height()*7 / NUMDAYS);
  daysize.setWidth(sz.width() / 7);
-  QFrame::resizeEvent( e );
+  Q3Frame::resizeEvent( e );
 }
diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h
index b96e08f..6edf7cd 100644
--- a/korganizer/kodaymatrix.h
+++ b/korganizer/kodaymatrix.h
@@ -27,5 +27,5 @@
 #include <qstring.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qcolor.h>
 #include <qpen.h>
@@ -35,4 +35,12 @@
 #include <qbitarray.h>
 #include <qmap.h>
+//Added by qt3to4:
+#include <QDragMoveEvent>
+#include <QDropEvent>
+#include <QDragLeaveEvent>
+#include <QPaintEvent>
+#include <QResizeEvent>
+#include <QMouseEvent>
+#include <QDragEnterEvent>
 class QDragEnterEvent;
@@ -52,5 +60,5 @@ using namespace KCal;
 *  is in our special case the name of the holiday or null if this day is no holiday.
 */
-class DynamicTip : public QToolTip
+class DynamicTip /* TODO:hacker: : public QToolTip */
 {
 public:
@@ -104,5 +112,5 @@ private:
 *  @author Eitzenberger Thomas
 */
-class KODayMatrix: public QFrame {
+class KODayMatrix: public Q3Frame {
    Q_OBJECT
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp
index ea30fac..deb1e46 100644
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@@ -42,4 +42,6 @@
 #include "kodialogmanager.h"
 #include <kapplication.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 KODialogManager::KODialogManager( CalendarView *mainView ) :
@@ -189,6 +191,6 @@ void KODialogManager::showSearchDialog()
        connect(lview, SIGNAL(moveIncidenceSignal(Incidence *)),
                mMainView, SLOT(moveIncidence(Incidence *)));
-        connect(lview, SIGNAL(beamIncidenceList(QPtrList<Incidence> )),
+        connect(lview, SIGNAL(beamIncidenceList(Q3PtrList<Incidence> )),
-                mMainView, SLOT(beamIncidenceList(QPtrList<Incidence> )));
+                mMainView, SLOT(beamIncidenceList(Q3PtrList<Incidence> )));
        connect(mMainView, SIGNAL(configChanged()), mSearchDialog, SLOT(updateConfig()));
@@ -247,5 +249,5 @@ void KODialogManager::showArchiveDialog()
 }
-void KODialogManager::showFilterEditDialog(QPtrList<CalFilter> *filters)
+void KODialogManager::showFilterEditDialog(Q3PtrList<CalFilter> *filters)
 {
  if (!mFilterEditDialog) {
diff --git a/korganizer/kodialogmanager.h b/korganizer/kodialogmanager.h
index b68ddc2..00ad1df 100644
--- a/korganizer/kodialogmanager.h
+++ b/korganizer/kodialogmanager.h
@@ -26,5 +26,5 @@
 #include <qobject.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <libkcal/calfilter.h>
@@ -79,5 +79,5 @@ class KODialogManager : public QObject
    void showSearchDialog();
    void showArchiveDialog();
-    void showFilterEditDialog(QPtrList<CalFilter> *filters);
+    void showFilterEditDialog(Q3PtrList<CalFilter> *filters);
    void showPluginDialog();
    void hideSearchDialog();
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index 9a4b4ec..a01c838 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -23,12 +23,18 @@
 #include <qtooltip.h>
-#include <qfiledialog.h>
+#include <q3filedialog.h>
 #include <qlayout.h>
-#include <qvbox.h>
+#include <q3vbox.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
-#include <qvgroupbox.h>
+#include <q3vgroupbox.h>
-#include <qwidgetstack.h>
+#include <q3widgetstack.h>
 #include <qdatetime.h>
-#include <qapp.h>
+#include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <QLabel>
+#include <Q3PtrList>
+#include <Q3VBoxLayout>
 #include <klocale.h>
@@ -81,5 +87,5 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
  : QWidget( parent, name), mDisableItemUpdate( false )
 {
-  QGridLayout *topLayout = new QGridLayout(this);
+  Q3GridLayout *topLayout = new Q3GridLayout(this);
  topLayout->setSpacing(spacing);
  topLayout->setMargin(KDialog::marginHint()-2);
@@ -102,9 +108,9 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
  mListView->setAllColumnsShowFocus (true );
  //mListView->setSingleClick( true );
-  connect(mListView,SIGNAL(selectionChanged(QListViewItem *)),
+  connect(mListView,SIGNAL(selectionChanged(Q3ListViewItem *)),
          SLOT(updateAttendeeInput()));
-  connect(mListView,SIGNAL(executed(QListViewItem * ,const QPoint&, int )),
+  connect(mListView,SIGNAL(executed(Q3ListViewItem * ,const QPoint&, int )),
-          SLOT(itemClicked(QListViewItem * ,const QPoint& , int )));
+          SLOT(itemClicked(Q3ListViewItem * ,const QPoint& , int )));
  mRsvpButton = new QCheckBox(this);
@@ -141,5 +147,5 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
  connect(mRsvpButton,SIGNAL(clicked()),SLOT(updateAttendeeItem()));
  QWidget *buttonBox = new QWidget(this);
-  QVBoxLayout *buttonLayout = new QVBoxLayout(buttonBox);
+  Q3VBoxLayout *buttonLayout = new Q3VBoxLayout(buttonBox);
  QPushButton *newButton = new QPushButton(i18n("&New"),buttonBox);
@@ -366,5 +372,5 @@ void KOEditorDetails::readEvent(Incidence *event)
    //mListView->clear();
    //mdelAttendees.clear();
-  QPtrList<Attendee> tmpAList = event->attendees();
+  Q3PtrList<Attendee> tmpAList = event->attendees();
  Attendee *a;
  for (a = tmpAList.first(); a; a = tmpAList.next())
@@ -378,5 +384,5 @@ void KOEditorDetails::writeEvent(Incidence *event)
 {
  event->clearAttendees();
-  QListViewItem *item;
+  Q3ListViewItem *item;
  AttendeeListItem *a;
  for (item = mListView->firstChild(); item;
@@ -405,5 +411,5 @@ bool KOEditorDetails::validateInput()
 void KOEditorDetails::updateAttendeeInput()
 {
-  QListViewItem *item = mListView->selectedItem();
+  Q3ListViewItem *item = mListView->selectedItem();
  AttendeeListItem *aItem = static_cast<AttendeeListItem *>( item );
  if (aItem) {
@@ -452,5 +458,5 @@ void KOEditorDetails::setEnabledAttendeeInput( bool enabled )
 }
-void KOEditorDetails::itemClicked(QListViewItem * item ,const QPoint & pnt, int c )
+void KOEditorDetails::itemClicked(Q3ListViewItem * item ,const QPoint & pnt, int c )
 {
    if ( item  && c == 4 ) {
@@ -463,5 +469,5 @@ void KOEditorDetails::updateAttendeeItem()
  if (mDisableItemUpdate) return;
-  QListViewItem *item = mListView->selectedItem();
+  Q3ListViewItem *item = mListView->selectedItem();
  AttendeeListItem *aItem = static_cast<AttendeeListItem *>( item );
  if ( !aItem ) return;
diff --git a/korganizer/koeditordetails.h b/korganizer/koeditordetails.h
index 5f8f6f2..40e896c 100644
--- a/korganizer/koeditordetails.h
+++ b/korganizer/koeditordetails.h
@@ -25,15 +25,15 @@
 #include <qmap.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlabel.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qlineedit.h>
 #include <qcombobox.h>
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
 #include <klistview.h>
 #include <qradiobutton.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <kapplication.h>
@@ -84,5 +84,5 @@ class KOEditorDetails : public QWidget
    void clearAttendeeInput();
    void fillAttendeeInput(AttendeeListItem *);
-    void itemClicked(QListViewItem *,const QPoint & pnt, int c);
+    void itemClicked(Q3ListViewItem *,const QPoint & pnt, int c);
    void updateAttendeeItem();
    void setEnabledAttendeeInput(bool);
@@ -104,5 +104,5 @@ class KOEditorDetails : public QWidget
    QPushButton* mAddressBookButton;
-    QPtrList<Attendee> mdelAttendees;
+    Q3PtrList<Attendee> mdelAttendees;
 };
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index 21f220c..8105432 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -25,13 +25,20 @@
 #include <qtooltip.h>
 #include <qlayout.h>
-#include <qvbox.h>
+#include <q3vbox.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
-#include <qvgroupbox.h>
+#include <q3vgroupbox.h>
-#include <qwidgetstack.h>
+#include <q3widgetstack.h>
 #include <qdatetime.h>
 #include <qtimer.h>
 #include <qfile.h>
 #include <qregexp.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <QLabel>
+#include <Q3GridLayout>
+#include <Q3PtrList>
+#include <Q3PopupMenu>
+#include <QDesktopWidget>
 #include <kglobal.h>
@@ -70,7 +77,7 @@ KOEditorGeneral::~KOEditorGeneral()
 }
-void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout)
+void KOEditorGeneral::initHeader(QWidget *parent,Q3BoxLayout *topLayout)
 {
-    QGridLayout *headerLayout = new QGridLayout(topLayout);
+    Q3GridLayout *headerLayout = new Q3GridLayout(topLayout);
 #if 0
@@ -196,8 +203,8 @@ void KOEditorGeneral::selectedCatPopup( int index )
 }
-void KOEditorGeneral::initCategories(QWidget *parent, QBoxLayout *topLayout)
+void KOEditorGeneral::initCategories(QWidget *parent, Q3BoxLayout *topLayout)
 {
-    QBoxLayout *categoriesLayout = new QHBoxLayout( topLayout );
+    Q3BoxLayout *categoriesLayout = new Q3HBoxLayout( topLayout );
-    mCatPopup = new QPopupMenu ( parent );
+    mCatPopup = new Q3PopupMenu ( parent );
    mCatPopup->setCheckable (true);
    connect(mCatPopup,SIGNAL(aboutToShow ()  ), this ,SLOT(showCatPopup()));
@@ -215,7 +222,7 @@ void KOEditorGeneral::initCategories(QWidget *parent, QBoxLayout *topLayout)
 }
-void KOEditorGeneral::initSecrecy(QWidget *parent, QBoxLayout *topLayout)
+void KOEditorGeneral::initSecrecy(QWidget *parent, Q3BoxLayout *topLayout)
 {
-    QBoxLayout *secrecyLayout = new QHBoxLayout( topLayout );
+    Q3BoxLayout *secrecyLayout = new Q3HBoxLayout( topLayout );
    QLabel *secrecyLabel = new QLabel(i18n("Access:"),parent);
@@ -229,5 +236,5 @@ void KOEditorGeneral::initSecrecy(QWidget *parent, QBoxLayout *topLayout)
 }
-void KOEditorGeneral::initDescription(QWidget *parent,QBoxLayout *topLayout)
+void KOEditorGeneral::initDescription(QWidget *parent,Q3BoxLayout *topLayout)
 {
    mDescriptionEdit = new KTextEdit(parent);
@@ -244,7 +251,7 @@ void KOEditorGeneral::initDescription(QWidget *parent,QBoxLayout *topLayout)
 }
-void KOEditorGeneral::initAlarm(QWidget *parent,QBoxLayout *topLayout)
+void KOEditorGeneral::initAlarm(QWidget *parent,Q3BoxLayout *topLayout)
 {
-    QBoxLayout *alarmLayout = new QHBoxLayout(topLayout);
+    Q3BoxLayout *alarmLayout = new Q3HBoxLayout(topLayout);
    //mAlarmBell = new QLabel(parent);
@@ -529,5 +536,5 @@ void KOEditorGeneral::readIncidence(Incidence *event)
    // set up alarm stuff
-    QPtrList<Alarm> alarms = event->alarms();
+    Q3PtrList<Alarm> alarms = event->alarms();
    Alarm* alarm;
    mAlarmIncrCombo->setCurrentItem(0);
@@ -591,5 +598,5 @@ void KOEditorGeneral::writeIncidence(Incidence *event)
        if (event->alarms().count() == 0) 
            event->newAlarm();
-        QPtrList<Alarm> alarms = event->alarms();
+        Q3PtrList<Alarm> alarms = event->alarms();
        Alarm *alarm;
        for (alarm = alarms.first(); alarm; alarm = alarms.next() ) {
diff --git a/korganizer/koeditorgeneral.h b/korganizer/koeditorgeneral.h
index b10a5d4..45f26fd 100644
--- a/korganizer/koeditorgeneral.h
+++ b/korganizer/koeditorgeneral.h
@@ -24,17 +24,18 @@
 #define KOEDITORGENERAL_H
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlabel.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qlineedit.h>
 #include <qcombobox.h>
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qradiobutton.h>
 #include <qlayout.h>
 #include <qspinbox.h>
 #include <qcombobox.h>
+#include <Q3BoxLayout>
 #include <ktextedit.h>
@@ -56,9 +57,9 @@ class KOEditorGeneral : public QObject
    virtual ~KOEditorGeneral();
    void setFocusOn( int i );
-    void initHeader(QWidget *,QBoxLayout *);
+    void initHeader(QWidget *,Q3BoxLayout *);
-    void initDescription(QWidget *,QBoxLayout *);
+    void initDescription(QWidget *,Q3BoxLayout *);
-    void initSecrecy(QWidget *,QBoxLayout *);
+    void initSecrecy(QWidget *,Q3BoxLayout *);
-    void initCategories(QWidget *,QBoxLayout *);    
+    void initCategories(QWidget *,Q3BoxLayout *);    
-    void initAlarm(QWidget *,QBoxLayout *);
+    void initAlarm(QWidget *,Q3BoxLayout *);
    /** Set widgets to default values */
@@ -116,5 +117,5 @@ class KOEditorGeneral : public QObject
     
  private:
-    QPopupMenu * mCatPopup;
+    Q3PopupMenu * mCatPopup;
    QString getFittingPath( const QString &) ;
    QString mAlarmSound;
diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp
index 2c6ed9f..73a4139 100644
--- a/korganizer/koeditorgeneralevent.cpp
+++ b/korganizer/koeditorgeneralevent.cpp
@@ -24,9 +24,15 @@
 #include <qtooltip.h>
 #include <qlayout.h>
-#include <qvbox.h>
+#include <q3vbox.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
-#include <qvgroupbox.h>
+#include <q3vgroupbox.h>
-#include <qwidgetstack.h>
+#include <q3widgetstack.h>
 #include <qdatetime.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3GridLayout>
+#include <Q3Frame>
+#include <QLabel>
+#include <Q3VBoxLayout>
 #include <kdebug.h>
@@ -85,9 +91,9 @@ void KOEditorGeneralEvent::finishSetup()
 }
-void KOEditorGeneralEvent::initTime(QWidget *parent,QBoxLayout *topLayout)
+void KOEditorGeneralEvent::initTime(QWidget *parent,Q3BoxLayout *topLayout)
 {
-  QBoxLayout *timeLayout = new QVBoxLayout(topLayout);
+  Q3BoxLayout *timeLayout = new Q3VBoxLayout(topLayout);
-  QGroupBox *timeGroupBox = new QGroupBox(1,QGroupBox::Horizontal,
+  Q3GroupBox *timeGroupBox = new Q3GroupBox(1,Qt::Horizontal,
                                          i18n("Date && Time"),parent);
  timeLayout->addWidget(timeGroupBox);
@@ -95,7 +101,7 @@ void KOEditorGeneralEvent::initTime(QWidget *parent,QBoxLayout *topLayout)
  timeGroupBox->layout()->setSpacing( KDialog::spacingHintSmall() ); 
  timeGroupBox->layout()->setMargin( KDialog::marginHint() ); 
-  QFrame *timeBoxFrame = new QFrame(timeGroupBox);
+  Q3Frame *timeBoxFrame = new Q3Frame(timeGroupBox);
-  QGridLayout *layoutTimeBox = new QGridLayout(timeBoxFrame,2,3);
+  Q3GridLayout *layoutTimeBox = new Q3GridLayout(timeBoxFrame,2,3);
  layoutTimeBox->setSpacing(topLayout->spacing());
@@ -119,5 +125,5 @@ void KOEditorGeneralEvent::initTime(QWidget *parent,QBoxLayout *topLayout)
  layoutTimeBox->addWidget(mEndTimeEdit,1,2);
  QWidget* duration = new QWidget( timeBoxFrame );
-  QHBoxLayout *flagsBox = new QHBoxLayout( duration );
+  Q3HBoxLayout *flagsBox = new Q3HBoxLayout( duration );
  mNoTimeButton = new QCheckBox(i18n("All day event"),duration);
  flagsBox->addWidget(mNoTimeButton);
@@ -130,5 +136,5 @@ void KOEditorGeneralEvent::initTime(QWidget *parent,QBoxLayout *topLayout)
    //}
    flagsBox->setStretchFactor(mDurationLabel, 10 );
-    mDurationLabel->setAlignment( AlignRight | AlignVCenter);
+    mDurationLabel->setAlignment( Qt::AlignRight | Qt::AlignVCenter);
  layoutTimeBox->addMultiCellWidget( duration, 2, 2, 0, 3 );
@@ -148,7 +154,7 @@ void KOEditorGeneralEvent::initTime(QWidget *parent,QBoxLayout *topLayout)
 }
-void KOEditorGeneralEvent::initClass(QWidget *parent,QBoxLayout *topLayout)
+void KOEditorGeneralEvent::initClass(QWidget *parent,Q3BoxLayout *topLayout)
 {
-  QBoxLayout *classLayout = new QHBoxLayout(topLayout);
+  Q3BoxLayout *classLayout = new Q3HBoxLayout(topLayout);
  QLabel *freeTimeLabel = new QLabel(i18n("Show time as:"),parent);
diff --git a/korganizer/koeditorgeneralevent.h b/korganizer/koeditorgeneralevent.h
index d798905..5d97a5c 100644
--- a/korganizer/koeditorgeneralevent.h
+++ b/korganizer/koeditorgeneralevent.h
@@ -24,13 +24,13 @@
 #define _KOEDITORGENERALEVENT_H
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlabel.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qlineedit.h>
 #include <qcombobox.h>
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qradiobutton.h>
@@ -52,6 +52,6 @@ class KOEditorGeneralEvent : public KOEditorGeneral
    virtual ~KOEditorGeneralEvent();
-    void initTime(QWidget *,QBoxLayout *);
+    void initTime(QWidget *,Q3BoxLayout *);
-    void initClass(QWidget *,QBoxLayout *);
+    void initClass(QWidget *,Q3BoxLayout *);
    void finishSetup();
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index d32d5a5..baee9fc 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -23,12 +23,19 @@
 #include <qtooltip.h>
-#include <qfiledialog.h>
+#include <q3filedialog.h>
 #include <qlayout.h>
-#include <qvbox.h>
+#include <q3vbox.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
-#include <qvgroupbox.h>
+#include <q3vgroupbox.h>
-#include <qwidgetstack.h>
+#include <q3widgetstack.h>
 #include <qdatetime.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3GridLayout>
+#include <Q3Frame>
+#include <QLabel>
+#include <Q3VBoxLayout>
 #include <kglobal.h>
@@ -83,16 +90,16 @@ void KOEditorGeneralTodo::finishSetup()
 }
-void KOEditorGeneralTodo::initTime(QWidget *parent,QBoxLayout *topLayout)
+void KOEditorGeneralTodo::initTime(QWidget *parent,Q3BoxLayout *topLayout)
 {
-  QBoxLayout *timeLayout = new QVBoxLayout(topLayout);
+  Q3BoxLayout *timeLayout = new Q3VBoxLayout(topLayout);
-  QGroupBox *timeGroupBox = new QGroupBox(1,QGroupBox::Horizontal,
+  Q3GroupBox *timeGroupBox = new Q3GroupBox(1,Qt::Horizontal,
                                          i18n("Date && Time"),parent);
  timeLayout->addWidget(timeGroupBox);
  timeGroupBox->layout()->setSpacing( KDialog::spacingHint()-2 ); 
  timeGroupBox->layout()->setMargin(  KDialog::marginHint() ); 
-  QFrame *timeBoxFrame = new QFrame(timeGroupBox);
+  Q3Frame *timeBoxFrame = new Q3Frame(timeGroupBox);
-  QGridLayout *layoutTimeBox = new QGridLayout(timeBoxFrame,3,3);
+  Q3GridLayout *layoutTimeBox = new Q3GridLayout(timeBoxFrame,3,3);
  layoutTimeBox->setSpacing(KDialog::spacingHintSmall());
  layoutTimeBox->setColStretch( 1, 1 );
@@ -134,5 +141,5 @@ void KOEditorGeneralTodo::initTime(QWidget *parent,QBoxLayout *topLayout)
-void KOEditorGeneralTodo::initCompletion(QWidget *parent, QBoxLayout *topLayout)
+void KOEditorGeneralTodo::initCompletion(QWidget *parent, Q3BoxLayout *topLayout)
 {
  mCompletedCombo = new QComboBox(parent);
@@ -174,8 +181,8 @@ void KOEditorGeneralTodo::initCompletion(QWidget *parent, QBoxLayout *topLayout)
 }
-void KOEditorGeneralTodo::initPriority(QWidget *parent, QBoxLayout *topLayout)
+void KOEditorGeneralTodo::initPriority(QWidget *parent, Q3BoxLayout *topLayout)
 {
-    QHBox* h = new QHBox ( parent );
+    Q3HBox* h = new Q3HBox ( parent );
    topLayout->addWidget( h );
  QLabel *priorityLabel = new QLabel(i18n("Priority:"), h);
@@ -190,7 +197,7 @@ void KOEditorGeneralTodo::initPriority(QWidget *parent, QBoxLayout *topLayout)
 }
-void KOEditorGeneralTodo::initStatus(QWidget *parent,QBoxLayout *topLayout)
+void KOEditorGeneralTodo::initStatus(QWidget *parent,Q3BoxLayout *topLayout)
 {
-  QBoxLayout *statusLayout = new QHBoxLayout(topLayout);
+  Q3BoxLayout *statusLayout = new Q3HBoxLayout(topLayout);
  initCompletion( parent, statusLayout );
@@ -397,5 +404,5 @@ void KOEditorGeneralTodo::startDateChanged(QDate newdate)
 {
    if ( mDueCheck->isChecked() )
-        emit dateTimesChanged(newdate,mDueDateEdit->date());
+        emit dateTimesChanged((QDateTime)newdate,(QDateTime)mDueDateEdit->date());
 }
 void KOEditorGeneralTodo::enableTimeEdits(bool enable)
diff --git a/korganizer/koeditorgeneraltodo.h b/korganizer/koeditorgeneraltodo.h
index 2e56a7a..2e97ff5 100644
--- a/korganizer/koeditorgeneraltodo.h
+++ b/korganizer/koeditorgeneraltodo.h
@@ -24,13 +24,13 @@
 #define _KOEDITORGENERALTODO_H
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlabel.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qlineedit.h>
 #include <qcombobox.h>
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qradiobutton.h>
@@ -51,8 +51,8 @@ class KOEditorGeneralTodo : public KOEditorGeneral
    virtual ~KOEditorGeneralTodo();
-    void initTime(QWidget *, QBoxLayout *);
+    void initTime(QWidget *, Q3BoxLayout *);
-    void initStatus(QWidget *, QBoxLayout *);
+    void initStatus(QWidget *, Q3BoxLayout *);
-    void initCompletion(QWidget *, QBoxLayout *);
+    void initCompletion(QWidget *, Q3BoxLayout *);
-    void initPriority(QWidget *, QBoxLayout *);
+    void initPriority(QWidget *, Q3BoxLayout *);
    void finishSetup();
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index e0380c4..e0ae3a0 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -23,15 +23,23 @@
 #include <qtooltip.h>
-#include <qfiledialog.h>
+#include <q3filedialog.h>
 #include <qlayout.h>
-#include <qvbox.h>
+#include <q3vbox.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
-#include <qvgroupbox.h>
+#include <q3vgroupbox.h>
-#include <qwidgetstack.h>
+#include <q3widgetstack.h>
 #include <qdatetime.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qspinbox.h>
 #include <qcheckbox.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <QLabel>
+#include <Q3GridLayout>
+#include <Q3PtrList>
+#include <Q3Frame>
+#include <Q3VBoxLayout>
 #include <kdialog.h>
@@ -82,5 +90,5 @@ RecurDaily::RecurDaily( QWidget *parent, const char *name ) :
  RecurBase( parent, name )
 {
-  QBoxLayout *topLayout = new QHBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3HBoxLayout( this );
  topLayout->setSpacing( KDialog::spacingHint() );
  topLayout->setMargin( KDialog::marginHintSmall() );
@@ -101,5 +109,5 @@ RecurWeekly::RecurWeekly( QWidget *parent, const char *name ) :
  RecurBase( parent, name )
 {
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
  topLayout->setSpacing( KDialog::spacingHint() );
  topLayout->setMargin( KDialog::marginHintSmall() );
@@ -107,5 +115,5 @@ RecurWeekly::RecurWeekly( QWidget *parent, const char *name ) :
  //topLayout->addStretch( 1 );
-  QBoxLayout *weeksLayout = new QHBoxLayout( topLayout );
+  Q3BoxLayout *weeksLayout = new Q3HBoxLayout( topLayout );
  QLabel *preLabel = new QLabel( i18n("Recur every"), this );
@@ -117,6 +125,6 @@ RecurWeekly::RecurWeekly( QWidget *parent, const char *name ) :
  weeksLayout->addWidget( postLabel );
-  QHBox *dayBox = new QHBox( this );
+  Q3HBox *dayBox = new Q3HBox( this );
-  topLayout->addWidget( dayBox, 1, AlignVCenter );
+  topLayout->addWidget( dayBox, 1, Qt::AlignVCenter );
  // TODO: Respect start of week setting
  for ( int i = 0; i < 7; ++i ) {
@@ -157,10 +165,10 @@ RecurMonthly::RecurMonthly( QWidget *parent, const char *name ) :
  RecurBase( parent, name )
 {
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
  topLayout->setSpacing( KDialog::spacingHint() );
  topLayout->setMargin( KDialog::marginHintSmall() );
-  QBoxLayout *freqLayout = new QHBoxLayout( topLayout );
+  Q3BoxLayout *freqLayout = new Q3HBoxLayout( topLayout );
  QLabel *preLabel = new QLabel( i18n("every"), this );
@@ -173,9 +181,9 @@ RecurMonthly::RecurMonthly( QWidget *parent, const char *name ) :
-  QButtonGroup *buttonGroup = new QButtonGroup( this );
+  Q3ButtonGroup *buttonGroup = new Q3ButtonGroup( this );
-  buttonGroup->setFrameStyle( QFrame::NoFrame );
+  buttonGroup->setFrameStyle( Q3Frame::NoFrame );
-  topLayout->addWidget( buttonGroup, 1, AlignVCenter );
+  topLayout->addWidget( buttonGroup, 1, Qt::AlignVCenter );
-  QGridLayout *buttonLayout = new QGridLayout( buttonGroup, 3, 2 );
+  Q3GridLayout *buttonLayout = new Q3GridLayout( buttonGroup, 3, 2 );
  buttonLayout->setSpacing( KDialog::spacingHint() );
  buttonLayout->setMargin( KDialog::marginHintSmall() );
@@ -190,5 +198,5 @@ RecurMonthly::RecurMonthly( QWidget *parent, const char *name ) :
  buttonLayout->addWidget( mByDayRadio, 0, 0 );
-  mByDayCombo = new QComboBox( buttonGroup );
+  mByDayCombo = new Q3ComboBox( buttonGroup );
  mByDayCombo->setSizeLimit( 7 );
  mByDayCombo->insertItem( i18n("1st") );
@@ -294,10 +302,10 @@ RecurYearly::RecurYearly( QWidget *parent, const char *name ) :
  RecurBase( parent, name )
 {
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
  topLayout->setSpacing( KDialog::spacingHint() );
  topLayout->setMargin( KDialog::marginHintSmall() );
-  QBoxLayout *freqLayout = new QHBoxLayout( topLayout );
+  Q3BoxLayout *freqLayout = new Q3HBoxLayout( topLayout );
  QLabel *preLabel = new QLabel( i18n("every"), this );
@@ -310,9 +318,9 @@ RecurYearly::RecurYearly( QWidget *parent, const char *name ) :
-  QButtonGroup *buttonGroup = new QButtonGroup( this );
+  Q3ButtonGroup *buttonGroup = new Q3ButtonGroup( this );
-  buttonGroup->setFrameStyle( QFrame::NoFrame );
+  buttonGroup->setFrameStyle( Q3Frame::NoFrame );
-  topLayout->addWidget( buttonGroup, 1, AlignVCenter );
+  topLayout->addWidget( buttonGroup, 1, Qt::AlignVCenter );
-  QGridLayout *buttonLayout = new QGridLayout( buttonGroup, 2, 3 );
+  Q3GridLayout *buttonLayout = new Q3GridLayout( buttonGroup, 2, 3 );
  mByMonthRadio = new QRadioButton( i18n("On day "), buttonGroup);
@@ -321,5 +329,5 @@ RecurYearly::RecurYearly( QWidget *parent, const char *name ) :
 
  buttonLayout->addWidget( mByDayLabel, 0, 1 ); 
-  mByMonthCombo = new QComboBox( buttonGroup );
+  mByMonthCombo = new Q3ComboBox( buttonGroup );
  mByMonthCombo->insertItem( i18n("January") );
  mByMonthCombo->insertItem( i18n("February") );
@@ -384,7 +392,7 @@ ExceptionsWidget::ExceptionsWidget( QWidget *parent, const char *name ) :
  QWidget( parent, name )
 {
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
-  QGroupBox *groupBox = new QGroupBox( 1, Horizontal, i18n("Exceptions"),
+  Q3GroupBox *groupBox = new Q3GroupBox( 1, Qt::Horizontal, i18n("Exceptions"),
                                       this );
  topLayout->addWidget( groupBox );
@@ -392,5 +400,5 @@ ExceptionsWidget::ExceptionsWidget( QWidget *parent, const char *name ) :
  QWidget *box = new QWidget( groupBox );
-  QGridLayout *boxLayout = new QGridLayout( box );
+  Q3GridLayout *boxLayout = new Q3GridLayout( box );
  mExceptionDateEdit = new KDateEdit( box );
@@ -404,5 +412,5 @@ ExceptionsWidget::ExceptionsWidget( QWidget *parent, const char *name ) :
  boxLayout->addWidget( deleteExceptionButton, 3, 0 );
-  mExceptionList = new QListBox( box );
+  mExceptionList = new Q3ListBox( box );
  boxLayout->addMultiCellWidget( mExceptionList, 0, 3, 1, 1 );
@@ -507,12 +515,12 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent,
  : QWidget( parent, name )
 {
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
-  mRangeGroupBox = new QGroupBox( 1, Horizontal, i18n("Recurrence Range"),
+  mRangeGroupBox = new Q3GroupBox( 1, Qt::Horizontal, i18n("Recurrence Range"),
                                  this );
  topLayout->addWidget( mRangeGroupBox );
  QWidget *rangeBox = new QWidget( mRangeGroupBox );
-  QVBoxLayout *rangeLayout = new QVBoxLayout( rangeBox );
+  Q3VBoxLayout *rangeLayout = new Q3VBoxLayout( rangeBox );
  rangeLayout->setSpacing( KDialog::spacingHint() );
  rangeLayout->setMargin( KDialog::marginHintSmall() );
@@ -521,5 +529,5 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent,
  rangeLayout->addWidget( mStartDateLabel );
-  mRangeButtonGroup = new QButtonGroup;
+  mRangeButtonGroup = new Q3ButtonGroup;
  mNoEndDateButton = new QRadioButton( i18n("No ending date"), rangeBox );
@@ -527,5 +535,5 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent,
  rangeLayout->addWidget( mNoEndDateButton );
-  QBoxLayout *durationLayout = new QHBoxLayout( rangeLayout );
+  Q3BoxLayout *durationLayout = new Q3HBoxLayout( rangeLayout );
  durationLayout->setSpacing( KDialog::spacingHint() );
@@ -540,5 +548,5 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent,
  durationLayout ->addWidget( endDurationLabel );
-  QBoxLayout *endDateLayout = new QHBoxLayout( rangeLayout );
+  Q3BoxLayout *endDateLayout = new Q3HBoxLayout( rangeLayout );
  endDateLayout->setSpacing( KDialog::spacingHint() );
@@ -667,5 +675,5 @@ RecurrenceChooser::RecurrenceChooser( QWidget *parent, const char *name ) :
  QWidget( parent, name )
 {
-    QBoxLayout *topLayout = new QVBoxLayout( this );
+    Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
    mTypeCombo = new QComboBox( this );
@@ -726,5 +734,5 @@ KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) :
  QWidget( parent, name )
 {
-  QGridLayout *topLayout = new QGridLayout( this, 2,2 );
+  Q3GridLayout *topLayout = new Q3GridLayout( this, 2,2 );
  topLayout->setSpacing( KDialog::spacingHint() );
  topLayout->setMargin( KDialog::marginHintSmall() );
@@ -736,5 +744,5 @@ KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) :
-  mTimeGroupBox = new QGroupBox( 1, Horizontal, i18n("Time"),  
+  mTimeGroupBox = new Q3GroupBox( 1, Qt::Horizontal, i18n("Time"),  
                                 this );
  topLayout->addMultiCellWidget( mTimeGroupBox, 1, 1 , 0 , 1 );
@@ -753,5 +761,5 @@ KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) :
  //mTimeGroupBox->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum ) );
  //mDateTimeLabel->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum) );
-  mRuleBox = new QGroupBox( 1, Horizontal, i18n("Recurrence Rule"), this );
+  mRuleBox = new Q3GroupBox( 1, Qt::Horizontal, i18n("Recurrence Rule"), this );
  topLayout->addMultiCellWidget( mRuleBox, 2, 2, 0, 1 );
  mRecurrenceChooser = new RecurrenceChooser( mRuleBox );
@@ -760,5 +768,5 @@ KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) :
-  mRuleStack = new QWidgetStack( mRuleBox );
+  mRuleStack = new Q3WidgetStack( mRuleBox );
  mDaily = new RecurDaily( mRuleStack );
@@ -897,6 +905,6 @@ void KOEditorRecurrence::readEvent(Incidence *event)
    setDefaults( event->dtStart(), dtEnd );
  QBitArray rDays( 7 );
-  QPtrList<Recurrence::rMonthPos> rmp;
+  Q3PtrList<Recurrence::rMonthPos> rmp;
-  QPtrList<int> rmd;
+  Q3PtrList<int> rmd;
  int day = 0;
  int count = 0;
@@ -969,5 +977,5 @@ void KOEditorRecurrence::readEvent(Incidence *event)
 #if 0
              //qDebug("2day = %d ",day );
-              QPtrList<Recurrence::rMonthPos> monthlist = r->yearMonthPositions();
+              Q3PtrList<Recurrence::rMonthPos> monthlist = r->yearMonthPositions();
              int month;
              if ( !monthlist.isEmpty() ) {
diff --git a/korganizer/koeditorrecurrence.h b/korganizer/koeditorrecurrence.h
index 75e0c73..6c012bd 100644
--- a/korganizer/koeditorrecurrence.h
+++ b/korganizer/koeditorrecurrence.h
@@ -24,15 +24,17 @@
 #define _KOEDITORRECURRENCE_H
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlabel.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qlineedit.h>
 #include <qcombobox.h>
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qradiobutton.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
+#include <Q3ListBox>
+#include <Q3ComboBox>
 #include <kdialogbase.h>
@@ -42,5 +44,5 @@
 #include "ktimeedit.h"
-class QWidgetStack;
+class Q3WidgetStack;
 class QSpinBox;
@@ -99,5 +101,5 @@ class RecurMonthly : public RecurBase
  private:
    QRadioButton *mByDayRadio;
-    QComboBox *mByDayCombo;
+    Q3ComboBox *mByDayCombo;
    QRadioButton *mByPosRadio;
@@ -123,5 +125,5 @@ class RecurYearly : public RecurBase
    int mDay;
    QRadioButton *mByMonthRadio;
-    QComboBox *mByMonthCombo;
+    Q3ComboBox *mByMonthCombo;
    QLabel* mByDayLabel;
    QLabel* mDayOfLabel;
@@ -181,5 +183,5 @@ class ExceptionsWidget : public QWidget, public ExceptionsBase
  private:
    KDateEdit *mExceptionDateEdit;
-    QListBox *mExceptionList;
+    Q3ListBox *mExceptionList;
    DateList mExceptionDates;  
 };
@@ -236,6 +238,6 @@ class RecurrenceRangeWidget : public QWidget, public RecurrenceRangeBase
  private:
-    QButtonGroup *mRangeButtonGroup;
+    Q3ButtonGroup *mRangeButtonGroup;
-    QGroupBox *mRangeGroupBox;
+    Q3GroupBox *mRangeGroupBox;
    QLabel *mStartDateLabel;
    QRadioButton *mNoEndDateButton;
@@ -301,9 +303,9 @@ class KOEditorRecurrence : public QWidget
    QCheckBox *mEnabledCheck;
  
-    QGroupBox *mTimeGroupBox;
+    Q3GroupBox *mTimeGroupBox;
    QLabel *mDateTimeLabel;
  
-    QGroupBox *mRuleBox;
+    Q3GroupBox *mRuleBox;
-    QWidgetStack *mRuleStack;
+    Q3WidgetStack *mRuleStack;
    RecurrenceChooser *mRecurrenceChooser;
    
diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp
index 3e87197..62ad250 100644
--- a/korganizer/koeventeditor.cpp
+++ b/korganizer/koeventeditor.cpp
@@ -23,12 +23,17 @@
 #include <qtooltip.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qpixmap.h>
-#include <qhbox.h>
+#include <q3hbox.h>
 #include <qtimer.h>
 #include <qdir.h>
 #include <qlayout.h>
-#include <qwidgetstack.h>
+#include <q3widgetstack.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3PtrList>
+#include <Q3VBoxLayout>
 #include <kiconloader.h>
@@ -106,6 +111,6 @@ void KOEventEditor::setupGeneral()
  if( KOPrefs::instance()->mCompactDialogs ) {
-    QFrame *topFrame = addPage(i18n("General"));
+    Q3Frame *topFrame = addPage(i18n("General"));
-    QBoxLayout *topLayout = new QVBoxLayout(topFrame);
+    Q3BoxLayout *topLayout = new Q3VBoxLayout(topFrame);
    topLayout->setSpacing(spacingHint()-1);
    topLayout->setMargin(marginHint()-1);
@@ -120,11 +125,11 @@ void KOEventEditor::setupGeneral()
    mGeneral->enableAlarm( false );
-    QBoxLayout *buttonLayout;
+    Q3BoxLayout *buttonLayout;
    if ( QApplication::desktop()->width() < 500 && QApplication::desktop()->height() > 240 ) 
-        buttonLayout = new QVBoxLayout( topLayout );
+        buttonLayout = new Q3VBoxLayout( topLayout );
    else
-        buttonLayout = new QHBoxLayout( topLayout );
+        buttonLayout = new Q3HBoxLayout( topLayout );
-    QHBox* buttonWidget = new QHBox (topFrame);
+    Q3HBox* buttonWidget = new Q3HBox (topFrame);
-    QIconSet icon;
+    QIcon icon;
    if ( QApplication::desktop()->width() < 321 ) 
        icon = SmallIcon("fileexport16");
@@ -147,7 +152,7 @@ void KOEventEditor::setupGeneral()
    topLayout->addStretch( 1 );
-    QFrame *topFrame2 = addPage(i18n("Details"));
+    Q3Frame *topFrame2 = addPage(i18n("Details"));
-    QBoxLayout *topLayout2 = new QVBoxLayout(topFrame2);
+    Q3BoxLayout *topLayout2 = new Q3VBoxLayout(topFrame2);
    topLayout2->setSpacing(spacingHint()-1);
    topLayout2->setMargin(marginHint()-1);
@@ -161,16 +166,16 @@ void KOEventEditor::setupGeneral()
    connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) );
  } else {
-    QFrame *topFrame = addPage(i18n("General"));
+    Q3Frame *topFrame = addPage(i18n("General"));
-    QBoxLayout *topLayout = new QVBoxLayout(topFrame);
+    Q3BoxLayout *topLayout = new Q3VBoxLayout(topFrame);
    topLayout->setSpacing(spacingHint());
    mGeneral->initHeader(topFrame,topLayout);
    mGeneral->initTime(topFrame,topLayout);
-    QBoxLayout *alarmLineLayout = new QHBoxLayout(topLayout);
+    Q3BoxLayout *alarmLineLayout = new Q3HBoxLayout(topLayout);
    mGeneral->initAlarm(topFrame,alarmLineLayout);
    mGeneral->initClass(topFrame,alarmLineLayout);
    mGeneral->initDescription(topFrame,topLayout);
-    QBoxLayout *detailsLayout = new QHBoxLayout(topLayout);
+    Q3BoxLayout *detailsLayout = new Q3HBoxLayout(topLayout);
    mGeneral->initCategories( topFrame, detailsLayout );
    mGeneral->initSecrecy( topFrame, detailsLayout );
@@ -183,6 +188,6 @@ void KOEventEditor::setupGeneral()
 void KOEventEditor::setupRecurrence()
 {
-  QFrame *topFrame = addPage( i18n("Recurrence") );
+  Q3Frame *topFrame = addPage( i18n("Recurrence") );
-  QBoxLayout *topLayout = new QVBoxLayout( topFrame );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( topFrame );
  mRecurrence = new KOEditorRecurrence( topFrame );
@@ -357,5 +362,5 @@ void KOEventEditor::slotLoadTemplate()
        return ;
    }
-    QPtrList<Event> events = cal.events();
+    Q3PtrList<Event> events = cal.events();
    Event* event = events.first();
    if ( !event ) {
diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp
index fc4d9a4..81047c1 100644
--- a/korganizer/koeventpopupmenu.cpp
+++ b/korganizer/koeventpopupmenu.cpp
@@ -23,4 +23,7 @@
 #include <qcursor.h>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3PopupMenu>
 #include <klocale.h>
@@ -33,5 +36,5 @@
 #include "koprefs.h"
-KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu()
+KOEventPopupMenu::KOEventPopupMenu(): Q3PopupMenu()
 {
    mCurrentIncidence = 0;
@@ -54,9 +57,9 @@ KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu()
                                      this,SLOT(popupCancel())));
    isDisabled = false;  
-    mCatPopup = new QPopupMenu ( this );
+    mCatPopup = new Q3PopupMenu ( this );
    mCatPopup->setCheckable (true);
    connect(mCatPopup,SIGNAL( aboutToShow ()), this ,SLOT( fillCatPopup()));
    connect(mCatPopup,SIGNAL(  activated ( int ) ), this ,SLOT( computeCatPopup( int )));
-    mCalPopup = new QPopupMenu ( this );
+    mCalPopup = new Q3PopupMenu ( this );
    mCalPopup->setCheckable (true);
    connect(mCalPopup,SIGNAL( aboutToShow ()), this ,SLOT( fillCalPopup()));
@@ -66,5 +69,5 @@ KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu()
    insertItem (i18n("Categories"),mCatPopup );
    insertItem (i18n("Calendar"),mCalPopup );
-    QValueList<int>::Iterator it;
+    Q3ValueList<int>::Iterator it;
    for( it = mEditOnlyItems.begin(); it != mEditOnlyItems.end(); ++it ) {
        mSingleOnlyItems.append(*it);
@@ -75,5 +78,5 @@ void KOEventPopupMenu::enableDefault( bool enable )
 {
    isDisabled = !enable;
-    QValueList<int>::Iterator it;
+    Q3ValueList<int>::Iterator it;
    for( it = mSingleOnlyItems.begin(); it != mSingleOnlyItems.end(); ++it ) {
        setItemEnabled(*it,enable);
@@ -147,5 +150,5 @@ void KOEventPopupMenu::showIncidencePopup(Incidence *incidence)
        // Enable/Disabled menu items only valid for editable events.
        if ( !isDisabled  ) {
-            QValueList<int>::Iterator it;
+            Q3ValueList<int>::Iterator it;
            for( it = mEditOnlyItems.begin(); it != mEditOnlyItems.end(); ++it ) {
                setItemEnabled(*it,!mCurrentIncidence->isReadOnly());
@@ -156,5 +159,5 @@ void KOEventPopupMenu::showIncidencePopup(Incidence *incidence)
 }
-void KOEventPopupMenu::addAdditionalItem(const QIconSet &icon,const QString &text,
+void KOEventPopupMenu::addAdditionalItem(const QIcon &icon,const QString &text,
                                         const QObject *receiver, const char *member,
                                         bool editOnly)
diff --git a/korganizer/koeventpopupmenu.h b/korganizer/koeventpopupmenu.h
index e28745b..de5220b 100644
--- a/korganizer/koeventpopupmenu.h
+++ b/korganizer/koeventpopupmenu.h
@@ -27,5 +27,7 @@
 //
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <libkcal/incidence.h>
@@ -33,10 +35,10 @@
 using namespace KCal;
-class KOEventPopupMenu : public QPopupMenu {
+class KOEventPopupMenu : public Q3PopupMenu {
    Q_OBJECT
  public:
    KOEventPopupMenu();
  
-    void addAdditionalItem(const QIconSet &icon,const QString &text,
+    void addAdditionalItem(const QIcon &icon,const QString &text,
                           const QObject *receiver, const char *member,
                           bool editOnly=false);
@@ -74,9 +76,9 @@ class KOEventPopupMenu : public QPopupMenu {
    
    bool mHasAdditionalItems;
-    QValueList<int> mEditOnlyItems;
+    Q3ValueList<int> mEditOnlyItems;
-    QValueList<int> mSingleOnlyItems;
+    Q3ValueList<int> mSingleOnlyItems;
    bool isDisabled;
-    QPopupMenu *mCatPopup;
+    Q3PopupMenu *mCatPopup;
-    QPopupMenu *mCalPopup;
+    Q3PopupMenu *mCalPopup;
 };
diff --git a/korganizer/koeventview.cpp b/korganizer/koeventview.cpp
index 1d26930..a4ba85e 100644
--- a/korganizer/koeventview.cpp
+++ b/korganizer/koeventview.cpp
@@ -22,5 +22,5 @@
 */
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qcursor.h>
@@ -74,5 +74,5 @@ KOEventPopupMenu *KOEventView::eventPopup()
 //---------------------------------------------------------------------------
-void KOEventView::showIncidencePopup(QPopupMenu *popup,Incidence *event)
+void KOEventView::showIncidencePopup(Q3PopupMenu *popup,Incidence *event)
 {
  mCurrentIncidence = event;
diff --git a/korganizer/koeventview.h b/korganizer/koeventview.h
index 77ec111..f28e68b 100644
--- a/korganizer/koeventview.h
+++ b/korganizer/koeventview.h
@@ -31,4 +31,6 @@
 #include "koeventpopupmenu.h"
+//Added by qt3to4:
+#include <Q3PopupMenu>
 using namespace KCal;
@@ -88,5 +90,5 @@ class KOEventView : public KOrg::BaseView
     * @param popup a popop menu created with eventPopup()
     */
-    void showIncidencePopup(QPopupMenu *popup, Incidence *event);
+    void showIncidencePopup(Q3PopupMenu *popup, Incidence *event);
    /**
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index c0acf34..4df26a9 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -18,10 +18,15 @@
 */
-#include <qcstring.h>
+#include <q3cstring.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
 #include <qdialog.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
 #include <qlabel.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <QKeyEvent>
+#include <Q3PtrList>
+#include <Q3VBoxLayout>
 #include <klocale.h>
@@ -56,5 +61,5 @@
 #include <qprinter.h>
 #include <qpainter.h>
-#include <qpaintdevicemetrics.h>
+#include <q3paintdevicemetrics.h>
 #else //DESKTOP_VERSION
 #include <qtopia/qcopenvelope_qws.h> 
@@ -63,5 +68,5 @@
 KOEventViewer::KOEventViewer(QWidget *parent,const char *name)
-  : QTextBrowser(parent,name)
+  : Q3TextBrowser(parent,name)
 {
    mSyncMode = false;
@@ -87,5 +92,5 @@ void KOEventViewer::printMe()
    QPainter p;
    p.begin ( &printer  );
-    QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer );
+    Q3PaintDeviceMetrics m = Q3PaintDeviceMetrics ( &printer );
    float dx, dy;
    int wid = (m.width() * 9)/10;
@@ -135,5 +140,5 @@ void KOEventViewer::setSource(const QString& n)
                QDialog dia( this,"dia123", true );
                dia.setCaption( i18n("Details of attendee") );
-                QVBoxLayout lay ( &dia );
+                Q3VBoxLayout lay ( &dia );
                KABC::AddresseeView av ( &dia );
                av.setAddressee( (*it) );
@@ -156,5 +161,5 @@ void KOEventViewer::setSource(const QString& n)
            return;
        } 
-        QPtrList<Attendee> attendees = mCurrentIncidence->attendees();
+        Q3PtrList<Attendee> attendees = mCurrentIncidence->attendees();
        if (attendees.count()) {  
            Attendee *a;
@@ -201,5 +206,5 @@ void KOEventViewer::setSource(const QString& n)
        const QByteArray paramData;
        QByteArray replyData;
-        QCString replyTypeStr;
+        Q3CString replyTypeStr;
 #define PING_ABBROWSER (client->call("kaddressbook", "KAddressBookIface", "interfaces()",  noParamData, replyTypeStr, replyData))
        bool foundAbbrowser = PING_ABBROWSER;
@@ -208,5 +213,5 @@ void KOEventViewer::setSource(const QString& n)
            //KAddressbook is already running, so just DCOP to it to bring up the contact editor
            //client->send("kaddressbook","KAddressBookIface",
-            QDataStream arg(paramData, IO_WriteOnly);
+            QDataStream arg(paramData, QIODevice::WriteOnly);
            arg << n.mid(6);
            client->send("kaddressbook", "KAddressBookIface", "showContactEditor( QString )",  paramData);
@@ -232,5 +237,5 @@ void KOEventViewer::setSource(const QString& n)
 void KOEventViewer::mailToAttendees( bool all )
 {
-    QPtrList<Attendee> attendees = mCurrentIncidence->attendees();
+    Q3PtrList<Attendee> attendees = mCurrentIncidence->attendees();
    if (attendees.count() == 0) return;
    QStringList nameList;
@@ -261,5 +266,5 @@ void KOEventViewer::mailToAttendees( bool all )
 void KOEventViewer::addTag(const QString & tag,const QString & text)
 {
-    int number=text.contains("\n");
+    int number=text.count("\n");
    QString str = "<" + tag + ">";
    QString tmpText=text;
@@ -588,5 +593,5 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
        //        mText.append(deTag("[" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] " +event->relatedTo()->summary()) +"<br>");
    }
-    QPtrList<Incidence> Relations = event->relations();
+    Q3PtrList<Incidence> Relations = event->relations();
    Incidence *to;
    if ( Relations.first() )
@@ -622,5 +627,5 @@ void KOEventViewer::formatCategories(Incidence *event)
 void KOEventViewer::formatAttendees(Incidence *event)
 {
-    QPtrList<Attendee> attendees = event->attendees();
+    Q3PtrList<Attendee> attendees = event->attendees();
    if (attendees.count()) {
        
@@ -655,5 +660,5 @@ void KOEventViewer::formatAttendees(Incidence *event)
 #endif
       
-        if (iconPath) {
+        if (!iconPath.isEmpty()) {
            mText += " <a href=\"mailto:" + event->organizer() + "\">";
            mText += "<IMG src=\"" + iconPath + "\">";
@@ -705,5 +710,5 @@ void KOEventViewer::formatAttendees(Incidence *event)
          
            if (!a->email().isEmpty()) {
-                if (iconPath) {
+                if (!iconPath.isEmpty()) {
                    mText += "<a href=\"mailto:" + a->realName() +" <" + a->email() + ">:" + mMailSubject + "\">";
                    if ( a->RSVP() ) {
@@ -863,5 +868,5 @@ void KOEventViewer::keyPressEvent ( QKeyEvent * e )
        break;
    default:
-        QTextBrowser::keyPressEvent ( e );
+        Q3TextBrowser::keyPressEvent ( e );
        break; 
    }
diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h
index 64eb4ff..3df667f 100644
--- a/korganizer/koeventviewer.h
+++ b/korganizer/koeventviewer.h
@@ -23,5 +23,8 @@
 //
-#include <qtextbrowser.h>
+#include <q3textbrowser.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <QKeyEvent>
 #include <libkcal/event.h>
@@ -38,5 +41,5 @@ using namespace KCal;
 #include <qdialog.h>
 #include <qlabel.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <kglobal.h>
@@ -48,11 +51,11 @@ class KOPrintPrefs : public QDialog
    {
        setCaption( i18n("KO/Pi Printout") );
-        QVBoxLayout* lay = new QVBoxLayout( this );
+        Q3VBoxLayout* lay = new Q3VBoxLayout( this );
        lay->setSpacing( 9 );
        lay->setMargin( 9 );
        QLabel * lab = new QLabel( i18n("This prints the view as you see it.\n(With the complete content, of course.)\nYou may change the print layout by resizing the view.\nPrint unscaled may print several pages\ndepending on the amount of data.\nPrint scaled down will print all on one page.\nPrint scaled up/down will print all on one page,\nbut will scale up the text to page boundaries,\nif the text is smaller than the page.\nYou can select page geometry setup in the next dialog.\n"), this );
        lay->addWidget( lab ); 
-        lab->setAlignment( AlignCenter );
+        lab->setAlignment( Qt::AlignCenter );
-        QButtonGroup* format = new  QButtonGroup( 1, Horizontal, i18n("Printout Mode"), this );
+        Q3ButtonGroup* format = new  Q3ButtonGroup( 1, Qt::Horizontal, i18n("Printout Mode"), this );
        lay->addWidget( format ); 
        format->setExclusive ( true ) ;
@@ -84,5 +87,5 @@ private:
 #endif
-class KOEventViewer : public QTextBrowser {
+class KOEventViewer : public Q3TextBrowser {
    Q_OBJECT
  public:
@@ -118,5 +121,5 @@ class KOEventViewer : public QTextBrowser {
  private:
-    QTextBrowser *mEventTextView;
+    Q3TextBrowser *mEventTextView;
    bool mSyncMode;
    QString deTag(QString text);
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index 2e936f3..3a37852 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -23,4 +23,7 @@
 #include <qtimer.h>
 #include <qpushbutton.h>
+//Added by qt3to4:
+#include <QHideEvent>
+#include <QKeyEvent>
 #include "koeventviewer.h"
@@ -28,5 +31,5 @@
 #include "koprefs.h"
 #include <libkcal/todo.h>
-#include "qapp.h"
+#include "qapplication.h"
 #include "koeventviewerdialog.h"
diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h
index 71696f4..947c10b 100644
--- a/korganizer/koeventviewerdialog.h
+++ b/korganizer/koeventviewerdialog.h
@@ -23,5 +23,8 @@
 //
-#include <qtextview.h>
+#include <q3textview.h>
+//Added by qt3to4:
+#include <QKeyEvent>
+#include <QHideEvent>
 #include <kdialogbase.h>
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index ee9c9f6..8335ba9 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -28,8 +28,12 @@
 #include <qlabel.h>
 #include <qdialog.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qtextcodec.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
 #include <qdir.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3Frame>
+#include <Q3PtrList>
@@ -48,6 +52,6 @@
 
-KOFilterView::KOFilterView(QPtrList<CalFilter> *filterList,QWidget* parent,
+KOFilterView::KOFilterView(Q3PtrList<CalFilter> *filterList,QWidget* parent,
-                           const char* name,WFlags fl )
+                           const char* name,Qt::WFlags fl )
  : KOFilterView_base(parent,name,fl)
 {
@@ -115,12 +119,12 @@ void KOFilterView::setSelectedFilter( int fil )
 KOCalEditView::KOCalEditView(QWidget* parent,
                           const char* name )
-  : QScrollView(parent,name)
+  : Q3ScrollView(parent,name)
 {
    mw = 0; 
    setResizePolicy( AutoOneFit );
-    setFrameStyle ( QFrame::Panel | QFrame::Plain );
+    setFrameStyle ( Q3Frame::Panel | Q3Frame::Plain );
    setLineWidth ( 1 ); 
    setMidLineWidth ( 1 ); 
-    setFocusPolicy(NoFocus); 
+    setFocusPolicy(Qt::NoFocus); 
 }
@@ -248,19 +252,19 @@ void KOCalEditView::readConfig()
    addChild(mw);
    int ii = 0;
-    mainLayout = new QGridLayout ( mw , 2, 8 );
+    mainLayout = new Q3GridLayout ( mw , 2, 8 );
    mainLayout->setMargin( 2 );
    mainLayout->setSpacing( 2 );
    QPushButton * addButT = new QPushButton ( mw );
-    addButT->setFocusPolicy(NoFocus); 
+    addButT->setFocusPolicy(Qt::NoFocus); 
    mainLayout->addWidget( addButT,0,0 );
    addButT->setText( "D");
    connect(addButT,SIGNAL(clicked()),SLOT(defaultInfo()));
-    QWhatsThis::add( addButT, i18n("Please choose the <b>default calendar</b> in this column. Newly created or imported items are added to the default calendar.") );
+    Q3WhatsThis::add( addButT, i18n("Please choose the <b>default calendar</b> in this column. Newly created or imported items are added to the default calendar.") );
    //addBut->setPixmap ( SmallIcon("greenhook16"));
    QPushButton *addBut = new QPushButton ( mw );
-    addBut->setFocusPolicy(NoFocus); 
+    addBut->setFocusPolicy(Qt::NoFocus); 
    mainLayout->addWidget( addBut,0,++ii );
    addBut->setPixmap ( SmallIcon("eye"));
-    QWhatsThis::add( addBut, i18n("In this column you can <b>set a calendar to be visible</b>. If a calendar is not visible its entries are not displayed in the views. You can add items to it and it is loaded/saved as usual.") );
+    Q3WhatsThis::add( addBut, i18n("In this column you can <b>set a calendar to be visible</b>. If a calendar is not visible its entries are not displayed in the views. You can add items to it and it is loaded/saved as usual.") );
    connect(addBut,SIGNAL(clicked()),SLOT(enableAll()));
    int max = addBut->sizeHint().height();
@@ -269,21 +273,21 @@ void KOCalEditView::readConfig()
    QLabel* lab = new QLabel (i18n(" Calendar \n Resource "), mw );
    mainLayout->addWidget( lab,0,++ii ); 
-    QWhatsThis::add( lab, i18n("In this column you can see the <b>name of the calendar</b>. If you click on the name button you will get an information box about the loaded calendar file. If the file was not loaded at startup you can try to load it here again.") );
+    Q3WhatsThis::add( lab, i18n("In this column you can see the <b>name of the calendar</b>. If you click on the name button you will get an information box about the loaded calendar file. If the file was not loaded at startup you can try to load it here again.") );
    //lab = new QLabel ( i18n(" "), mw );
    //mainLayout->addWidget( lab,0,++ii );
    //lab->setFixedWidth( 1 );
    addBut = new QPushButton ( mw );
-    addBut->setFocusPolicy(NoFocus); 
+    addBut->setFocusPolicy(Qt::NoFocus); 
    mainLayout->addWidget( addBut,0,++ii );
    addBut->setPixmap ( SmallIcon("bell"));
-    QWhatsThis::add( addBut, i18n("In this column you can <b>disable the alarms of a calendar all together</b>. The alarm data in the calendar itself is not changed, the alarms are marked internally as \"do not use\". Useful if you load a calendar of another person but do not want to get notified about alarms of that person.") );
+    Q3WhatsThis::add( addBut, i18n("In this column you can <b>disable the alarms of a calendar all together</b>. The alarm data in the calendar itself is not changed, the alarms are marked internally as \"do not use\". Useful if you load a calendar of another person but do not want to get notified about alarms of that person.") );
    connect(addBut,SIGNAL(clicked()),SLOT(enableAlarm()));
    addBut->setMaximumWidth( addBut->sizeHint().height() );
    addBut = new QPushButton ( mw );
-    addBut->setFocusPolicy(NoFocus); 
+    addBut->setFocusPolicy(Qt::NoFocus); 
    mainLayout->addWidget( addBut,0,++ii );
    addBut->setPixmap ( SmallIcon("pencil"));
-    QWhatsThis::add( addBut, i18n("In this column you can <b>set a calendar and all entries of the calendar to read only</b>. If a calendar is readonly the entries cannot be edited and no items can be added to the calendar. If you change a setting of a calendar to readonly in this column all data will be saved because the data of a readonly calendar is not saved later.") );
+    Q3WhatsThis::add( addBut, i18n("In this column you can <b>set a calendar and all entries of the calendar to read only</b>. If a calendar is readonly the entries cannot be edited and no items can be added to the calendar. If you change a setting of a calendar to readonly in this column all data will be saved because the data of a readonly calendar is not saved later.") );
    connect(addBut,SIGNAL(clicked()),SLOT(disableRO()));
    addBut->setMaximumWidth( addBut->sizeHint().height() );
@@ -292,9 +296,9 @@ void KOCalEditView::readConfig()
    addBut = new QPushButton ( mw );
-    addBut->setFocusPolicy(NoFocus); 
+    addBut->setFocusPolicy(Qt::NoFocus); 
    mainLayout->addWidget( addBut,0,++ii );
    addBut->setPixmap ( SmallIcon("plus"));
    connect(addBut,SIGNAL(clicked()),SLOT(addCal()));
-    QWhatsThis::add( addBut, i18n("Click this button to <b>add a calendar</b>. You can add an existing calendar file or you can add a new calendar and KO/Pi creates a new empty calendar file for you.") );
+    Q3WhatsThis::add( addBut, i18n("Click this button to <b>add a calendar</b>. You can add an existing calendar file or you can add a new calendar and KO/Pi creates a new empty calendar file for you.") );
    lab = new QLabel ( " ", mw );
    mainLayout->addWidget( lab,0,++ii );
@@ -432,9 +436,9 @@ int KOCalEditView::addCalendar( QString name, QString file, bool ask )
                return 0;
        QFile fileIn( absFile );
-        if (!fileIn.open( IO_WriteOnly ) ) {
+        if (!fileIn.open( QIODevice::WriteOnly ) ) {
            KMessageBox::sorry( this,  i18n("Sorry, cannot create the file\n%1!\nNo calendar added!").arg( file ) ); 
            return 0;
        } 
-        QTextStream tsIn( &fileIn );
+        Q3TextStream tsIn( &fileIn );
        tsIn.setCodec( QTextCodec::codecForName("utf8") );
        tsIn << "BEGIN:VCALENDAR\nPRODID:-//KDE-Pim//Platform-independent 2.1.0\nVERSION:2.0\nEND:VCALENDAR\n";
@@ -476,5 +480,5 @@ void KOCalEditView::disableRO()
    toggleList( mROB, false );
 }
-void KOCalEditView::toggleList ( QPtrList<KOCalCheckButton> list , bool enable )
+void KOCalEditView::toggleList ( Q3PtrList<KOCalCheckButton> list , bool enable )
 {
    bool dis = !enable;
diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h
index 0dd423a..f1bbab4 100644
--- a/korganizer/kofilterview.h
+++ b/korganizer/kofilterview.h
@@ -27,10 +27,16 @@
 #include <qcheckbox.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
 #include <qradiobutton.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qdialog.h>
-#include <qscrollview.h>
+#include <q3scrollview.h>
 #include <qpushbutton.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3PtrList>
+#include <QKeyEvent>
+#include <Q3VBoxLayout>
 #include <kconfig.h>
 #include "kofilterview_base.h"
@@ -43,5 +49,5 @@
 #include <kmessagebox.h>
-class QGridLayout;
+class Q3GridLayout;
 using namespace KCal;
@@ -55,5 +61,5 @@ class KONewCalPrefs : public QDialog
    {
        setCaption( i18n("Add new Calendar") );
-        QVBoxLayout* lay = new QVBoxLayout( this );
+        Q3VBoxLayout* lay = new Q3VBoxLayout( this );
        lay->setSpacing( 3 );
        lay->setMargin( 3 );
@@ -111,5 +117,5 @@ class KOCalButton : public QPushButton
               SLOT( bottonClicked() )); 
      mNumber = -1;
-      setFocusPolicy(NoFocus); 
+      setFocusPolicy(Qt::NoFocus); 
    }
    void setNum ( int num ) {mNumber = num; }
@@ -136,5 +142,5 @@ class KOCalCheckButton : public QCheckBox
               SLOT( bottonClicked( bool ) )); 
      mNumber = -1;
-      setFocusPolicy(NoFocus); 
+      setFocusPolicy(Qt::NoFocus); 
      //setMaximumWidth( 10 );
@@ -164,5 +170,5 @@ class KOCalRadioButton : public QRadioButton
               SLOT( bottonClicked( bool ) )); 
      mNumber = -1;
-      setFocusPolicy(NoFocus); 
+      setFocusPolicy(Qt::NoFocus); 
      //setMaximumWidth( 10 );
@@ -189,5 +195,5 @@ class KOFilterView : public KOFilterView_base
    Q_OBJECT
  public:
-    KOFilterView(QPtrList<CalFilter> *filterList,QWidget* parent=0,const char* name=0, WFlags fl=0);
+    KOFilterView(Q3PtrList<CalFilter> *filterList,QWidget* parent=0,const char* name=0, Qt::WFlags fl=0);
    ~KOFilterView();
@@ -205,8 +211,8 @@ class KOFilterView : public KOFilterView_base
  private:
-    QPtrList<CalFilter> *mFilters;
+    Q3PtrList<CalFilter> *mFilters;
 };
-class KOCalEditView : public QScrollView
+class KOCalEditView : public Q3ScrollView
 {
    Q_OBJECT
@@ -245,10 +251,10 @@ class KOCalEditView : public QScrollView
  private:
    QWidget *mw;
-    void toggleList ( QPtrList<KOCalCheckButton> , bool b = true );
+    void toggleList ( Q3PtrList<KOCalCheckButton> , bool b = true );
-    QPtrList<KOCalRadioButton> mStdandardB;
+    Q3PtrList<KOCalRadioButton> mStdandardB;
-    QPtrList<KOCalCheckButton> mEnabledB;
+    Q3PtrList<KOCalCheckButton> mEnabledB;
-    QPtrList<KOCalCheckButton> mAlarmB;
+    Q3PtrList<KOCalCheckButton> mAlarmB;
-    QPtrList<KOCalCheckButton> mROB;
+    Q3PtrList<KOCalCheckButton> mROB;
-    QGridLayout* mainLayout; 
+    Q3GridLayout* mainLayout; 
 };
diff --git a/korganizer/koimportoldialog.cpp b/korganizer/koimportoldialog.cpp
index 79b97e8..63d044c 100644
--- a/korganizer/koimportoldialog.cpp
+++ b/korganizer/koimportoldialog.cpp
@@ -23,18 +23,18 @@
 #include <qtooltip.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qpixmap.h>
 #include <qlayout.h>
-#include <qprogressbar.h>
+#include <q3progressbar.h>
-#include <qprogressdialog.h>
+#include <q3progressdialog.h>
-#include <qwidgetstack.h>
+#include <q3widgetstack.h>
 #include <qdatetime.h>
 #include <qdir.h>
 #include <qapplication.h>
-#include <qhbox.h>
+#include <q3hbox.h>
 #include <qregexp.h>
-#include <qheader.h>
+#include <q3header.h>
 #include <qdatetime.h>
-#include <qlistview.h>
+#include <q3listview.h>
 #include <kdebug.h>
@@ -71,11 +71,11 @@ QDateTime mDdate2Qdtr( DATE dt)
 }
-class OLEListViewItem : public QCheckListItem
+class OLEListViewItem : public Q3CheckListItem
 {
  public:
-    OLEListViewItem( QListView *parent, QString text ) :
+    OLEListViewItem( Q3ListView *parent, QString text ) :
-      QCheckListItem( parent, text, QCheckListItem::CheckBox ) { mData = 0; };
+      Q3CheckListItem( parent, text, Q3CheckListItem::CheckBox ) { mData = 0; };
-    OLEListViewItem(  QListViewItem *after, QString text ) :
+    OLEListViewItem(  Q3ListViewItem *after, QString text ) :
-      QCheckListItem( after, text, QCheckListItem::CheckBox ) { mData = 0; };
+      Q3CheckListItem( after, text, Q3CheckListItem::CheckBox ) { mData = 0; };
    ~OLEListViewItem() {};
  void setData( DWORD data ) {mData= data; };
@@ -90,7 +90,7 @@ KOImportOLdialog::KOImportOLdialog( const QString &caption,
               parent, caption, true, false, i18n("Import!") )
 {
-  QHBox * mw = new  QHBox( this );
+  Q3HBox * mw = new  Q3HBox( this );
  setMainWidget( mw );
-  mListView = new QListView( mw );
+  mListView = new Q3ListView( mw );
  mListView->addColumn(i18n("Select Folder to import"));
  mListView->addColumn(i18n("Content Type"));
@@ -213,5 +213,5 @@ void KOImportOLdialog::readCalendarData( DWORD folder )
  int i;
  folderItems = mf.GetItems(); 
-  QProgressDialog bar( i18n("Importing calendar data"),i18n("Abort"), folderItems.GetCount(),this );
+  Q3ProgressDialog bar( i18n("Importing calendar data"),i18n("Abort"), folderItems.GetCount(),this );
  bar.setCaption (i18n("Importing!") );
  int h = bar.sizeHint().height() ;
diff --git a/korganizer/koimportoldialog.h b/korganizer/koimportoldialog.h
index c8847c5..d66f099 100644
--- a/korganizer/koimportoldialog.h
+++ b/korganizer/koimportoldialog.h
@@ -32,5 +32,5 @@
 class QDateTime;
-class QListView;
+class Q3ListView;
 class OLEListViewItem;
 class _AppointmentItem;
@@ -73,5 +73,5 @@ class KOImportOLdialog : public KDialogBase
    Calendar *mCalendar;
-    QListView * mListView;
+    Q3ListView * mListView;
    QString getUidByEmail( QString email );
diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp
index 236f6f9..2060ea1 100644
--- a/korganizer/koincidenceeditor.cpp
+++ b/korganizer/koincidenceeditor.cpp
@@ -23,10 +23,12 @@
 #include <qtooltip.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qpixmap.h>
 #include <qlayout.h>
-#include <qwidgetstack.h>
+#include <q3widgetstack.h>
 #include <qdatetime.h>
 #include <qdir.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 #include <kdebug.h>
@@ -83,7 +85,7 @@ KOIncidenceEditor::~KOIncidenceEditor()
 void KOIncidenceEditor::setupAttendeesTab()
 {
-  QFrame *topFrame = addPage(i18n("Attendees"));
+  Q3Frame *topFrame = addPage(i18n("Attendees"));
-  QBoxLayout *topLayout = new QVBoxLayout(topFrame);
+  Q3BoxLayout *topLayout = new Q3VBoxLayout(topFrame);
  mDetails = new KOEditorDetails(spacingHint()-2,topFrame);
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp
index 406df5a..51594ff 100644
--- a/korganizer/kojournalview.cpp
+++ b/korganizer/kojournalview.cpp
@@ -26,11 +26,17 @@
 #include <qlayout.h>
-#include <qscrollview.h>
+#include <q3scrollview.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
-#include <qhbox.h>
+#include <q3hbox.h>
 #include <qpushbutton.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <QPixmap>
+#include <Q3PtrList>
+#include <QKeyEvent>
+#include <Q3VBoxLayout>
 #include <klocale.h>
@@ -52,5 +58,5 @@ KOJournalView::KOJournalView(Calendar *calendar, QWidget *parent,
 {
    mCalendar = calendar;
-    QHBox * vb = new QHBox ( this );
+    Q3HBox * vb = new Q3HBox ( this );
    QPushButton * newJournal = new QPushButton( vb );
    QPixmap icon;
@@ -64,13 +70,13 @@ KOJournalView::KOJournalView(Calendar *calendar, QWidget *parent,
    mDateLabel = new QLabel ( vb );
    mDateLabel->setMargin(1);
-    mDateLabel->setAlignment(AlignCenter);
+    mDateLabel->setAlignment(Qt::AlignCenter);
-    QScrollView * sv = new QScrollView( this );
+    Q3ScrollView * sv = new Q3ScrollView( this );
-    QVBoxLayout * hbl = new QVBoxLayout( this );
+    Q3VBoxLayout * hbl = new Q3VBoxLayout( this );
    hbl->addWidget( vb );
    hbl->addWidget( sv );
    parWid = new QWidget( sv->viewport() );
    sv->addChild(parWid);
-    sv->setResizePolicy( QScrollView:: AutoOneFit );
+    sv->setResizePolicy( Q3ScrollView:: AutoOneFit );
-    mTopLayout = new QVBoxLayout(parWid);
+    mTopLayout = new Q3VBoxLayout(parWid);
    connect( newJournal, SIGNAL( clicked() ), this , SLOT( newJournal() ) );
    getNewEntry();
@@ -97,7 +103,7 @@ JournalEntry* KOJournalView::getNewEntry()
 }
-QPtrList<Incidence> KOJournalView::selectedIncidences()
+Q3PtrList<Incidence> KOJournalView::selectedIncidences()
 {
-  QPtrList<Incidence> eventList;
+  Q3PtrList<Incidence> eventList;
  return eventList;
@@ -163,5 +169,5 @@ void KOJournalView::showOnly ( Journal* j )
        return;
    }
-    QPtrList<Journal> jl;
+    Q3PtrList<Journal> jl;
    jl.append ( j );
    showList( jl );
@@ -169,5 +175,5 @@ void KOJournalView::showOnly ( Journal* j )
    mEntry->setShowOnly();
 }
-void KOJournalView::showList(QPtrList<Journal> jl)
+void KOJournalView::showList(Q3PtrList<Journal> jl)
 { 
    static bool ff = false;
@@ -226,9 +232,9 @@ void KOJournalView::showDates(const QDate &start, const QDate &)
    mDate = start;
    mDateLabel->setText(KGlobal::locale()->formatDate(mDate));
-    QPtrList<Journal> jl = calendar()->journals4Date( start );
+    Q3PtrList<Journal> jl = calendar()->journals4Date( start );
    showList( jl );
 }
-void KOJournalView::showEvents(QPtrList<Event>)
+void KOJournalView::showEvents(Q3PtrList<Event>)
 {
  // After new creation of list view no events are selected.
diff --git a/korganizer/kojournalview.h b/korganizer/kojournalview.h
index 7fa94ae..22f26cd 100644
--- a/korganizer/kojournalview.h
+++ b/korganizer/kojournalview.h
@@ -26,4 +26,9 @@
 #include <korganizer/baseview.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <QKeyEvent>
+#include <Q3PtrList>
+#include <QLabel>
+#include <Q3BoxLayout>
 class JournalEntry;
@@ -47,5 +52,5 @@ class KOJournalView : public KOrg::BaseView
    virtual int currentDateCount();
    void clearList();
-    virtual QPtrList<Incidence> selectedIncidences();
+    virtual Q3PtrList<Incidence> selectedIncidences();
    DateList selectedDates()
      {DateList q;
@@ -61,15 +66,15 @@ class KOJournalView : public KOrg::BaseView
    void updateConfig();
    void showDates( const QDate &start, const QDate &end );
-    void showEvents(QPtrList<Event> eventList);
+    void showEvents(Q3PtrList<Event> eventList);
    void changeEventDisplay(Event *, int);
  
  private:
-    void showList(QPtrList<Journal> jl);
+    void showList(Q3PtrList<Journal> jl);
    Calendar *mCalendar;
    JournalEntry* getNewEntry();
-    QPtrList<JournalEntry> jEntries; 
+    Q3PtrList<JournalEntry> jEntries; 
    void keyPressEvent ( QKeyEvent * ) ;
-    QBoxLayout *mTopLayout;
+    Q3BoxLayout *mTopLayout;
    QWidget *parWid;
    QLabel * mDateLabel;
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 192f8c0..0ea1d50 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -23,18 +23,27 @@
 */
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qlayout.h>
 #include <qlabel.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
-#include <qprogressbar.h>
+#include <q3progressbar.h>
 #include <qfileinfo.h>
 #include <qmessagebox.h>
 #include <qdialog.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qdir.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
 #include <qregexp.h>
 #include <qpainter.h>
-#include <qpaintdevicemetrics.h>
+#include <q3paintdevicemetrics.h>
+//Added by qt3to4:
+#include <QPixmap>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <QEvent>
+#include <Q3VBoxLayout>
+#include <Q3PtrList>
+#include<QDesktopWidget>
 #include <klocale.h>
@@ -71,8 +80,8 @@ extern QPixmap* sgListViewCompletedPix[6];
 extern QPixmap* sgListViewJournalPix;
-class KOListViewWhatsThis :public QWhatsThis
+class KOListViewWhatsThis :public Q3WhatsThis
 {
 public:
-  KOListViewWhatsThis( QWidget *wid, KOListView* view ) : QWhatsThis( wid ), _wid(wid),_view (view) { };
+  KOListViewWhatsThis( QWidget *wid, KOListView* view ) : Q3WhatsThis( wid ), _wid(wid),_view (view) { };
 protected:
@@ -275,27 +284,27 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
    mListView->addColumn(i18n("Last Modified"));
-    mListView->setColumnAlignment(0,AlignLeft);
+    mListView->setColumnAlignment(0,Qt::AlignLeft);
-    mListView->setColumnAlignment(1,AlignLeft);
+    mListView->setColumnAlignment(1,Qt::AlignLeft);
-    mListView->setColumnAlignment(2,AlignHCenter);
+    mListView->setColumnAlignment(2,Qt::AlignHCenter);
-    mListView->setColumnAlignment(3,AlignLeft);
+    mListView->setColumnAlignment(3,Qt::AlignLeft);
-    mListView->setColumnAlignment(4,AlignHCenter);
+    mListView->setColumnAlignment(4,Qt::AlignHCenter);
-    mListView->setColumnAlignment(5,AlignLeft);
+    mListView->setColumnAlignment(5,Qt::AlignLeft);
-    mListView->setColumnAlignment(6,AlignLeft);
+    mListView->setColumnAlignment(6,Qt::AlignLeft);
-    mListView->setColumnAlignment(7,AlignLeft);
+    mListView->setColumnAlignment(7,Qt::AlignLeft);
-    mListView->setColumnAlignment(8,AlignLeft);
+    mListView->setColumnAlignment(8,Qt::AlignLeft);
-    mListView->setColumnAlignment(9,AlignLeft);
+    mListView->setColumnAlignment(9,Qt::AlignLeft);
-    mListView->setColumnAlignment(10,AlignLeft);
+    mListView->setColumnAlignment(10,Qt::AlignLeft);
-    mListView->setColumnAlignment(11,AlignLeft);
+    mListView->setColumnAlignment(11,Qt::AlignLeft);
    mKOListViewWhatsThis = new KOListViewWhatsThis(mListView->viewport(),this);
    int iii = 0;
    for ( iii = 0; iii< 12 ; ++iii )
-        mListView->setColumnWidthMode( iii, QListView::Manual );
+        mListView->setColumnWidthMode( iii, Q3ListView::Manual );
-    QBoxLayout *layoutTop = new QVBoxLayout(this);
+    Q3BoxLayout *layoutTop = new Q3VBoxLayout(this);
    layoutTop->addWidget(mListView);
    mListView->setFont ( KOPrefs::instance()->mListViewFont );
    mPopupMenu = eventPopup();
-    QPopupMenu* selPopup = new QPopupMenu ( this );
+    Q3PopupMenu* selPopup = new Q3PopupMenu ( this );
    mPopupMenu->insertSeparator();
    
@@ -307,18 +316,18 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
                                  SLOT(deleteAll()));
    mPopupMenu->insertItem(i18n("Selection"), selPopup );
-    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
+    mPopupMenu->addAdditionalItem(QIcon(QPixmap()),
                                  i18n("Hide all selected"),this,
                                  SLOT(hideAll()),true);
    selPopup->insertSeparator();
-    QPopupMenu * exportPO = new QPopupMenu ( this );
+    Q3PopupMenu * exportPO = new Q3PopupMenu ( this );
    selPopup->insertItem( i18n("Export"),  exportPO );
 #ifdef DESKTOP_VERSION
    mPopupMenu->insertSeparator();
-    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
+    mPopupMenu->addAdditionalItem(QIcon(QPixmap()),
                                  i18n("Print complete list..."),this,
                                  SLOT(printList()),true);
 #endif
-    mCalPopup = new QPopupMenu ( this );
+    mCalPopup = new Q3PopupMenu ( this );
    selPopup->insertItem( i18n("Set Calendar"),  mCalPopup );
@@ -328,8 +337,8 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
                          SLOT(setAlarm()));
 #if 0
-    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
+    mPopupMenu->addAdditionalItem(QIcon(QPixmap()),
                                  i18n("Set categories")+"...",this,
                                  SLOT(setCat()),true);
-    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
+    mPopupMenu->addAdditionalItem(QIcon(QPixmap()),
                                  i18n("Set alarm..."),this,
                                  SLOT(setAlarm()),true); 
@@ -357,5 +366,5 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
                          SLOT(beamSelected()));
 #if 0
-    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
+    mPopupMenu->addAdditionalItem(QIcon(QPixmap()),
                                  i18n("Beam via IR"),this,
                                  SLOT(beamSelected()),true);
@@ -376,11 +385,11 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
    QObject::connect(mListView,SIGNAL( newEvent()),
                     this,SIGNAL(signalNewEvent()));
-    QObject::connect(mListView,SIGNAL(doubleClicked(QListViewItem *)),
+    QObject::connect(mListView,SIGNAL(doubleClicked(Q3ListViewItem *)),
-                     this,SLOT(defaultItemAction(QListViewItem *)));
+                     this,SLOT(defaultItemAction(Q3ListViewItem *)));
-    QObject::connect(mListView,SIGNAL(rightButtonPressed( QListViewItem *,
+    QObject::connect(mListView,SIGNAL(rightButtonPressed( Q3ListViewItem *,
                                                           const QPoint &, int )),
-                     this,SLOT(popupMenu(QListViewItem *,const QPoint &,int)));
+                     this,SLOT(popupMenu(Q3ListViewItem *,const QPoint &,int)));
-    QObject::connect(mListView,SIGNAL(currentChanged(QListViewItem *)),
+    QObject::connect(mListView,SIGNAL(currentChanged(Q3ListViewItem *)),
-                     SLOT(processSelectionChange(QListViewItem *)));
+                     SLOT(processSelectionChange(Q3ListViewItem *)));
    QObject::connect(mListView,SIGNAL(showIncidence(Incidence *)),
                     SIGNAL(showIncidenceSignal(Incidence *)) );
@@ -429,5 +438,5 @@ void KOListView::setCalendar( int c )
    }
    
-    QPtrList<Incidence> delSel = getSelectedIncidences() ;
+    Q3PtrList<Incidence> delSel = getSelectedIncidences() ;
    int icount = delSel.count();
    if ( icount ) {
@@ -443,5 +452,5 @@ void KOListView::setCalendar( int c )
        }
    }
-    QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
+    Q3PtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
    KopiCalendarFile * cal = calendars.first();
    while ( cal ) {
@@ -498,5 +507,5 @@ void  KOListView::setAlarm()
    if ( !kap.exec() )
        return;
-    QPtrList<Incidence> delSel = getSelectedIncidences( true, true, false, true ); // no journals, only due todos
+    Q3PtrList<Incidence> delSel = getSelectedIncidences( true, true, false, true ); // no journals, only due todos
    Incidence* inc = delSel.first();
    int count = 0;
@@ -523,5 +532,5 @@ void  KOListView::setAlarm()
                alarm->setType(Alarm::Invalid);
        } else {
-            QPtrList<Alarm> alarms = inc->alarms();
+            Q3PtrList<Alarm> alarms = inc->alarms();
            Alarm *alarm;
            for (alarm = alarms.first(); alarm; alarm = alarms.next() ) {
@@ -553,5 +562,5 @@ void KOListView::setCategories( bool removeOld )
    QStringList catList = csd->selectedCategories();
    delete csd;
-    QPtrList<Incidence> delSel = getSelectedIncidences(); // all inc allowed;
+    Q3PtrList<Incidence> delSel = getSelectedIncidences(); // all inc allowed;
    Incidence* inc = delSel.first();
    while ( inc ) {
@@ -573,5 +582,5 @@ void KOListView::setCategories( bool removeOld )
 void KOListView::beamSelected()
 {
-    QPtrList<Incidence> delSel = getSelectedIncidences() ;
+    Q3PtrList<Incidence> delSel = getSelectedIncidences() ;
    if ( delSel.count() )
        emit beamIncidenceList( delSel );
@@ -588,5 +597,5 @@ void KOListView::saveDescriptionToFile()
        return;
    }
-    QPtrList<Incidence> delSel = getSelectedIncidences() ;
+    Q3PtrList<Incidence> delSel = getSelectedIncidences() ;
    int icount = delSel.count();
    if ( icount ) {
@@ -646,9 +655,9 @@ void KOListView::saveDescriptionToFile()
            }
            QFile file( fn );
-            if (!file.open( IO_WriteOnly ) ) {
+            if (!file.open( QIODevice::WriteOnly ) ) {
                topLevelWidget()->setCaption(i18n("File open error - nothing saved!") ); 
                return;
            }  
-            QTextStream ts( &file );
+            Q3TextStream ts( &file );
            ts << text;
            file.close();
@@ -668,10 +677,10 @@ void KOListView::saveToFile()
    writeToFile( true );
 }
-QPtrList<Incidence> KOListView::getSelectedIncidences( bool includeEvents, bool includeTodos, bool includeJournals, bool onlyDueTodos )
+Q3PtrList<Incidence> KOListView::getSelectedIncidences( bool includeEvents, bool includeTodos, bool includeJournals, bool onlyDueTodos )
 {
-    QPtrList<Incidence> delSel ;
+    Q3PtrList<Incidence> delSel ;
    bool addSubTodos = false;
    bool askSubTodos = true;
-    QListViewItem *item  = mListView->firstChild ();
+    Q3ListViewItem *item  = mListView->firstChild ();
    while ( item ) {
        if ( item->isSelected() ) {
@@ -707,5 +716,5 @@ QPtrList<Incidence> KOListView::getSelectedIncidences( bool includeEvents, bool
                    }
                    if ( addSubTodos ) {
-                        QPtrList<Incidence> tempSel ;
+                        Q3PtrList<Incidence> tempSel ;
                        inc->addRelationsToList( &tempSel );
                        Incidence* tempinc = tempSel.first();
@@ -731,5 +740,5 @@ QPtrList<Incidence> KOListView::getSelectedIncidences( bool includeEvents, bool
 void KOListView::writeToFile( bool iCal )
 {
-    QPtrList<Incidence> delSel = getSelectedIncidences(); // all inc allowed;
+    Q3PtrList<Incidence> delSel = getSelectedIncidences(); // all inc allowed;
    if ( !iCal ) {
        bool journal = false;
@@ -804,6 +813,6 @@ void KOListView::writeToFile( bool iCal )
 void  KOListView::hideAll()
 {
-    QPtrList<QListViewItem> delSel ;
+    Q3PtrList<Q3ListViewItem> delSel ;
-    QListViewItem *item  = mListView->firstChild ();
+    Q3ListViewItem *item  = mListView->firstChild ();
    while ( item ) {
        if ( item->isSelected() ) {
@@ -814,5 +823,5 @@ void  KOListView::hideAll()
    item = delSel.first() ;
    while ( item ) {
-        QListViewItem * del = item;
+        Q3ListViewItem * del = item;
        item = delSel.next();
        delete del;
@@ -825,5 +834,5 @@ void  KOListView::printList()
 void KOListView::deleteAll()
 {
-    QPtrList<Incidence> delSel = getSelectedIncidences(); // all inc allowed;;
+    Q3PtrList<Incidence> delSel = getSelectedIncidences(); // all inc allowed;;
    if ( delSel.count() ) {
        int icount = delSel.count();
@@ -839,9 +848,9 @@ void KOListView::deleteAll()
            QDialog dia ( this, "p-dialog", true ); 
            QLabel lab (i18n("Close dialog to abort deletion!"), &dia ); 
-            QVBoxLayout lay( &dia );
+            Q3VBoxLayout lay( &dia );
            lay.setMargin(7); 
            lay.setSpacing(7); 
            lay.addWidget( &lab);
-            QProgressBar bar( icount, &dia );
+            Q3ProgressBar bar( icount, &dia );
            lay.addWidget( &bar);
            int w = 220;
@@ -885,8 +894,8 @@ int KOListView::currentDateCount()
 }
-QPtrList<Incidence> KOListView::selectedIncidences()
+Q3PtrList<Incidence> KOListView::selectedIncidences()
 {
-    QPtrList<Incidence> eventList;
+    Q3PtrList<Incidence> eventList;
-    QListViewItem *item  = mListView->firstChild ();
+    Q3ListViewItem *item  = mListView->firstChild ();
    while ( item ) {
        if ( item->isSelected() ) {
@@ -988,5 +997,5 @@ void KOListView::showDates(const QDate &start, const QDate &end)
 }
-void KOListView::addEvents(QPtrList<Event> eventList)
+void KOListView::addEvents(Q3PtrList<Event> eventList)
 {
 
@@ -1000,5 +1009,5 @@ void KOListView::addEvents(QPtrList<Event> eventList)
 }
-void KOListView::addTodos(QPtrList<Todo> eventList)
+void KOListView::addTodos(Q3PtrList<Todo> eventList)
 {
    Todo *ev;
@@ -1010,5 +1019,5 @@ void KOListView::addTodos(QPtrList<Todo> eventList)
    }
 }
-void KOListView::addJournals(QPtrList<Journal> eventList)
+void KOListView::addJournals(Q3PtrList<Journal> eventList)
 {
    Journal *ev;
@@ -1045,5 +1054,5 @@ void KOListView::addIncidence(Incidence *incidence)
 }
-void KOListView::showEvents(QPtrList<Event> eventList)
+void KOListView::showEvents(Q3PtrList<Event> eventList)
 {
    clear();
@@ -1096,5 +1105,5 @@ KOListViewItem *KOListView::getItemForEvent(Incidence *event)
 }
-void KOListView::defaultItemAction(QListViewItem *i)
+void KOListView::defaultItemAction(Q3ListViewItem *i)
 {
    KOListViewItem *item = static_cast<KOListViewItem *>( i );
@@ -1103,5 +1112,5 @@ void KOListView::defaultItemAction(QListViewItem *i)
 }
-void KOListView::popupMenu(QListViewItem *item,const QPoint &,int)
+void KOListView::popupMenu(Q3ListViewItem *item,const QPoint &,int)
 {
    mActiveItem = (KOListViewItem *)item;
@@ -1132,5 +1141,5 @@ void KOListView::writeSettings(KConfig *config, QString setting)
 }
-void KOListView::processSelectionChange(QListViewItem *)
+void KOListView::processSelectionChange(Q3ListViewItem *)
 {
  
@@ -1181,6 +1190,6 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e)
    switch ( e->key() ) {
    case Qt::Key_Down:
-        if ( e->state() == ShiftButton ) {
+        if ( e->state() == Qt::ShiftButton ) {
-            QListViewItem* cn = currentItem();
+            Q3ListViewItem* cn = currentItem();
            if ( !cn ) 
                cn = firstChild();
@@ -1195,8 +1204,8 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e)
            return;
        }
-        if ( e->state() == ControlButton ) {
+        if ( e->state() == Qt::ControlButton ) {
            int count = childCount ();
            int jump = count / 5;
-            QListViewItem* cn;
+            Q3ListViewItem* cn;
            cn = currentItem();
            if ( ! cn )
@@ -1212,11 +1221,11 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e)
            
        } else
-            QListView::keyPressEvent ( e ) ;
+            Q3ListView::keyPressEvent ( e ) ;
        e->accept();
        break;
              
    case Qt::Key_Up:
-        if ( e->state() == ShiftButton ) {
+        if ( e->state() == Qt::ShiftButton ) {
-            QListViewItem* cn = firstChild();
+            Q3ListViewItem* cn = firstChild();
            if ( cn ) {
                setCurrentItem ( cn );
@@ -1226,8 +1235,8 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e)
            return;
        }
-        if ( e->state() == ControlButton ) {
+        if ( e->state() == Qt::ControlButton ) {
            int count = childCount ();
            int jump = count / 5;
-            QListViewItem* cn;
+            Q3ListViewItem* cn;
            cn = currentItem();
            if ( ! cn )
@@ -1242,9 +1251,9 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e)
            ensureItemVisible ( cn );
        } else
-            QListView::keyPressEvent ( e ) ;
+            Q3ListView::keyPressEvent ( e ) ;
        e->accept();
        break;   
    case Qt::Key_I: {
-        QListViewItem* cn;
+        Q3ListViewItem* cn;
        cn = currentItem();
        if ( cn ) {
@@ -1266,10 +1275,10 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e)
    case Qt::Key_Enter:
        {
-            QListViewItem* cn;
+            Q3ListViewItem* cn;
            cn = currentItem();
            if ( cn ) {
                KOListViewItem* ci = (KOListViewItem*)( cn ); 
                if ( ci ){ 
-                    if ( e->state() == ShiftButton )
+                    if ( e->state() == Qt::ShiftButton )
                        ci->setSelected( false );
                    else
@@ -1301,10 +1310,10 @@ KOListViewListView::KOListViewListView(KOListView * lv )
    //QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold );
 #endif
-    setSelectionMode( QListView::Multi );   
+    setSelectionMode( Q3ListView::Multi );   
    setMultiSelection( true);
 }
-bool KOListViewListView::hasMultiSelection(QListViewItem* item)
+bool KOListViewListView::hasMultiSelection(Q3ListViewItem* item)
 {
-    QListViewItem *qitem  = firstChild ();
+    Q3ListViewItem *qitem  = firstChild ();
    while ( qitem ) {
        if ( qitem->isSelected() && item != qitem ) 
@@ -1318,5 +1327,5 @@ void KOListViewListView::contentsMouseDoubleClickEvent(QMouseEvent *e)
    if (!e) return;
    QPoint vp = contentsToViewport(e->pos());
-    QListViewItem *item = itemAt(vp);
+    Q3ListViewItem *item = itemAt(vp);
    if (!item) {
        emit newEvent();
@@ -1330,6 +1339,6 @@ void KOListViewListView::contentsMousePressEvent(QMouseEvent *e)
    //qDebug("contentsMousePressEvent++++ ");
    KListView::contentsMousePressEvent( e );
-    if (  e->button() == RightButton    ) {
+    if (  e->button() == Qt::RightButton    ) {
-        QListViewItem* ci =  currentItem();
+        Q3ListViewItem* ci =  currentItem();
        clearSelection () ;
        if ( ci )
@@ -1349,5 +1358,5 @@ void KOListViewListView::popupMenu()
 {
    mPopupTimer->stop();
-    QMouseEvent* e = new QMouseEvent( QEvent::MouseButtonPress, mEventPos ,mEventGlobalPos, RightButton , RightButton );
+    QMouseEvent* e = new QMouseEvent( QEvent::MouseButtonPress, mEventPos ,mEventGlobalPos, Qt::RightButton , Qt::RightButton );
    QApplication::postEvent( this->viewport(), e ); 
@@ -1357,5 +1366,5 @@ void KOListViewListView::contentsMousePressEvent(QMouseEvent *e)
    //qDebug("contentsMousePressEvent++++ %d %d", e->pos().y(), e->globalPos().y());
    mYMousePos = mapToGlobal( (e->pos())).y();
-    if (  e->button() == LeftButton ) {
+    if (  e->button() == Qt::LeftButton ) {
        mPopupTimer->start( 600 ); 
        mEventPos = contentsToViewport(e->pos());
@@ -1363,6 +1372,6 @@ void KOListViewListView::contentsMousePressEvent(QMouseEvent *e)
    }
    KListView::contentsMousePressEvent( e );
-    if (  e->button() == RightButton    ) {
+    if (  e->button() == Qt::RightButton    ) {
-        QListViewItem* ci =  currentItem();
+        Q3ListViewItem* ci =  currentItem();
        //clearSelection();
        if ( ci )
@@ -1391,5 +1400,5 @@ void KOListViewListView::contentsMouseMoveEvent(QMouseEvent *e)
 #define protected public
-#include <qheader.h>
+#include <q3header.h>
 #undef protected 
 void  KOListViewListView::printList()
@@ -1408,5 +1417,5 @@ void  KOListViewListView::printList()
    p.begin ( &printer  );
    p.setFont(font());
-    QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer );
+    Q3PaintDeviceMetrics m = Q3PaintDeviceMetrics ( &printer );
    float dx, dy;
    int wid = (m.width() * 9)/10;
@@ -1444,5 +1453,5 @@ void  KOListViewListView::printList()
      for ( iii = 0; iii < cou; ++iii ) {
        int align = columnAlignment( iii );
-        if ( align == AlignAuto ) align = AlignLeft;
+        if ( align == Qt::AlignLeft ) align = Qt::AlignLeft;
        p.restore();
        p.save();
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h
index 99d0561..9fb0b00 100644
--- a/korganizer/kolistview.h
+++ b/korganizer/kolistview.h
@@ -25,7 +25,13 @@
 #define _KOLISTVIEW_H
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qmap.h>
-#include <qdict.h>
+#include <q3dict.h>
+//Added by qt3to4:
+#include <QMouseEvent>
+#include <Q3PtrList>
+#include <Q3PopupMenu>
+#include <QKeyEvent>
+#include <Q3VBoxLayout>
 #include <klistview.h>
@@ -48,5 +54,5 @@ class KOListViewWhatsThis;
 #include <qtooltip.h>
 #include <qcheckbox.h>
-#include <qhbox.h>
+#include <q3hbox.h>
 #include <qlabel.h>
 #include <kiconloader.h>
@@ -61,5 +67,5 @@ class KOAlarmPrefs : public QDialog
    {
        setCaption( i18n("Alarm Options") );
-        QVBoxLayout* alarmLayout = new QVBoxLayout( this );
+        Q3VBoxLayout* alarmLayout = new Q3VBoxLayout( this );
        alarmLayout->setSpacing( 3 );
        alarmLayout->setMargin( 3 );
@@ -75,5 +81,5 @@ class KOAlarmPrefs : public QDialog
        mAlarmIncrCombo->insertItem(i18n("day(s)"));
        alarmLayout->addWidget(mAlarmIncrCombo);
-        QHBox * hb = new QHBox ( parent );
+        Q3HBox * hb = new Q3HBox ( parent );
        alarmLayout->addWidget(hb);
        mAlarmSoundButton = new QPushButton(hb);
@@ -211,5 +217,5 @@ class KOListViewListView : public KListView
 public:
    KOListViewListView(KOListView * lv );
-    bool hasMultiSelection(QListViewItem*);
+    bool hasMultiSelection(Q3ListViewItem*);
    void printList();
 signals:
@@ -241,11 +247,11 @@ class KOListView : public KOEventView
    virtual int maxDatesHint();
    virtual int currentDateCount();
-    virtual QPtrList<Incidence> selectedIncidences();
+    virtual Q3PtrList<Incidence> selectedIncidences();
    virtual DateList selectedDates();
    
    void showDates(bool show);
    Incidence* currentItem();
-    void addTodos(QPtrList<Todo> eventList);
+    void addTodos(Q3PtrList<Todo> eventList);
-    void addJournals(QPtrList<Journal> eventList);
+    void addJournals(Q3PtrList<Journal> eventList);
    virtual void printPreview(CalPrinter *calPrinter,
                              const QDate &, const QDate &);
@@ -258,9 +264,9 @@ class KOListView : public KOEventView
    int count();
    QString getWhatsThisText(QPoint p);
-    QPtrList<Incidence> KOListView::getSelectedIncidences( bool includeEvents = true, bool includeTodos = true , bool includeJournals = true, bool onlyDueTodos  = false );
+    Q3PtrList<Incidence> getSelectedIncidences( bool includeEvents = true, bool includeTodos = true , bool includeJournals = true, bool onlyDueTodos  = false );
    void showCompletedTodos();
 signals:
    void signalNewEvent();
-    void beamIncidenceList(QPtrList<Incidence>);
+    void beamIncidenceList(Q3PtrList<Incidence>);
  public slots:
@@ -270,5 +276,5 @@ class KOListView : public KOEventView
    virtual void updateView();
    virtual void showDates(const QDate &start, const QDate &end);
-    virtual void showEvents(QPtrList<Event> eventList);
+    virtual void showEvents(Q3PtrList<Event> eventList);
    void clearSelection();
    void allSelection();
@@ -288,16 +294,16 @@ class KOListView : public KOEventView
    void changeEventDisplay(Event *, int);
  
-    void defaultItemAction(QListViewItem *item);
+    void defaultItemAction(Q3ListViewItem *item);
-    void popupMenu(QListViewItem *item,const QPoint &,int);
+    void popupMenu(Q3ListViewItem *item,const QPoint &,int);
    void setCalendar( int c );
    void populateCalPopup();
  protected slots:
-    void processSelectionChange(QListViewItem *);
+    void processSelectionChange(Q3ListViewItem *);
    void catChanged( Incidence* );
  protected:
    void writeToFile( bool iCal );
-    void addEvents(QPtrList<Event> eventList);
+    void addEvents(Q3PtrList<Event> eventList);
    void addIncidence(Incidence *);
    KOListViewItem *getItemForEvent(Incidence *event);
@@ -305,10 +311,10 @@ class KOListView : public KOEventView
  private:
    bool mForceShowCompletedTodos;
-    QPopupMenu* mCalPopup;
+    Q3PopupMenu* mCalPopup;
    KOListViewWhatsThis *mKOListViewWhatsThis;
    KOListViewListView *mListView;
    KOEventPopupMenu *mPopupMenu;
    KOListViewItem *mActiveItem;
-    QDict<Incidence> mUidDict;
+    Q3Dict<Incidence> mUidDict;
    QDate mStartDate;
    void keyPressEvent ( QKeyEvent * ) ;
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 85e9166..ca55c43 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -18,20 +18,32 @@
 */
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qfont.h>
 #include <qfontmetrics.h>
-#include <qkeycode.h>
+#include <qnamespace.h>
-#include <qhbox.h>
+#include <q3hbox.h>
-#include <qvbox.h>
+#include <q3vbox.h>
-#include <qwidgetstack.h>
+#include <q3widgetstack.h>
 #include <qpushbutton.h>
 #include <qtooltip.h>
 #include <qpainter.h>
 #include <qtimer.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #else
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QLabel>
+#include <QPixmap>
+#include <QFocusEvent>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <Q3VBoxLayout>
+#include <Q3Frame>
+#include <Q3PointArray>
+#include <Q3PtrList>
 #endif
@@ -60,8 +72,8 @@
 QToolTipGroup *MonthViewCell::mToolTipGroup = 0; 
 #endif
-class KNOWhatsThis :public QWhatsThis
+class KNOWhatsThis :public Q3WhatsThis
 {
 public:
-    KNOWhatsThis( KNoScrollListBox* sbox ) : QWhatsThis( sbox ), _wid( sbox) { };
+    KNOWhatsThis( KNoScrollListBox* sbox ) : Q3WhatsThis( sbox ), _wid( sbox) { };
    //~KNOWhatsThis( ) {qDebug("~KNOWhatsThis( ) "); };
@@ -78,5 +90,5 @@ private:
 KNoScrollListBox::KNoScrollListBox(QWidget *parent,const char *name)
-    : QListBox(parent, name, WRepaintNoErase)
+    : Q3ListBox(parent, name, Qt::WNoAutoErase)
 {
 #ifndef DESKTOP_VERSION
@@ -86,6 +98,6 @@ KNoScrollListBox::KNoScrollListBox(QWidget *parent,const char *name)
    mWT = new KNOWhatsThis(this);
    resetOnFocusIn = true;
-    setVScrollBarMode(QScrollView::AlwaysOff);
+    setVScrollBarMode(Q3ScrollView::AlwaysOff);
-    setHScrollBarMode(QScrollView::AlwaysOff);
+    setHScrollBarMode(Q3ScrollView::AlwaysOff);
 }
 KNoScrollListBox::~KNoScrollListBox()
@@ -101,5 +113,5 @@ KNoScrollListBox::~KNoScrollListBox()
 void KNoScrollListBox::focusInEvent ( QFocusEvent * e )
 {
-    QListBox::focusInEvent ( e );
+    Q3ListBox::focusInEvent ( e );
    if ( count() ){
        int ci = currentItem();
@@ -113,22 +125,22 @@ void KNoScrollListBox::focusInEvent ( QFocusEvent * e )
        if (  KOPrefs::instance()->mEnableMonthScroll || KOPrefs::instance()->mMonthViewWeek ) {
-            QListBoxItem *fi =  firstItem ();
+            Q3ListBoxItem *fi =  firstItem ();
            if (fi ) {
                int ihei = fi->height( this );
                int hei = numRows ()  * ihei;
                if ( hei < height() - horizontalScrollBar()->height () ) {
-                    setVScrollBarMode(QScrollView::AlwaysOff);
+                    setVScrollBarMode(Q3ScrollView::AlwaysOff);
                }
                else 
-                    setVScrollBarMode(QScrollView::Auto);
+                    setVScrollBarMode(Q3ScrollView::Auto);
                if ( ihei *3 > height() ) {
-                    setHScrollBarMode(QScrollView::AlwaysOff);
+                    setHScrollBarMode(Q3ScrollView::AlwaysOff);
                }
                else {
-                    setHScrollBarMode(QScrollView::Auto);
+                    setHScrollBarMode(Q3ScrollView::Auto);
                }
            } else {
-                setVScrollBarMode(QScrollView::Auto);
+                setVScrollBarMode(Q3ScrollView::Auto);
-                setHScrollBarMode(QScrollView::Auto);
+                setHScrollBarMode(Q3ScrollView::Auto);
            }
        } 
@@ -142,8 +154,8 @@ void KNoScrollListBox::focusOutEvent ( QFocusEvent * e )
      setSelected ( i, false ); 
    }
-    QListBox::focusOutEvent ( e ); 
+    Q3ListBox::focusOutEvent ( e ); 
  }
-    setVScrollBarMode(QScrollView::AlwaysOff);
+    setVScrollBarMode(Q3ScrollView::AlwaysOff);
-    setHScrollBarMode(QScrollView::AlwaysOff);
+    setHScrollBarMode(Q3ScrollView::AlwaysOff);
    if ( ! mBlockDeselect )
      emit highlightIncidence( 0, (MonthViewCell*)this, 0 );
@@ -153,5 +165,5 @@ void KNoScrollListBox::focusOutEvent ( QFocusEvent * e )
 QString KNoScrollListBox::getWhatsThisText(QPoint p) 
 {
-    QListBoxItem* item = itemAt ( p );
+    Q3ListBoxItem* item = itemAt ( p );
    if ( ! item ) {
        return i18n("Click in the cell\nto add an event!");
@@ -166,5 +178,5 @@ void KNoScrollListBox::keyPressEvent(QKeyEvent *e)
    //qDebug("KNoScrollListBox::keyPressEvent ");
    switch(e->key()) {
-    case Key_Right:
+        case Qt::Key_Right:
        if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton  )
        {
@@ -174,5 +186,5 @@ void KNoScrollListBox::keyPressEvent(QKeyEvent *e)
        scrollBy(10,0);
        break;
-    case Key_Left:
+        case Qt::Key_Left:
        if (e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton )
        {
@@ -182,5 +194,5 @@ void KNoScrollListBox::keyPressEvent(QKeyEvent *e)
        scrollBy(-10,0);
        break;
-    case Key_Up:
+        case Qt::Key_Up:
        if( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton)  {
            e->ignore();
@@ -202,5 +214,5 @@ void KNoScrollListBox::keyPressEvent(QKeyEvent *e)
        }
        break;
-    case Key_Down:
+        case Qt::Key_Down:
        if(e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton)  {
            e->ignore();
@@ -222,10 +234,10 @@ void KNoScrollListBox::keyPressEvent(QKeyEvent *e)
        }
        break;
-    case Key_I:
+        case Qt::Key_I:
        QTimer::singleShot( 1, this, SLOT ( oneDown() ) );
        e->ignore();
        break; 
-    case Key_Return:
+        case Qt::Key_Return:
-    case Key_Enter:
+        case Qt::Key_Enter:
        {
            if ( currentItem() >= 0 ) {
@@ -237,5 +249,5 @@ void KNoScrollListBox::keyPressEvent(QKeyEvent *e)
        }
        break;
-    case Key_Shift:
+    case Qt::Key_Shift:
        emit shiftDown();
        break;
@@ -267,5 +279,5 @@ void KNoScrollListBox::keyReleaseEvent(QKeyEvent *e)
 {
    switch(e->key()) {
-    case Key_Shift:
+    case Qt::Key_Shift:
        emit shiftUp();
        break;
@@ -277,7 +289,7 @@ void KNoScrollListBox::keyReleaseEvent(QKeyEvent *e)
 void KNoScrollListBox::mousePressEvent(QMouseEvent *e)
 {
-    QListBox::mousePressEvent(e);
+    Q3ListBox::mousePressEvent(e);
-    if(e->button() == RightButton) {
+    if(e->button() == Qt::RightButton) {
        emit rightClick();
    }
@@ -285,5 +297,5 @@ void KNoScrollListBox::mousePressEvent(QMouseEvent *e)
 MonthViewItem::MonthViewItem( Incidence *incidence, const QString & s)
-    : QListBoxItem()
+    : Q3ListBoxItem()
 {
    mblockRepaint = true;
@@ -396,5 +408,5 @@ void MonthViewItem::paint(QPainter *p)
        p->drawLine ( x+1, yyy, x +sizeM +sizeM/2-1, yyy ) ;
        if ( mMultiday == 2 || mMultiday == 3 ) { 
-            QPointArray pa ( 3 );
+            Q3PointArray pa ( 3 );
            pa.setPoint (0,  x, yyy );
            pa.setPoint (1,  x+sizeM/2, yyy+sizeM/2 );
@@ -403,5 +415,5 @@ void MonthViewItem::paint(QPainter *p)
        }
        if ( mMultiday == 2 || mMultiday == 1 ) { 
-            QPointArray pa ( 3 );
+            Q3PointArray pa ( 3 );
            pa.setPoint (0,  x+sizeM +sizeM/2, yyy );
            pa.setPoint (1,  x+sizeM, yyy+sizeM/2 );
@@ -463,5 +475,5 @@ void MonthViewItem::paint(QPainter *p)
 }
-int MonthViewItem::height(const QListBox *lb) const
+int MonthViewItem::height(const Q3ListBox *lb) const
 {
    int ret = 10;
@@ -471,5 +483,5 @@ int MonthViewItem::height(const QListBox *lb) const
 }
-int MonthViewItem::width(const QListBox *lb) const
+int MonthViewItem::width(const Q3ListBox *lb) const
 { 
    if( KOPrefs::instance()->mEnableMonthScroll || isWeekItem ) {
@@ -515,8 +527,8 @@ MonthViewCell::MonthViewCell( KOMonthView *parent,QWidget* par )
    //mLabel->setAlignment( AlignCenter );
    mLabel->setFlat( true );
-    mLabel->setFocusPolicy(NoFocus); 
+    mLabel->setFocusPolicy(Qt::NoFocus); 
    //mItemList = new KNoScrollListBox( this );
    setMinimumSize( 10, 10 );
-    setFrameStyle( QFrame::Panel | QFrame::Plain );
+    setFrameStyle( Q3Frame::Panel | Q3Frame::Plain );
    setLineWidth( 1 );
    //topLayout->addWidget( mItemList );
@@ -530,11 +542,11 @@ MonthViewCell::MonthViewCell( KOMonthView *parent,QWidget* par )
    //connect( mLabel, SIGNAL( clicked( )), SLOT( newEvent() ));
    connect( mLabel, SIGNAL( clicked( )), SLOT( showDay() ));
-    connect( this , SIGNAL( doubleClicked( QListBoxItem *) ),
+    connect( this , SIGNAL( doubleClicked( Q3ListBoxItem *) ),
-             SLOT( defaultAction( QListBoxItem * ) ) );
+             SLOT( defaultAction( Q3ListBoxItem * ) ) );
-    connect( this, SIGNAL( rightButtonPressed( QListBoxItem *,
+    connect( this, SIGNAL( rightButtonPressed( Q3ListBoxItem *,
                                                    const QPoint &) ),
-             SLOT( contextMenu( QListBoxItem * ) ) );
+             SLOT( contextMenu( Q3ListBoxItem * ) ) );
-    connect( this, SIGNAL( highlighted( QListBoxItem *) ),
+    connect( this, SIGNAL( highlighted( Q3ListBoxItem *) ),
-             SLOT( selection( QListBoxItem * ) ) );
+             SLOT( selection( Q3ListBoxItem * ) ) );
   
    /* 
@@ -546,5 +558,5 @@ MonthViewCell::MonthViewCell( KOMonthView *parent,QWidget* par )
 QToolTipGroup *MonthViewCell::toolTipGroup()
 {
-    if (!mToolTipGroup) mToolTipGroup = new QToolTipGroup(0);
+    /* TODO:hacker: if (!mToolTipGroup) mToolTipGroup = new QToolTipGroup(0); */
    return mToolTipGroup;
 }
@@ -638,5 +650,5 @@ void MonthViewCell::startUpdateCell()
    blockSignals( true );
    mdayCount = 0;
-    setFocusPolicy(NoFocus); 
+    setFocusPolicy(Qt::NoFocus); 
    if ( !mMonthView->isUpdatePossible() )
        return;
@@ -693,5 +705,5 @@ int MonthViewCell::insertEvent(Event *event)
 #endif    
    QString mToolTipText;
-    setFocusPolicy(WheelFocus); 
+    setFocusPolicy(Qt::WheelFocus); 
        if ( !(event->doesRecur() == Recurrence::rNone) ) {
            if ( !KOPrefs::instance()->mMonthDailyRecur && event->doesRecur() == Recurrence::rDaily )
@@ -835,5 +847,5 @@ int MonthViewCell::insertEvent(Event *event)
            for ( i = pos; i < itcount;++i ) {
                // qDebug("i %d mday %u count %d ",i,itcount,mdayCount );
-                QListBoxItem* it = this->item ( i );
+                Q3ListBoxItem* it = this->item ( i );
                if ( it && text < it->text() ) {
                    pos = i;
@@ -851,5 +863,5 @@ int MonthViewCell::insertEvent(Event *event)
 void MonthViewCell::insertTodo(Todo *todo)
 {
-    setFocusPolicy(WheelFocus); 
+    setFocusPolicy(Qt::WheelFocus); 
      QString text;
        if (todo->hasDueDate()) {
@@ -923,5 +935,5 @@ void MonthViewCell::finishUpdateCell()
    if (mToolTip.count() > 0 ) {
        mToolTip.sort();
-        QToolTip::add(this,mToolTip.join("\n"),toolTipGroup(),"");
+        /* TODO: hacker: QToolTip::add(this,mToolTip.join("\n"),toolTipGroup(),""); */
    }
 #endif
@@ -939,5 +951,5 @@ void MonthViewCell::updateCell()
    startUpdateCell();
    //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2);
-    QPtrList<Event> events = mMonthView->calendar()->events( mDate, true );
+    Q3PtrList<Event> events = mMonthView->calendar()->events( mDate, true );
    Event *event;
    for( event = events.first(); event; event = events.next() ) { // for event
@@ -945,5 +957,5 @@ void MonthViewCell::updateCell()
    }
    // insert due todos
-    QPtrList<Todo> todos = mMonthView->calendar()->todos( mDate );
+    Q3PtrList<Todo> todos = mMonthView->calendar()->todos( mDate );
    Todo *todo;
    for(todo = todos.first(); todo; todo = todos.next()) {
@@ -993,26 +1005,26 @@ void MonthViewCell::enableScrollBars( bool enabled )
    return;
    if ( enabled ) {
-        QListBoxItem *fi =  firstItem ();
+        Q3ListBoxItem *fi =  firstItem ();
        if (fi ) {
            int ihei = fi->height( this );
            int hei = numRows ()  * ihei;
            if ( hei < height() - horizontalScrollBar()->height () ) {
-                setVScrollBarMode(QScrollView::AlwaysOff);
+                setVScrollBarMode(Q3ScrollView::AlwaysOff);
            }
            else 
-                setVScrollBarMode(QScrollView::Auto);
+                setVScrollBarMode(Q3ScrollView::Auto);
            if ( ihei *3 > height() ) {
-                setHScrollBarMode(QScrollView::AlwaysOff);
+                setHScrollBarMode(Q3ScrollView::AlwaysOff);
            }
            else {
-                setHScrollBarMode(QScrollView::Auto);
+                setHScrollBarMode(Q3ScrollView::Auto);
            }
        } else {
-            setVScrollBarMode(QScrollView::Auto);
+            setVScrollBarMode(Q3ScrollView::Auto);
-            setHScrollBarMode(QScrollView::Auto);
+            setHScrollBarMode(Q3ScrollView::Auto);
        }
    } else {
-        setVScrollBarMode(QScrollView::AlwaysOff);
+        setVScrollBarMode(Q3ScrollView::AlwaysOff);
-        setHScrollBarMode(QScrollView::AlwaysOff);
+        setHScrollBarMode(Q3ScrollView::AlwaysOff);
    }
 }
@@ -1084,5 +1096,5 @@ void MonthViewCell::resizeEvent ( QResizeEvent * e )
 }
-void MonthViewCell::defaultAction( QListBoxItem *item )
+void MonthViewCell::defaultAction( Q3ListBoxItem *item )
 {
  
@@ -1106,5 +1118,5 @@ void MonthViewCell::newEvent()
    emit newEventSignal( dt );
 }
-void MonthViewCell::cellClicked( QListBoxItem *item )
+void MonthViewCell::cellClicked( Q3ListBoxItem *item )
 {
    mMonthView->setSelectedCell( this );
@@ -1117,5 +1129,5 @@ void MonthViewCell::cellClicked( QListBoxItem *item )
 }
-void MonthViewCell::contextMenu( QListBoxItem *item )
+void MonthViewCell::contextMenu( Q3ListBoxItem *item )
 {
    mMonthView->setPopupCell( this );
@@ -1134,5 +1146,5 @@ void MonthViewCell::contextMenu( QListBoxItem *item )
 }
-void MonthViewCell::selection( QListBoxItem *item )
+void MonthViewCell::selection( Q3ListBoxItem *item )
 {
    if ( !item ) {
@@ -1186,6 +1198,6 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
    mPopupCell = 0;
    mNavigatorBar = new NavigatorBar( QDate::currentDate(), this, "useBigPixmaps" );
-    mWidStack = new QWidgetStack( this );
+    mWidStack = new Q3WidgetStack( this );
-    QVBoxLayout* hb = new QVBoxLayout( this );
+    Q3VBoxLayout* hb = new Q3VBoxLayout( this );
    mMonthView = new QWidget( mWidStack );
    mWeekView = new QWidget( mWidStack );
@@ -1216,13 +1228,13 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
        QLabel *label = new QLabel( mMonthView );
        label->setFont(bfont);
-        label->setFrameStyle(QFrame::Panel|QFrame::Raised);
+        label->setFrameStyle(Q3Frame::Panel|Q3Frame::Raised);
        label->setLineWidth(1);
-        label->setAlignment(AlignCenter);
+        label->setAlignment(Qt::AlignCenter);
        mDayLabels.insert( i, label );
        label = new QLabel( mWeekView );
        label->setFont(bfont);
-        label->setFrameStyle(QFrame::Panel|QFrame::Raised);
+        label->setFrameStyle(Q3Frame::Panel|Q3Frame::Raised);
        label->setLineWidth(1);
-        label->setAlignment(AlignCenter);
+        label->setAlignment(Qt::AlignCenter);
        mDayLabelsW.insert( i, label );
    }
@@ -1233,9 +1245,9 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
    for( i = 0; i < mNumWeeks+1; i++ ) {
        KOWeekButton *label = new KOWeekButton( mMonthView );
-        label->setFocusPolicy(NoFocus); 
+        label->setFocusPolicy(Qt::NoFocus); 
        label->setFont(bfont);
        connect( label, SIGNAL( selectWeekNum ( int )),this, SLOT( selectInternalWeekNum ( int ))   );  
        label->setFlat(true);
-        QWhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed"));
+        Q3WhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed"));
        //label->setFrameStyle(QFrame::Panel|QFrame::Raised);
        //label->setLineWidth(1);
@@ -1244,14 +1256,14 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
    }
    mWeekLabels[mNumWeeks]->setText( i18n("W"));
-    mWeekLabels[mNumWeeks]->setFocusPolicy(WheelFocus);
+    mWeekLabels[mNumWeeks]->setFocusPolicy(Qt::WheelFocus);
-    QWhatsThis::add(mWeekLabels[mNumWeeks],i18n("Click on this to\nselect week number"));
+    Q3WhatsThis::add(mWeekLabels[mNumWeeks],i18n("Click on this to\nselect week number"));
    
    for( i = 0; i < 1+1; i++ ) {
        KOWeekButton *label = new KOWeekButton( mWeekView );
-        label->setFocusPolicy(NoFocus); 
+        label->setFocusPolicy(Qt::NoFocus); 
        label->setFont(bfont);
        connect( label, SIGNAL( selectWeekNum ( int )),this, SLOT( selectInternalWeekNum ( int ))   );  
        label->setFlat(true);
-        QWhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed"));
+        Q3WhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed"));
        //label->setFrameStyle(QFrame::Panel|QFrame::Raised);
        //label->setLineWidth(1);
@@ -1260,5 +1272,5 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
    }
    mWeekLabelsW[1]->setText( i18n("W"));
-    mWeekLabelsW[1]->setFocusPolicy(WheelFocus); 
+    mWeekLabelsW[1]->setFocusPolicy(Qt::WheelFocus); 
@@ -1306,11 +1318,11 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
    //connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), SLOT( switchView() ) );
    mContextMenu = eventPopup();
-    mContextMenu->addAdditionalItem(QIconSet(QPixmap()),
+    mContextMenu->addAdditionalItem(QIcon(QPixmap()),
                                  i18n("New Event..."),this,
                                  SLOT(slotNewEvent()),false);
-    mContextMenu->addAdditionalItem(QIconSet(QPixmap()),
+    mContextMenu->addAdditionalItem(QIcon(QPixmap()),
                                  i18n("New Todo..."),this,
                                  SLOT(slotNewTodo()),false);
-    mContextMenu->addAdditionalItem(QIconSet(QPixmap()),
+    mContextMenu->addAdditionalItem(QIcon(QPixmap()),
                                  i18n("Journal"),this,
                                  SLOT(slotEditJournal()),false);
@@ -1326,5 +1338,5 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
    } else
        pathString += "iconsmini/";
-    mNewItemMenu = new QPopupMenu( this );
+    mNewItemMenu = new Q3PopupMenu( this );
    mNewItemMenu->insertItem( SmallIcon( pathString +"newevent" ), i18n("New Event..."),this, SLOT(slotNewEvent()));
    mNewItemMenu->insertItem( SmallIcon( pathString +"newtodo" ),i18n("New Todo..."),this,SLOT(slotNewTodo()),false);
@@ -1398,5 +1410,5 @@ void KOMonthView::incidenceHighlighted( Incidence * inc , MonthViewCell* mc, int
        }
    }
-    QPtrVector<MonthViewCell> *cells;
+    Q3PtrVector<MonthViewCell> *cells;
    if ( weekview ) 
        cells = &mCellsW;
@@ -1496,7 +1508,7 @@ int KOMonthView::currentDateCount()
 }
-QPtrList<Incidence> KOMonthView::selectedIncidences()
+Q3PtrList<Incidence> KOMonthView::selectedIncidences()
 {
-    QPtrList<Incidence> selected;
+    Q3PtrList<Incidence> selected;
    if ( mSelectedCell ) {
@@ -1562,5 +1574,5 @@ void KOMonthView::updateConfig()
    }
 #ifdef DESKTOP_VERSION
-    MonthViewCell::toolTipGroup()->setEnabled(KOPrefs::instance()->mEnableToolTips); 
+    /* TODO:hacker: MonthViewCell::toolTipGroup()->setEnabled(KOPrefs::instance()->mEnableToolTips);  */
 #endif
    updateView();
@@ -1570,5 +1582,5 @@ void KOMonthView::updateDayLabels()
 {
  
-    QPtrVector<QLabel> *mDayLabelsT;
+    Q3PtrVector<QLabel> *mDayLabelsT;
    mDayLabelsT = &mDayLabelsW;
@@ -1611,7 +1623,7 @@ void KOMonthView::showDates(const QDate &start, const QDate &)
    //  kdDebug() << "KOMonthView::showDates(): " << start.toString() << endl;
-    QPtrVector<MonthViewCell> *cells;
+    Q3PtrVector<MonthViewCell> *cells;
-    QPtrVector<QLabel> *dayLabels;
+    Q3PtrVector<QLabel> *dayLabels;
-    QPtrVector<KOWeekButton> *weekLabels;
+    Q3PtrVector<KOWeekButton> *weekLabels;
    uint weekNum = 6;
    mStartDate = start;
@@ -1669,5 +1681,5 @@ void KOMonthView::showDates(const QDate &start, const QDate &)
 }
-void KOMonthView::showEvents(QPtrList<Event>)
+void KOMonthView::showEvents(Q3PtrList<Event>)
 {
    qDebug("KOMonthView::selectEvents is not implemented yet. ");
@@ -1691,5 +1703,5 @@ void KOMonthView::updateView()
    //ti.start();
    clearSelection();
-    QPtrVector<MonthViewCell> *cells;
+    Q3PtrVector<MonthViewCell> *cells;
    if ( mShowWeekView ) {
        cells = &mCellsW;
@@ -1706,5 +1718,5 @@ void KOMonthView::updateView()
    }
 
-    QPtrList<Event> events = calendar()->events();
+    Q3PtrList<Event> events = calendar()->events();
    Event *event;
    QDateTime dt;
@@ -1770,5 +1782,5 @@ void KOMonthView::updateView()
    }
    // insert due todos
-    QPtrList<Todo> todos = calendar()->todos( );
+    Q3PtrList<Todo> todos = calendar()->todos( );
    Todo *todo;
    for(todo = todos.first(); todo; todo = todos.next()) {
@@ -2226,5 +2238,5 @@ void KOMonthView::setSelectedCell( MonthViewCell *cell )
 void KOMonthView::processSelectionChange()
 {
-    QPtrList<Incidence> incidences = selectedIncidences();
+    Q3PtrList<Incidence> incidences = selectedIncidences();
    if (incidences.count() > 0) {
        emit incidenceSelected( incidences.first() );
@@ -2262,5 +2274,5 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e )
        mFlagKeyPressed = true;
    switch(e->key()) {
-    case Key_Up: 
+        case Qt::Key_Up: 
        {
            if ( mShowWeekView ) {
@@ -2273,5 +2285,5 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e )
        e->accept();
        break;
-    case Key_Down:
+        case Qt::Key_Down:
        {
            if ( mShowWeekView ) {
@@ -2285,6 +2297,6 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e )
        e->accept();
        break;
-    case Key_Return:
+        case Qt::Key_Return:
-    case Key_Enter:
+        case Qt::Key_Enter:
        {
            selectInternalWeekNum ( currentWeek() );
@@ -2292,5 +2304,5 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e )
        e->accept();
        break;
-    case Key_D:
+        case Qt::Key_D:
        if ( mSelectedCell ) {
            mSelectedCell->showDay();
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 <q3valuelist.h>
-#include <qptrvector.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 height(const Q3ListBox *) const;
-    virtual int width(const QListBox *) const;
+    virtual int width(const Q3ListBox *) const;
  private:
@@ -199,13 +206,13 @@ public slots:
    void repaintfinishUpdateCell();
  protected slots: 
-    void defaultAction( QListBoxItem * );
+    void defaultAction( Q3ListBoxItem * );
-    void contextMenu( QListBoxItem * );
+    void contextMenu( Q3ListBoxItem * );
-    void selection( QListBoxItem * );
+    void selection( Q3ListBoxItem * );
-    void cellClicked( QListBoxItem * );
+    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;
+    Q3PtrVector<MonthViewCell> mCells;
-    QPtrVector<QLabel> mDayLabels;
+    Q3PtrVector<QLabel> mDayLabels;
-    QPtrVector<KOWeekButton> mWeekLabels;
+    Q3PtrVector<KOWeekButton> mWeekLabels;
-    QPtrVector<MonthViewCell> mCellsW;
+    Q3PtrVector<MonthViewCell> mCellsW;
-    QPtrVector<QLabel> mDayLabelsW;
+    Q3PtrVector<QLabel> mDayLabelsW;
-    QPtrVector<KOWeekButton> mWeekLabelsW;
+    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 * ) ;
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 5078c57..0bd46ea 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -27,5 +27,5 @@
 #endif
 #include <qdir.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qtextcodec.h>
 #include <qstring.h>
@@ -306,5 +306,5 @@ KOPrefs::KOPrefs() :
  KPrefs::setCurrentGroup("KOrganizer Plugins");
-  addItemStringList("SelectedPlugins",&mSelectedPlugins,"holidays");
+  addItemStringList("SelectedPlugins",&mSelectedPlugins,QStringList("holidays"));
  KPrefs::setCurrentGroup("Group Scheduling");
@@ -312,5 +312,5 @@ KOPrefs::KOPrefs() :
  addItemInt("IMIPScheduler",&mIMIPScheduler,IMIPKMail);
  addItemInt("IMIPSend",&mIMIPSend,IMIPdirectsend);
-  addItemStringList("AdditionalMails",&mAdditionalMails,"");
+  addItemStringList("AdditionalMails",&mAdditionalMails,QStringList());
  addItemInt("IMIP auto refresh",&mIMIPAutoRefresh,neverAuto);
  addItemInt("IMIP auto insert request",&mIMIPAutoInsertRequest,neverAuto);
@@ -567,5 +567,5 @@ void KOPrefs::usrWriteConfig()
  config()->setGroup("Category Colors");
-  QDictIterator<QColor> it(mCategoryColors);
+  Q3DictIterator<QColor> it(mCategoryColors);
  while (it.current()) {
    config()->writeEntry(it.currentKey(),*(it.current()));
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 94bdd33..35c6110 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -26,7 +26,10 @@
 #include <libkdepim/kpimprefs.h>
-#include <qdict.h>
+#include <q3dict.h>
 #include <qdir.h>
 #include <qobject.h>
+#include <QDateTime>
+//Added by qt3to4:
+#include <Q3PtrList>
 class KConfig;
@@ -348,5 +351,5 @@ class KOPrefs : public KPimPrefs
    int mCurrentDisplayedView;
-    QPtrList<KopiCalendarFile> mCalendars;
+    Q3PtrList<KopiCalendarFile> mCalendars;
    int mNextAvailableCalendar;
    bool mGlobalUpdateDisabled;
@@ -363,6 +366,6 @@ class KOPrefs : public KPimPrefs
  private:
-    QDict<QColor> mCategoryColors;
+    Q3Dict<QColor> mCategoryColors;
-    QArray<KopiCalendarFile*> mDefCalColors;
+    QVector<KopiCalendarFile*> mDefCalColors;
    QColor mDefaultCategoryColor;
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index f1a6c3d..43c488f 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -24,14 +24,14 @@
 #include <qlayout.h>
 #include <qlabel.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <qlineedit.h>
 #include <qfont.h>
 #include <qslider.h>
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qcombobox.h>
-#include <qvbox.h>
+#include <q3vbox.h>
-#include <qhbox.h>
+#include <q3hbox.h>
 #include <qregexp.h>
 #include <qspinbox.h>
@@ -40,6 +40,12 @@
 #include <qradiobutton.h>
 #include <qpushbutton.h>
-#include <qstrlist.h>
+#include <q3strlist.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3GridLayout>
+#include <QPixmap>
+#include <Q3Frame>
 #include <kcolorbutton.h>
@@ -117,6 +123,6 @@ void KOPrefsDialog::setupLocaleDateTab()
 {
 #if 0
-QFrame *topFrame = addPage(i18n("Date Format"),0,0);
+Q3Frame *topFrame = addPage(i18n("Date Format"),0,0);
-   QGridLayout *topLayout = new QGridLayout(topFrame,3,2);
+   Q3GridLayout *topLayout = new Q3GridLayout(topFrame,3,2);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);  
@@ -173,6 +179,6 @@ void  KOPrefsDialog::setupLocaleTab()
 {
 #if 0
- QFrame *topFrame = addPage(i18n("Locale"),0,0);
+ Q3Frame *topFrame = addPage(i18n("Locale"),0,0);
-   QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
+   Q3GridLayout *topLayout = new Q3GridLayout(topFrame,4,2);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);  
@@ -212,5 +218,5 @@ void  KOPrefsDialog::setupLocaleTab()
   else {
       QWidget * hb = new QWidget( topFrame );
-       QHBoxLayout  *hbLayout = new QHBoxLayout(hb);
+       Q3HBoxLayout  *hbLayout = new Q3HBoxLayout(hb);
       sb =
           addWidBool(i18n("Week starts on Sunday"),
@@ -237,8 +243,8 @@ void  KOPrefsDialog::setupLocaleTab()
 void KOPrefsDialog::setupMainTab()
 {
-    QFrame *topFrame = addPage(i18n("General"),0,0);
+    Q3Frame *topFrame = addPage(i18n("General"),0,0);
    // DesktopIcon("identity",KIcon::SizeMedium));
-  QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
+  Q3GridLayout *topLayout = new Q3GridLayout(topFrame,5,2);
  topLayout->setSpacing(mSpacingHint);
  topLayout->setMargin(mMarginHint);
@@ -288,10 +294,10 @@ void KOPrefsDialog::setupMainTab()
  if (  QApplication::desktop()->height() <= 240 ) {
      topFrame = addPage(i18n("General") +" 2",0,0);
-      topLayout = new QGridLayout(topFrame,4,2);
+      topLayout = new Q3GridLayout(topFrame,4,2);
      topLayout->setSpacing(2);
      topLayout->setMargin(3);
      iii = 0;
  }
-  QHBox *dummy = new QHBox(topFrame);
+  Q3HBox *dummy = new Q3HBox(topFrame);
  new QLabel(i18n("Days in Next-X-Days:"),dummy);
  mNextXDaysSpin = new QSpinBox(2,14,1,dummy);
@@ -314,5 +320,5 @@ void KOPrefsDialog::setupMainTab()
  //         &(KOPrefs::instance()->mAutoSave),autoSaveGroup);
-  QHBox *intervalBox = new QHBox(topFrame);
+  Q3HBox *intervalBox = new Q3HBox(topFrame);
  // intervalBox->setSpacing(mSpacingHint);
  topLayout->addMultiCellWidget(intervalBox,iii,iii,0,1);
@@ -403,12 +409,12 @@ void KOPrefsDialog::setupMainTab()
 void KOPrefsDialog::setupTimeTab()
 {
-    QFrame *topFrame = addPage(i18n("Time"),0,0);
+    Q3Frame *topFrame = addPage(i18n("Time"),0,0);
    // DesktopIcon("clock",KIcon::SizeMedium));
-  QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
+  Q3GridLayout *topLayout = new Q3GridLayout(topFrame,4,2);
  topLayout->setSpacing(mSpacingHint);
  topLayout->setMargin(mMarginHint);
 
-  QHBox *dummy = new QHBox(topFrame);
+  Q3HBox *dummy = new Q3HBox(topFrame);
  KPrefsDialogWidTime *dayBegins =
      addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins),
@@ -442,5 +448,5 @@ void KOPrefsDialog::setupTimeTab()
  if (  QApplication::desktop()->height() <= 240 ) {
      topFrame = addPage(i18n("Time") +" 2",0,0);
-      topLayout = new QGridLayout(topFrame,1,2);
+      topLayout = new Q3GridLayout(topFrame,1,2);
      topLayout->setSpacing(2);
      topLayout->setMargin(3);
@@ -448,5 +454,5 @@ void KOPrefsDialog::setupTimeTab()
  }
-  QGroupBox *workingHoursGroup = new QGroupBox(1,Horizontal,
+  Q3GroupBox *workingHoursGroup = new Q3GroupBox(1,Qt::Horizontal,
                                               i18n("Working Hours"),
                                               topFrame);
@@ -454,14 +460,14 @@ void KOPrefsDialog::setupTimeTab()
  workingHoursGroup->layout()->setSpacing( 0 );
  workingHoursGroup->layout()->setMargin( 4 );
-  QHBox *workStartBox = new QHBox(workingHoursGroup);
+  Q3HBox *workStartBox = new Q3HBox(workingHoursGroup);
  // workStartBox->setMargin( 0 );
  addWidTime(i18n("Daily starting hour:"),
             &(KOPrefs::instance()->mWorkingHoursStart),workStartBox);
-  QHBox *workEndBox = new QHBox(workingHoursGroup);
+  Q3HBox *workEndBox = new Q3HBox(workingHoursGroup);
  //workEndBox->setMargin( 0 );
  addWidTime(i18n("Daily ending hour:"),
             &(KOPrefs::instance()->mWorkingHoursEnd),workEndBox);
-  QVBox *excludeBox  = new QVBox(workingHoursGroup);
+  Q3VBox *excludeBox  = new Q3VBox(workingHoursGroup);
  //excludeBox->setMargin( 0 );
  addWidBool(i18n("Exclude holidays"),
@@ -483,8 +489,8 @@ void KOPrefsDialog::setupViewsTab()
 {
-    QFrame *topFrame = addPage(i18n("Views"),0,0);
+    Q3Frame *topFrame = addPage(i18n("Views"),0,0);
    //  DesktopIcon("viewmag",KIcon::SizeMedium));
-  QGridLayout *topLayout = new QGridLayout(topFrame,6,1);
+  Q3GridLayout *topLayout = new Q3GridLayout(topFrame,6,1);
  topLayout->setSpacing(mSpacingHint);
  topLayout->setMargin(mMarginHint);
@@ -531,5 +537,5 @@ void KOPrefsDialog::setupViewsTab()
    //  DesktopIcon("viewmag",KIcon::SizeMedium));
-  topLayout = new QGridLayout(topFrame,6,1);
+  topLayout = new Q3GridLayout(topFrame,6,1);
  topLayout->setSpacing(mSpacingHint);
  topLayout->setMargin(mMarginHint);
@@ -595,5 +601,5 @@ void KOPrefsDialog::setupViewsTab()
    //  DesktopIcon("viewmag",KIcon::SizeMedium));
-  topLayout = new QGridLayout(topFrame,5,1);
+  topLayout = new Q3GridLayout(topFrame,5,1);
  topLayout->setSpacing(mSpacingHint);
  topLayout->setMargin(mMarginHint);
@@ -653,10 +659,10 @@ void KOPrefsDialog::setupViewsTab()
    //  DesktopIcon("viewmag",KIcon::SizeMedium));
-  topLayout = new QGridLayout(topFrame,5,1);
+  topLayout = new Q3GridLayout(topFrame,5,1);
  topLayout->setSpacing(mSpacingHint);
  topLayout->setMargin(mMarginHint);
  ii = 0;
  QLabel *lab;
-  QHBox *habo = new QHBox( topFrame );
+  Q3HBox *habo = new Q3HBox( topFrame );
  if ( QApplication::desktop()->width() <= 480 ) {
      lab = new QLabel ( i18n("Show events that recur "), topFrame );
@@ -678,5 +684,5 @@ void KOPrefsDialog::setupViewsTab()
-  habo = new QHBox( topFrame ); 
+  habo = new Q3HBox( topFrame ); 
  if ( QApplication::desktop()->width() <= 480 ) {
      lab = new QLabel (i18n("Show in every cell ") , topFrame );
@@ -731,5 +737,5 @@ void KOPrefsDialog::setupViewsTab()
  if (  QApplication::desktop()->height() <= 240 ) {
      topFrame = addPage(i18n("Month View") +" 2",0,0);
-      topLayout = new QGridLayout(topFrame,4,1);
+      topLayout = new Q3GridLayout(topFrame,4,1);
      topLayout->setSpacing(2);
      topLayout->setMargin(1);
@@ -765,5 +771,5 @@ void KOPrefsDialog::setupViewsTab()
  //  DesktopIcon("viewmag",KIcon::SizeMedium));
  
-  topLayout = new QGridLayout(topFrame,4,1);
+  topLayout = new Q3GridLayout(topFrame,4,1);
  topLayout->setSpacing(mSpacingHint);
  topLayout->setMargin(mMarginHint);
@@ -771,5 +777,5 @@ void KOPrefsDialog::setupViewsTab()
-  QHBox* hdummy = new QHBox(topFrame);
+  Q3HBox* hdummy = new Q3HBox(topFrame);
  new QLabel(i18n("Days in What's Next:"),hdummy);
  mWhatsNextSpin = new QSpinBox(1,14,1,hdummy);
@@ -777,5 +783,5 @@ void KOPrefsDialog::setupViewsTab()
  topLayout->addWidget(hdummy,ii++,0);
-  QHBox *prioBox = new QHBox(topFrame);
+  Q3HBox *prioBox = new Q3HBox(topFrame);
  // intervalBox->setSpacing(mSpacingHint);
  topLayout->addWidget(prioBox,ii++,0);
@@ -819,5 +825,5 @@ void KOPrefsDialog::setupViewsTab()
    //  DesktopIcon("viewmag",KIcon::SizeMedium));
-  topLayout = new QGridLayout(topFrame,4,1);
+  topLayout = new Q3GridLayout(topFrame,4,1);
  topLayout->setSpacing(mSpacingHint);
  topLayout->setMargin(mMarginHint);
@@ -856,5 +862,5 @@ dummy =
      addWidColor(i18n("Color for running todos:"),
                  &(KOPrefs::instance()->mTodoRunColor),wid);
-  QHBoxLayout *widLayout = new QHBoxLayout(wid);
+  Q3HBoxLayout *widLayout = new Q3HBoxLayout(wid);
  widLayout->addWidget( todoRunColor->label() );
  widLayout->addWidget( todoRunColor->button() );
@@ -866,5 +872,5 @@ dummy =
      addWidColor(i18n("Todo due today color:"),
                  &(KOPrefs::instance()->mTodoDueTodayColor),wid);
-  widLayout = new QHBoxLayout(wid);
+  widLayout = new Q3HBoxLayout(wid);
  widLayout->addWidget( todoDueTodayColor->label() );
  widLayout->addWidget( todoDueTodayColor->button() );
@@ -874,5 +880,5 @@ dummy =
  // Todo overdue color
  wid = new QWidget( topFrame );
-  widLayout = new QHBoxLayout(wid);
+  widLayout = new Q3HBoxLayout(wid);
  KPrefsDialogWidColor *todoOverdueColor =
      addWidColor(i18n("Todo overdue color:"),
@@ -891,5 +897,5 @@ dummy =
   topFrame = addPage(i18n("View Options"),0,0);
-  topLayout = new QGridLayout(topFrame,4,1);
+  topLayout = new Q3GridLayout(topFrame,4,1);
  topLayout->setSpacing(mSpacingHint);
  topLayout->setMargin(mMarginHint);
@@ -930,5 +936,5 @@ dummy =
  topFrame = addPage(i18n("Conflict detection"),0,0);
-  topLayout = new QGridLayout(topFrame,2,1);
+  topLayout = new Q3GridLayout(topFrame,2,1);
  topLayout->setSpacing(mSpacingHint);
  topLayout->setMargin(mMarginHint);
@@ -937,7 +943,7 @@ dummy =
                       &(KOPrefs::instance()->mDetectConflicts),topFrame);
  topLayout->addWidget(dummy->checkBox(), ii++,0);
-  topFrame = new QFrame( topFrame );
+  topFrame = new Q3Frame( topFrame );
  topLayout->addWidget(topFrame ,ii++,0);
-  topLayout = new QGridLayout(topFrame,4,1); 
+  topLayout = new Q3GridLayout(topFrame,4,1); 
  connect ( dummy->checkBox(), SIGNAL( toggled( bool ) ), topFrame, SLOT ( setEnabled( bool ) ) );
  dummy = addWidBool(i18n("Include events which \"show as free\""),
@@ -971,5 +977,5 @@ dummy =
    //  DesktopIcon("viewmag",KIcon::SizeMedium));
-  topLayout = new QGridLayout(topFrame,2,1);
+  topLayout = new Q3GridLayout(topFrame,2,1);
  topLayout->setSpacing(mSpacingHint);
  topLayout->setMargin(mMarginHint);
@@ -990,24 +996,24 @@ dummy =
    lab->setAlignment( AlignLeft|WordBreak|AlignTop);
 #else
-    lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop);
+    lab->setAlignment( Qt::AlignLeft|Qt::TextWrapAnywhere|Qt::TextWordWrap|Qt::AlignTop);
    lab->setSizePolicy( QSizePolicy(  QSizePolicy::Ignored , QSizePolicy::Ignored,true) );
 #endif
 
-    QHBox* dummyBox = new QHBox(topFrame);
+    Q3HBox* dummyBox = new Q3HBox(topFrame);
    new QLabel(i18n("Play beeps count:"),dummyBox);
    mAlarmPlayBeeps = new QSpinBox(0,500,1,dummyBox);
    topLayout->addWidget(dummyBox,iii++,0);
-    dummyBox = new QHBox(topFrame);
+    dummyBox = new Q3HBox(topFrame);
    new QLabel(i18n("Beeps interval in sec:"),dummyBox);
    mAlarmBeepInterval = new QSpinBox(1,600,1,dummyBox);
    topLayout->addWidget(dummyBox,iii++,0);
-    dummyBox = new QHBox(topFrame);
+    dummyBox = new Q3HBox(topFrame);
    new QLabel(i18n("Default suspend time in min:"),dummyBox);
    mAlarmSuspendTime = new QSpinBox(1,600,1,dummyBox);
    topLayout->addWidget(dummyBox,iii++,0);
-    dummyBox = new QHBox(topFrame);
+    dummyBox = new Q3HBox(topFrame);
    new QLabel(i18n("Auto suspend count:"),dummyBox);
    mAlarmSuspendCount = new QSpinBox(0,60,1,dummyBox);
@@ -1016,5 +1022,5 @@ dummy =
-    QHBox* hbo = new QHBox ( topFrame );
+    Q3HBox* hbo = new Q3HBox ( topFrame );
    mDefaultAlarmFile = new QLineEdit(hbo);
    QPushButton * loadTemplate = new QPushButton(hbo); 
@@ -1056,8 +1062,8 @@ void KOPrefsDialog::setupFontsTab()
 {
 
-    QFrame *topFrame = addPage(i18n("Fonts"),0,0);
+    Q3Frame *topFrame = addPage(i18n("Fonts"),0,0);
    //  DesktopIcon("fonts",KIcon::SizeMedium));
-  QGridLayout *topLayout = new QGridLayout(topFrame,7,3);
+  Q3GridLayout *topLayout = new Q3GridLayout(topFrame,7,3);
  topLayout->setSpacing(1);
  topLayout->setMargin(3);
@@ -1126,5 +1132,5 @@ void KOPrefsDialog::setupFontsTab()
                             DesktopIcon("fonts",KIcon::SizeMedium));
-  topLayout = new QGridLayout(topFrame,7,3);
+  topLayout = new Q3GridLayout(topFrame,7,3);
  topLayout->setSpacing(1);
  topLayout->setMargin(3);
@@ -1194,8 +1200,8 @@ void KOPrefsDialog::setupFontsTab()
 void KOPrefsDialog::setupColorsTab()
 {
-    QFrame *topFrame = addPage(i18n("Colors"),0,0);
+    Q3Frame *topFrame = addPage(i18n("Colors"),0,0);
    //  DesktopIcon("colorize",KIcon::SizeMedium));
-  QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
+  Q3GridLayout *topLayout = new Q3GridLayout(topFrame,5,2);
  // topLayout->setSpacing(mSpacingHint);
  // topLayout->setMargin(mMarginHint);
@@ -1205,7 +1211,7 @@ void KOPrefsDialog::setupColorsTab()
  int ii = 1;
-  QGroupBox *categoryGroup ;
+  Q3GroupBox *categoryGroup ;
-  categoryGroup = new QGroupBox(1,Vertical,i18n("Categories"),
+  categoryGroup = new Q3GroupBox(1,Qt::Vertical,i18n("Categories"),
                                           topFrame);
  topLayout->addMultiCellWidget(categoryGroup,0,0,0,1);
@@ -1251,5 +1257,5 @@ void KOPrefsDialog::setupColorsTab()
      //  DesktopIcon("colorize",KIcon::SizeMedium));
      
-      topLayout = new QGridLayout(topFrame,5,2);
+      topLayout = new Q3GridLayout(topFrame,5,2);
      // topLayout->setSpacing(mSpacingHint);
      // topLayout->setMargin(mMarginHint);
@@ -1318,5 +1324,5 @@ void KOPrefsDialog::setupPrinterTab()
                        DesktopIcon("fileprint",KIcon::SizeMedium));
-  QGridLayout *topLayout = new QGridLayout(mPrinterTab,5,2);
+  Q3GridLayout *topLayout = new Q3GridLayout(mPrinterTab,5,2);
  topLayout->setSpacing(mSpacingHint);
  topLayout->setMargin(mMarginHint);
@@ -1328,8 +1334,8 @@ void KOPrefsDialog::setupGroupSchedulingTab()
 {
 #if 0
-  QFrame *topFrame  = addPage(i18n("Group Scheduling"),0,
+  Q3Frame *topFrame  = addPage(i18n("Group Scheduling"),0,
                              DesktopIcon("personal",KIcon::SizeMedium));
-  QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
+  Q3GridLayout *topLayout = new Q3GridLayout(topFrame,6,2);
  topLayout->setSpacing(mSpacingHint);
  topLayout->setMargin(mMarginHint);
@@ -1354,5 +1360,5 @@ void KOPrefsDialog::setupGroupSchedulingTab()
  topLayout->addMultiCellWidget(new QLabel(i18n("Additional email addresses:"),topFrame),2,2,0,1);
-  mAMails = new QListView(topFrame);
+  mAMails = new Q3ListView(topFrame);
  mAMails->addColumn(i18n("Email"),300);
  topLayout->addMultiCellWidget(mAMails,3,3,0,1);
@@ -1372,5 +1378,5 @@ void KOPrefsDialog::setupGroupSchedulingTab()
  connect(del, SIGNAL( clicked() ), this, SLOT(removeItem()) );
  connect(aEmailsEdit,SIGNAL( textChanged(const QString&) ), this,SLOT(updateItem()));
-  connect(mAMails,SIGNAL(selectionChanged(QListViewItem *)),SLOT(updateInput()));
+  connect(mAMails,SIGNAL(selectionChanged(Q3ListViewItem *)),SLOT(updateInput()));
 #endif
 }
@@ -1379,8 +1385,8 @@ void KOPrefsDialog::setupGroupAutomationTab()
 {
    return;
-  QFrame *topFrame  = addPage(i18n("Group Automation"),0,
+  Q3Frame *topFrame  = addPage(i18n("Group Automation"),0,
                              DesktopIcon("personal",KIcon::SizeMedium));
-  QGridLayout *topLayout = new QGridLayout(topFrame,5,1);
+  Q3GridLayout *topLayout = new Q3GridLayout(topFrame,5,1);
  topLayout->setSpacing(mSpacingHint);
  topLayout->setMargin(mMarginHint);
@@ -1516,5 +1522,5 @@ void KOPrefsDialog::usrWriteConfig()
        }
    }
-    QDictIterator<QColor> it(mCategoryDict);
+    Q3DictIterator<QColor> it(mCategoryDict);
    while (it.current()) {
        KOPrefs::instance()->setCategoryColor(it.currentKey(),*it.current());
diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h
index ee7a7aa..ccc1726 100644
--- a/korganizer/koprefsdialog.h
+++ b/korganizer/koprefsdialog.h
@@ -24,8 +24,10 @@
 #define _KOPREFSDIALOG_H
-#include <qframe.h>
+#include <q3frame.h>
-#include <qdict.h>
+#include <q3dict.h>
 #include <qcolor.h>
-#include <qlistview.h>
+#include <q3listview.h>
+//Added by qt3to4:
+#include <QLabel>
 #include <kdialogbase.h>
@@ -95,5 +97,5 @@ class KOPrefsDialog : public KPrefsDialog
    KPrefsDialogWidBool *mEnableProjectView;
-    QFrame *mPrinterTab;
+    Q3Frame *mPrinterTab;
    QLineEdit *nameEdit;
@@ -122,5 +124,5 @@ class KOPrefsDialog : public KPrefsDialog
    QComboBox     *mCategoryCombo;
    KColorButton  *mCategoryButton;
-    QDict<QColor> mCategoryDict;
+    Q3Dict<QColor> mCategoryDict;
    QSlider   *mHourSizeSlider;
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index df8f8d7..0f3b328 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -1,4 +1,4 @@
        TEMPLATE= app
-        CONFIG  = qt warn_on
+        CONFIG  += qt warn_on
        TARGET  = kopi
 OBJECTS_DIR = _obj/
@@ -18,25 +18,25 @@ unix : {
 staticlib: { 
        TARGET  = kopi_linux
-LIBS += ../bin/libmicrokabc_qtopia.a
+LIBS += ../bin/libxmicrokabc_qtopia.a
-LIBS += ../bin/libmicrokabc_file.a
+LIBS += ../bin/libxmicrokabc_file.a
-LIBS += ../bin/libmicrokabc_dir.a
+LIBS += ../bin/libxmicrokabc_dir.a
-LIBS += ../bin/libmicrokdepim.a
+LIBS += ../bin/libxmicrokdepim.a
-LIBS += ../bin/libmicrokcal.a
+LIBS += ../bin/libxmicrokcal.a
-LIBS += ../bin/libmicrokabc.a
+LIBS += ../bin/libxmicrokabc.a
-LIBS += ../bin/libmicrokde.a
+LIBS += ../bin/libxmicrokde.a
-LIBS += ../bin/libmicrokabc_qtopia.a
+LIBS += ../bin/libxmicrokabc_qtopia.a
-LIBS += ../bin/libmicrokabc_file.a
+LIBS += ../bin/libxmicrokabc_file.a
-LIBS += ../bin/libmicrokabc_dir.a
+LIBS += ../bin/libxmicrokabc_dir.a
-LIBS += ../bin/libmicrokdepim.a
+LIBS += ../bin/libxmicrokdepim.a
-LIBS += ../bin/libmicrokcal.a
+LIBS += ../bin/libxmicrokcal.a
-LIBS += ../bin/libmicrokabc.a
+LIBS += ../bin/libxmicrokabc.a
-LIBS += ../bin/libmicrokde.a
+LIBS += ../bin/libxmicrokde.a
 LIBS += ../libical/lib/libical.a
 LIBS += ../libical/lib/libicalss.a
 } else {
-LIBS += ../bin/libmicrokdepim.so
+LIBS += ../bin/libxmicrokdepim.so
-LIBS += ../bin/libmicrokcal.so
+LIBS += ../bin/libxmicrokcal.so
-LIBS += ../bin/libmicrokde.so
+LIBS += ../bin/libxmicrokde.so
-LIBS += ../bin/libmicrokabc.so
+LIBS += ../bin/libxmicrokabc.so
 #LIBS += -lbluetooth
 #LIBS += -lsdp
@@ -50,8 +50,8 @@ win32: {
 RC_FILE = winicons.rc
 DEFINES += _WIN32_  
-LIBS += ../bin/microkdepim.lib
+LIBS += ../bin/xmicrokdepim.lib
-LIBS += ../bin/microkcal.lib
+LIBS += ../bin/xmicrokcal.lib
-LIBS += ../bin/microkde.lib
+LIBS += ../bin/xmicrokde.lib
-LIBS += ../bin/microkabc.lib
+LIBS += ../bin/xmicrokabc.lib
 LIBS += ../libical/lib/ical.lib
 LIBS += ../libical/lib/icalss.lib
@@ -86,5 +86,6 @@ TARGET		= kopi_me
 
-INTERFACES = kofilterview_base.ui 
+#The following line was changed from INTERFACES to FORMS3 by qt3to4
+FORMS3 = kofilterview_base.ui 
 #filteredit_base.ui
@@ -211,5 +212,6 @@ filteredit_base.cpp \
 HEADERS += calprintbase.h calprinter.h calprintplugins.h cellitem.h
-INTERFACES += calprintdayconfig_base.ui \
+#The following line was changed from INTERFACES to FORMS3 by qt3to4
+FORMS3 += calprintdayconfig_base.ui \
              calprintmonthconfig_base.ui \
              calprinttodoconfig_base.ui \
@@ -217,2 +219,7 @@ INTERFACES += calprintdayconfig_base.ui \
 SOURCES += calprintbase.cpp calprinter.cpp calprintplugins.cpp cellitem.cpp
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
+#The following line was inserted by qt3to4
+CONFIG += uic3
diff --git a/korganizer/korganizerE.pro b/korganizer/korganizerE.pro
index 553c265..2c1cd42 100644
--- a/korganizer/korganizerE.pro
+++ b/korganizer/korganizerE.pro
@@ -12,7 +12,7 @@ DEFINES += KORG_NOPRINTER  KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_N
 DEFINES += KORG_NOLVALTERNATION
 #KORG_NOKABC
-LIBS += -lmicrokdepim
+LIBS += -lxmicrokdepim
-LIBS += -lmicrokcal
+LIBS += -lxmicrokcal
-LIBS += -lmicrokde
+LIBS += -lxmicrokde
 LIBS += -lmicroqtcompat
diff --git a/korganizer/kotimespanview.cpp b/korganizer/kotimespanview.cpp
index 3265a3a..a214720 100644
--- a/korganizer/kotimespanview.cpp
+++ b/korganizer/kotimespanview.cpp
@@ -1,3 +1,7 @@
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <Q3ValueList>
+#include <Q3PtrList>
 #include <kconfig.h>
@@ -12,5 +16,5 @@ KOTimeSpanView::KOTimeSpanView(Calendar *calendar, QWidget *parent,
  KOEventView( calendar, parent, name )
 {
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
  
  mTimeSpanView = new TimeSpanView( this );
@@ -35,5 +39,5 @@ void KOTimeSpanView::readSettings(KConfig *config)
  config->setGroup("Views");
-  QValueList<int> sizes = config->readIntListEntry("Separator TimeSpanView");
+  Q3ValueList<int> sizes = config->readIntListEntry("Separator TimeSpanView");
  if (sizes.count() == 2) {
    mTimeSpanView->setSplitterSizes(sizes);
@@ -47,5 +51,5 @@ void KOTimeSpanView::writeSettings(KConfig *config)
  config->setGroup("Views");
-  QValueList<int> list = mTimeSpanView->splitterSizes();
+  Q3ValueList<int> list = mTimeSpanView->splitterSizes();
  config->writeEntry("Separator TimeSpanView",list);
 }
@@ -61,7 +65,7 @@ int KOTimeSpanView::currentDateCount()
 }
-QPtrList<Incidence> KOTimeSpanView::selectedIncidences()
+Q3PtrList<Incidence> KOTimeSpanView::selectedIncidences()
 {
-  QPtrList<Incidence> selected;
+  Q3PtrList<Incidence> selected;
  
  return selected;
@@ -85,7 +89,7 @@ void KOTimeSpanView::insertItems(const QDate &start, const QDate &end)
 {
  mTimeSpanView->clear();
-  mTimeSpanView->setDateRange( start, end );
+  mTimeSpanView->setDateRange( (QDateTime)start, (QDateTime)end );
-  QPtrList<Event> events = calendar()->events( start, end );
+  Q3PtrList<Event> events = calendar()->events( start, end );
  Event *event = events.first();
  while( event ) {
@@ -101,5 +105,5 @@ void KOTimeSpanView::insertItems(const QDate &start, const QDate &end)
 }
-void KOTimeSpanView::showEvents(QPtrList<Event> eventList)
+void KOTimeSpanView::showEvents(Q3PtrList<Event> eventList)
 {
 }
diff --git a/korganizer/kotimespanview.h b/korganizer/kotimespanview.h
index c682ed8..c3e4b41 100644
--- a/korganizer/kotimespanview.h
+++ b/korganizer/kotimespanview.h
@@ -3,4 +3,6 @@
 #include "koeventview.h"
+//Added by qt3to4:
+#include <Q3PtrList>
 class KConfig;
@@ -17,5 +19,5 @@ class KOTimeSpanView : public KOEventView
    virtual int maxDatesHint();
    virtual int currentDateCount();
-    virtual QPtrList<Incidence> selectedIncidences();
+    virtual Q3PtrList<Incidence> selectedIncidences();
    DateList selectedDates() 
      {DateList q;
@@ -29,5 +31,5 @@ class KOTimeSpanView : public KOEventView
    virtual void updateView();
    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);
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp
index 20a35d2..aeab92a 100644
--- a/korganizer/kotodoeditor.cpp
+++ b/korganizer/kotodoeditor.cpp
@@ -24,13 +24,18 @@
 #include <qtooltip.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qpixmap.h>
 #include <qlayout.h>
-#include <qhbox.h>
+#include <q3hbox.h>
 #include <qtimer.h>
 #include <qdir.h>
 #include <qdatetime.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
 #include <qtabwidget.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3PtrList>
+#include <Q3VBoxLayout>
 #include <kiconloader.h>
@@ -82,6 +87,6 @@ void KOTodoEditor::init()
 void KOTodoEditor::setupRecurrence()
 {
-  QFrame *topFrame = addPage( i18n("Recurrence") );
+  Q3Frame *topFrame = addPage( i18n("Recurrence") );
-  QBoxLayout *topLayout = new QVBoxLayout( topFrame );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( topFrame );
  mRecurrence = new KOEditorRecurrence( topFrame );
@@ -112,7 +117,7 @@ void KOTodoEditor::setupGeneral()
  if (KOPrefs::instance()->mCompactDialogs) {
-    QFrame *topFrame = addPage(i18n("General"));
+    Q3Frame *topFrame = addPage(i18n("General"));
-    QBoxLayout *topLayout = new QVBoxLayout(topFrame);  
+    Q3BoxLayout *topLayout = new Q3VBoxLayout(topFrame);  
    if ( QApplication::desktop()->width() < 480 ) {
        topLayout->setMargin(marginHintSmall());
@@ -132,15 +137,15 @@ void KOTodoEditor::setupGeneral()
    
  
-    QBoxLayout *priorityLayout;
+    Q3BoxLayout *priorityLayout;
    if ( QApplication::desktop()->width() < 500 ) 
-        priorityLayout = new QVBoxLayout( topLayout );
+        priorityLayout = new Q3VBoxLayout( topLayout );
    else
-        priorityLayout = new QHBoxLayout( topLayout );
+        priorityLayout = new Q3HBoxLayout( topLayout );
    QWidget* prioWidget = new QWidget (topFrame);
    priorityLayout->addWidget(  prioWidget );
-    QHBoxLayout* priorityLayout2 = new QHBoxLayout( prioWidget);
+    Q3HBoxLayout* priorityLayout2 = new Q3HBoxLayout( prioWidget);
-    QIconSet icon; 
+    QIcon icon; 
    if ( QApplication::desktop()->width() < 321 ) 
        icon = SmallIcon("fileimport16");
@@ -165,11 +170,11 @@ void KOTodoEditor::setupGeneral()
    topLayout->addStretch(1);
-    QFrame *topFrame2 = addPage(i18n("Details"));
+    Q3Frame *topFrame2 = addPage(i18n("Details"));
-    QBoxLayout *topLayout2 = new QVBoxLayout(topFrame2);
+    Q3BoxLayout *topLayout2 = new Q3VBoxLayout(topFrame2);
    topLayout2->setMargin(marginHint());
    topLayout2->setSpacing(spacingHint());
-    QHBoxLayout *completionLayout = new QHBoxLayout( topLayout2 );
+    Q3HBoxLayout *completionLayout = new Q3HBoxLayout( topLayout2 );
    mGeneral->initCompletion(topFrame2,completionLayout);
    
@@ -186,7 +191,7 @@ void KOTodoEditor::setupGeneral()
  } else {
-    QFrame *topFrame = addPage(i18n("General"));
+    Q3Frame *topFrame = addPage(i18n("General"));
    
-    QBoxLayout *topLayout = new QVBoxLayout(topFrame);
+    Q3BoxLayout *topLayout = new Q3VBoxLayout(topFrame);
    topLayout->setSpacing(spacingHint());
@@ -194,8 +199,8 @@ void KOTodoEditor::setupGeneral()
    mGeneral->initTime(topFrame,topLayout);
    mGeneral->initStatus(topFrame,topLayout);    
-    QBoxLayout *alarmLineLayout = new QHBoxLayout(topLayout);
+    Q3BoxLayout *alarmLineLayout = new Q3HBoxLayout(topLayout);
    mGeneral->initAlarm(topFrame,alarmLineLayout); 
    mGeneral->initDescription(topFrame,topLayout);
-    QBoxLayout *detailsLayout = new QHBoxLayout(topLayout);
+    Q3BoxLayout *detailsLayout = new Q3HBoxLayout(topLayout);
    mGeneral->initCategories( topFrame, detailsLayout );
    mGeneral->initSecrecy( topFrame, detailsLayout );
@@ -428,5 +433,5 @@ void KOTodoEditor::slotLoadTemplate()
        return ;
    }
-    QPtrList<Todo> todos = cal.todos();
+    Q3PtrList<Todo> todos = cal.todos();
    Todo * todo = todos.first();
    if ( !todo ) {
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index ba94057..2b8fbd3 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -22,8 +22,10 @@
 */
+#include <QDesktopWidget>
 #include <qlayout.h>
-#include <qheader.h>
+#include <q3header.h>
 #include <qcursor.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
 #include <qdialog.h>
 #include <qlabel.h>
@@ -32,5 +34,19 @@
 #include <qinputdialog.h>
-#include <qvbox.h>
+#include <q3vbox.h>
+//Added by qt3to4:
+#include <QWheelEvent>
+#include <QFocusEvent>
+#include <QDragLeaveEvent>
+#include <QMouseEvent>
+#include <QDragEnterEvent>
+#include <QKeyEvent>
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
+#include <QDropEvent>
+#include <QDragMoveEvent>
+#include <QPaintEvent>
+#include <Q3PopupMenu>
+#include <Q3PtrList>
 #include <kdebug.h>
 #include "koprefs.h"
@@ -69,10 +85,10 @@ KOStartTodoPrefs::KOStartTodoPrefs( QString sum, QWidget *parent, const char *na
    mStopAll = true;
    setCaption( i18n("Start todo") );
-    QVBoxLayout* lay = new QVBoxLayout( this );
+    Q3VBoxLayout* lay = new Q3VBoxLayout( this );
    lay->setSpacing( 3 );
    lay->setMargin( 3 );
    QLabel * lab = new QLabel( i18n("<b>%1\n</b>").arg( sum ), this );
    lay->addWidget( lab ); 
-    lab->setAlignment( AlignCenter );
+    lab->setAlignment( Qt::AlignCenter );
    QPushButton * ok = new QPushButton( i18n("Start this todo\nand stop all running"), this );
@@ -99,18 +115,18 @@ KOStopTodoPrefs::KOStopTodoPrefs( Todo* todo, QWidget *parent, const char *name
    mTodo = todo;
    setCaption( i18n("Stop todo") );
-    QVBoxLayout* lay = new QVBoxLayout( this );
+    Q3VBoxLayout* lay = new Q3VBoxLayout( this );
    lay->setSpacing( 3 );
    lay->setMargin( 3 );
    QLabel * lab = new QLabel( i18n("<b>%1\n</b>").arg( todo->summary() ), this );
    lay->addWidget( lab ); 
-    lab->setAlignment( AlignHCenter );
+    lab->setAlignment( Qt::AlignHCenter );
    lab = new QLabel( i18n("Additional Comment:"), this );
    lay->addWidget( lab ); 
    mComment = new QLineEdit( this );
    lay->addWidget( mComment );
-    QHBox * start = new QHBox ( this );
+    Q3HBox * start = new Q3HBox ( this );
    lay->addWidget( start ); 
    lab = new QLabel( i18n("Start:"), start );
-    QHBox * end = new QHBox ( this );
+    Q3HBox * end = new Q3HBox ( this );
    lay->addWidget( end ); 
    lab = new QLabel( i18n("End:"), end );
@@ -174,8 +190,8 @@ void KOStopTodoPrefs::doNotSave()
-class KOTodoViewWhatsThis :public QWhatsThis
+class KOTodoViewWhatsThis :public Q3WhatsThis
 {
 public:
-  KOTodoViewWhatsThis( QWidget *wid, KOTodoView* view ) : QWhatsThis( wid ), _wid(wid),_view (view) { };
+  KOTodoViewWhatsThis( QWidget *wid, KOTodoView* view ) : Q3WhatsThis( wid ), _wid(wid),_view (view) { };
 protected:
@@ -215,5 +231,5 @@ void KOTodoListView::contentsDragEnterEvent(QDragEnterEvent *e)
 //  kdDebug() << "KOTodoListView::contentsDragEnterEvent" << endl;
  if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) &&
-       !QTextDrag::canDecode( e ) ) {
+       !Q3TextDrag::canDecode( e ) ) {
    e->ignore();
    return;
@@ -231,5 +247,5 @@ void KOTodoListView::contentsDragMoveEvent(QDragMoveEvent *e)
  if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) &&
-       !QTextDrag::canDecode( e ) ) {
+       !Q3TextDrag::canDecode( e ) ) {
    e->ignore();
    return;
@@ -256,5 +272,5 @@ void KOTodoListView::contentsDropEvent(QDropEvent *e)
  if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) &&
-       !QTextDrag::canDecode( e ) ) {
+       !Q3TextDrag::canDecode( e ) ) {
    e->ignore();
    return;
@@ -301,5 +317,5 @@ void KOTodoListView::contentsDropEvent(QDropEvent *e)
  else {
    QString text;
-    if (QTextDrag::decode(e,text)) {
+    if (Q3TextDrag::decode(e,text)) {
      //QListViewItem *qlvi = itemAt( contentsToViewport(e->pos()) );
      KOTodoViewItem *todoi = static_cast<KOTodoViewItem *>(itemAt( contentsToViewport(e->pos()) ));
@@ -324,5 +340,5 @@ void KOTodoListView::contentsDropEvent(QDropEvent *e)
 void KOTodoListView::wheelEvent (QWheelEvent *e)
 {
-    QListView::wheelEvent (e);
+    Q3ListView::wheelEvent (e);
 }
@@ -331,5 +347,5 @@ void KOTodoListView::contentsMousePressEvent(QMouseEvent* e)
    QPoint p(contentsToViewport(e->pos()));
-    QListViewItem *i = itemAt(p);
+    Q3ListViewItem *i = itemAt(p);
    bool rootClicked = true;
    if (i) {
@@ -349,5 +365,5 @@ void KOTodoListView::contentsMousePressEvent(QMouseEvent* e)
 #ifndef KORG_NODND
    mMousePressed = false; 
-    if (! rootClicked && !( e->button() == RightButton)  ) {
+    if (! rootClicked && !( e->button() == Qt::RightButton)  ) {
        mPressPos = e->pos();
        mMousePressed = true;
@@ -359,7 +375,7 @@ void KOTodoListView::contentsMousePressEvent(QMouseEvent* e)
 #ifndef DESKTOP_VERSION
    if (!( e->button() == RightButton && rootClicked) )
-        QListView::contentsMousePressEvent(e);   
+        Q3ListView::contentsMousePressEvent(e);   
 #else
-    QListView::contentsMousePressEvent(e);   
+    Q3ListView::contentsMousePressEvent(e);   
 #endif
 }
@@ -367,5 +383,5 @@ void KOTodoListView::paintEvent(QPaintEvent* e)
 {
    emit paintNeeded();
-    QListView::paintEvent( e);
+    Q3ListView::paintEvent( e);
 }
 void KOTodoListView::contentsMouseMoveEvent(QMouseEvent* e)
@@ -377,5 +393,5 @@ void KOTodoListView::contentsMouseMoveEvent(QMouseEvent* e)
      QApplication::startDragDistance()*3) {
    mMousePressed = false;
-    QListViewItem *item = itemAt(contentsToViewport(mPressPos));
+    Q3ListViewItem *item = itemAt(contentsToViewport(mPressPos));
    if (item) {
      DndFactory factory( mCalendar );
@@ -423,5 +439,5 @@ void KOTodoListView::keyPressEvent ( QKeyEvent * e )
    if (! e->isAutoRepeat() )
        mFlagKeyPressed = true;
-    QListViewItem* cn;
+    Q3ListViewItem* cn;
    if ( (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) && mName != "todolistsmall") {
        cn = currentItem();
@@ -429,5 +445,5 @@ void KOTodoListView::keyPressEvent ( QKeyEvent * e )
            KOTodoViewItem* ci = (KOTodoViewItem*)( cn ); 
            if ( ci ){
-                if ( e->state() == ShiftButton )
+                if ( e->state() == Qt::ShiftButton )
                    ci->setOn( false );
                else
@@ -450,10 +466,10 @@ void KOTodoListView::keyPressEvent ( QKeyEvent * e )
        case Qt::Key_Down:
        case Qt::Key_Up:
-            QListView::keyPressEvent (  e );
+            Q3ListView::keyPressEvent (  e );
            e->accept();
            break; 
        case Qt::Key_Left:
        case Qt::Key_Right:
-            QListView::keyPressEvent (  e );
+            Q3ListView::keyPressEvent (  e );
            e->accept();
            return;
@@ -469,5 +485,5 @@ void KOTodoListView::keyPressEvent ( QKeyEvent * e )
 void KOTodoListView::contentsMouseReleaseEvent(QMouseEvent *e)
 {
-  QListView::contentsMouseReleaseEvent(e);
+  Q3ListView::contentsMouseReleaseEvent(e);
  mMousePressed = false;
 }
@@ -479,5 +495,5 @@ void KOTodoListView::contentsMouseDoubleClickEvent(QMouseEvent *e)
  QPoint vp = contentsToViewport(e->pos());
-  QListViewItem *item = itemAt(vp);
+  Q3ListViewItem *item = itemAt(vp);
  emit double_Clicked(item);
@@ -493,5 +509,5 @@ KOQuickTodo::KOQuickTodo(QWidget *parent) :
 {
  setText(i18n("Click to add new Todo"));
-  setFocusPolicy ( QWidget::ClickFocus );
+  setFocusPolicy ( Qt::ClickFocus );
 }
@@ -524,5 +540,5 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
    isFlatDisplay = false;
  mNavigator = 0;
-  QBoxLayout *topLayout = new QVBoxLayout(this);
+  Q3BoxLayout *topLayout = new Q3VBoxLayout(this);
  mName = QString ( name );
  mBlockUpdate = false;
@@ -531,5 +547,5 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
  
  mQuickAdd = new KOQuickTodo(mQuickBar); 
-  QBoxLayout *quickLayout = new QHBoxLayout(mQuickBar);
+  Q3BoxLayout *quickLayout = new Q3HBoxLayout(mQuickBar);
  quickLayout->addWidget( mQuickAdd );
  mNewSubBut =  new QPushButton( "sub",mQuickBar );
@@ -569,17 +585,17 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
  mNewSubBut->setFixedHeight(fixhei );
-  flat->setFocusPolicy( NoFocus );
+  flat->setFocusPolicy( Qt::NoFocus );
-  s_done->setFocusPolicy( NoFocus );
+  s_done->setFocusPolicy( Qt::NoFocus );
-  allopen->setFocusPolicy( NoFocus );
+  allopen->setFocusPolicy( Qt::NoFocus );
-  allclose->setFocusPolicy( NoFocus );
+  allclose->setFocusPolicy( Qt::NoFocus );
-  s_run->setFocusPolicy( NoFocus );
+  s_run->setFocusPolicy( Qt::NoFocus );
-  mNewSubBut->setFocusPolicy( NoFocus );
+  mNewSubBut->setFocusPolicy( Qt::NoFocus );
  
-  QWhatsThis::add( flat, i18n("Click this button to display all todos in a <b>flat</b> hierarchy" ) );
+  Q3WhatsThis::add( flat, i18n("Click this button to display all todos in a <b>flat</b> hierarchy" ) );
-  QWhatsThis::add( allopen, i18n("Click this button to display all todos <b>openend</b>" ) );
+  Q3WhatsThis::add( allopen, i18n("Click this button to display all todos <b>openend</b>" ) );
-  QWhatsThis::add( allclose, i18n("Click this button to display all todos <b>closed</b>" ) );
+  Q3WhatsThis::add( allclose, i18n("Click this button to display all todos <b>closed</b>" ) );
-  QWhatsThis::add( s_run, i18n("Click this button to toggle show/hide <b>running</b> todos" ) );
+  Q3WhatsThis::add( s_run, i18n("Click this button to toggle show/hide <b>running</b> todos" ) );
-  QWhatsThis::add( mNewSubBut, i18n("Click this button to add a new subtodo to the currently selected todo" ) );
+  Q3WhatsThis::add( mNewSubBut, i18n("Click this button to add a new subtodo to the currently selected todo" ) );
-  QWhatsThis::add( s_done, i18n("Click this button to toggle show/hide <b>completed</b> todos" ) );
+  Q3WhatsThis::add( s_done, i18n("Click this button to toggle show/hide <b>completed</b> todos" ) );
  quickLayout->addWidget( mNewSubBut );
@@ -602,17 +618,17 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
  mTodoListView->addColumn(i18n("Todo"));
  mTodoListView->addColumn(i18n("Prio"));
-  mTodoListView->setColumnAlignment(1,AlignHCenter);
+  mTodoListView->setColumnAlignment(1,Qt::AlignHCenter);
  mTodoListView->addColumn(i18n("Complete"));
-  mTodoListView->setColumnAlignment(2,AlignCenter);
+  mTodoListView->setColumnAlignment(2,Qt::AlignCenter);
  mTodoListView->addColumn(i18n("Due Date"));
-  mTodoListView->setColumnAlignment(3,AlignLeft);
+  mTodoListView->setColumnAlignment(3,Qt::AlignLeft);
  mTodoListView->addColumn(i18n("Due Time"));
-  mTodoListView->setColumnAlignment(4,AlignHCenter);
+  mTodoListView->setColumnAlignment(4,Qt::AlignHCenter);
  mTodoListView->addColumn(i18n("Start Date"));
-  mTodoListView->setColumnAlignment(5,AlignLeft);
+  mTodoListView->setColumnAlignment(5,Qt::AlignLeft);
  mTodoListView->addColumn(i18n("Start Time"));
-  mTodoListView->setColumnAlignment(6,AlignHCenter);
+  mTodoListView->setColumnAlignment(6,Qt::AlignHCenter);
  //mTodoListView->addColumn(i18n("Cancelled"));
@@ -624,5 +640,5 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
 #if 0
  mTodoListView->addColumn(i18n("Sort Id"));
-  mTodoListView->setColumnAlignment(4,AlignHCenter);
+  mTodoListView->setColumnAlignment(4,Qt::AlignHCenter);
 #endif
@@ -633,10 +649,10 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
  int iii = 0;
  for ( iii = 0; iii< 12 ; ++iii )
-      mTodoListView->setColumnWidthMode( iii, QListView::Manual );
+      mTodoListView->setColumnWidthMode( iii, Q3ListView::Manual );
  mKOTodoViewWhatsThis = new KOTodoViewWhatsThis(mTodoListView->viewport(),this);
-  mPriorityPopupMenu = new QPopupMenu(this);
+  mPriorityPopupMenu = new Q3PopupMenu(this);
  for (int i = 1; i <= 5; i++) {
    QString label = QString ("%1").arg (i);
@@ -645,5 +661,5 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
  connect (mPriorityPopupMenu, SIGNAL(activated (int)), SLOT (setNewPriority(int)));
-  mPercentageCompletedPopupMenu = new QPopupMenu(this);
+  mPercentageCompletedPopupMenu = new Q3PopupMenu(this);
  for (int i = 0; i <= 100; i+=20) {
    QString label = QString ("%1 %").arg (i);
@@ -653,10 +669,10 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
-  mCategoryPopupMenu = new QPopupMenu (this);
+  mCategoryPopupMenu = new Q3PopupMenu (this);
  mCategoryPopupMenu->setCheckable (true);
  connect (mCategoryPopupMenu, SIGNAL (activated (int)), SLOT (changedCategories (int)));
  connect (mCategoryPopupMenu, SIGNAL (aboutToShow ()), SLOT (fillCategories ()));
-  mCalPopupMenu = new QPopupMenu (this);
+  mCalPopupMenu = new Q3PopupMenu (this);
  mCalPopupMenu->setCheckable (true);
  connect (mCalPopupMenu, SIGNAL (activated (int)), SLOT (changedCal (int)));
@@ -666,5 +682,5 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
  
-  mItemPopupMenu = new QPopupMenu(this); 
+  mItemPopupMenu = new Q3PopupMenu(this); 
  mItemPopupMenu->insertItem(i18n("Show"), this,
                             SLOT (showTodo()));
@@ -711,5 +727,5 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
  
 #endif
-  mPopupMenu = new QPopupMenu(this);
+  mPopupMenu = new Q3PopupMenu(this);
  mPopupMenu->insertItem(SmallIconSet("todo"), i18n("New Todo..."), this,
                         SLOT (newTodo()),0,1);
@@ -747,6 +763,6 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
  // Double clicking conflicts with opening/closing the subtree
-  connect( mTodoListView, SIGNAL( doubleClicked( QListViewItem *) ),
+  connect( mTodoListView, SIGNAL( doubleClicked( Q3ListViewItem *) ),
-           SLOT( editItem( QListViewItem *) ) );
+           SLOT( editItem( Q3ListViewItem *) ) );
  /*
  connect( mTodoListView, SIGNAL(  rightButtonClicked ( QListViewItem *,
@@ -754,29 +770,29 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
           SLOT( popupMenu( QListViewItem *, const QPoint & ,int) ) );
  */ 
-  connect( mTodoListView, SIGNAL(  contextRequest ( QListViewItem *,
+  connect( mTodoListView, SIGNAL(  contextRequest ( Q3ListViewItem *,
                                                        const QPoint &,int ) ),
-           SLOT( popupMenu( QListViewItem *, const QPoint & ,int) ) );
+           SLOT( popupMenu( Q3ListViewItem *, const QPoint & ,int) ) );
-  connect( mTodoListView, SIGNAL( clicked( QListViewItem * ) ),
+  connect( mTodoListView, SIGNAL( clicked( Q3ListViewItem * ) ),
-           SLOT( itemClicked( QListViewItem * ) ) );
+           SLOT( itemClicked( Q3ListViewItem * ) ) );
-  connect( mTodoListView, SIGNAL( double_Clicked( QListViewItem * ) ),
+  connect( mTodoListView, SIGNAL( double_Clicked( Q3ListViewItem * ) ),
-           SLOT( itemDoubleClicked( QListViewItem * ) ) );
+           SLOT( itemDoubleClicked( Q3ListViewItem * ) ) );
  connect( mTodoListView, SIGNAL( todoDropped( Todo *, int ) ),
           SLOT( updateView() ) );
  connect( mTodoListView, SIGNAL( todoDropped( Todo *, int ) ),
           SLOT( todoModified(Todo *, int) ) );
-  connect( mTodoListView, SIGNAL( expanded( QListViewItem * ) ),
+  connect( mTodoListView, SIGNAL( expanded( Q3ListViewItem * ) ),
-           SLOT( itemStateChanged( QListViewItem * ) ) );
+           SLOT( itemStateChanged( Q3ListViewItem * ) ) );
-  connect( mTodoListView, SIGNAL( collapsed( QListViewItem * ) ),
+  connect( mTodoListView, SIGNAL( collapsed( Q3ListViewItem * ) ),
-           SLOT( itemStateChanged( QListViewItem * ) ) );
+           SLOT( itemStateChanged( Q3ListViewItem * ) ) );
  connect( mTodoListView, SIGNAL( paintNeeded() ),
           SLOT( paintNeeded()) );
 #if 0
-  connect(mTodoListView,SIGNAL(selectionChanged(QListViewItem *)),
+  connect(mTodoListView,SIGNAL(selectionChanged(Q3ListViewItem *)),
-          SLOT(selectionChanged(QListViewItem *)));
+          SLOT(selectionChanged(Q3ListViewItem *)));
-  connect(mTodoListView,SIGNAL(clicked(QListViewItem *)),
+  connect(mTodoListView,SIGNAL(clicked(Q3ListViewItem *)),
-          SLOT(selectionChanged(QListViewItem *)));
+          SLOT(selectionChanged(Q3ListViewItem *)));
-  connect(mTodoListView,SIGNAL(pressed(QListViewItem *)),
+  connect(mTodoListView,SIGNAL(pressed(Q3ListViewItem *)),
-          SLOT(selectionChanged(QListViewItem *)));
+          SLOT(selectionChanged(Q3ListViewItem *)));
 #endif
@@ -882,5 +898,5 @@ void KOTodoView::updateView()
  // QFontMetrics fm ( KOPrefs::instance()->mTodoViewFont );
  //mTodoListView->header()->setMaximumHeight(fm.height());
-  QPtrList<Todo> todoList = calendar()->todos();
+  Q3PtrList<Todo> todoList = calendar()->todos();
 /*
@@ -1045,5 +1061,5 @@ bool KOTodoView::checkTodo( Todo * todo )
 }
-void KOTodoView::restoreItemState( QListViewItem *item )
+void KOTodoView::restoreItemState( Q3ListViewItem *item )
 {
    pendingSubtodo = 0;
@@ -1097,7 +1113,7 @@ void KOTodoView::updateConfig()
 }
-QPtrList<Incidence> KOTodoView::selectedIncidences()
+Q3PtrList<Incidence> KOTodoView::selectedIncidences()
 {
-  QPtrList<Incidence> selected;
+  Q3PtrList<Incidence> selected;
  KOTodoViewItem *item = (KOTodoViewItem *)(mTodoListView->selectedItem());
@@ -1108,7 +1124,7 @@ QPtrList<Incidence> KOTodoView::selectedIncidences()
 }
-QPtrList<Todo> KOTodoView::selectedTodos()
+Q3PtrList<Todo> KOTodoView::selectedTodos()
 {
-  QPtrList<Todo> selected;
+  Q3PtrList<Todo> selected;
  KOTodoViewItem *item = (KOTodoViewItem *)(mTodoListView->selectedItem());
@@ -1128,5 +1144,5 @@ void KOTodoView::showDates(const QDate &, const QDate &)
 }
-void KOTodoView::showEvents(QPtrList<Event>)
+void KOTodoView::showEvents(Q3PtrList<Event>)
 {
  kdDebug() << "KOTodoView::selectEvents(): not yet implemented" << endl;
@@ -1141,5 +1157,5 @@ void KOTodoView::printPreview(CalPrinter *calPrinter, const QDate &fd,
 }
-void KOTodoView::editItem(QListViewItem *item )
+void KOTodoView::editItem(Q3ListViewItem *item )
 {
    if ( item ) 
@@ -1147,5 +1163,5 @@ void KOTodoView::editItem(QListViewItem *item )
 }
-void KOTodoView::showItem(QListViewItem *item,const QPoint &,int)
+void KOTodoView::showItem(Q3ListViewItem *item,const QPoint &,int)
 {
    if ( item ) 
@@ -1153,5 +1169,5 @@ void KOTodoView::showItem(QListViewItem *item,const QPoint &,int)
 }
-void KOTodoView::popupMenu(QListViewItem *item,const QPoint &p,int column)
+void KOTodoView::popupMenu(Q3ListViewItem *item,const QPoint &p,int column)
 {
    pendingSubtodo = 0;
@@ -1362,5 +1378,5 @@ void KOTodoView::toggleRunningItemQuick()
    }
 }
-void KOTodoView::itemDoubleClicked(QListViewItem *item)
+void KOTodoView::itemDoubleClicked(Q3ListViewItem *item)
 {
    if ( pendingSubtodo != 0 ) {
@@ -1429,5 +1445,5 @@ void KOTodoView::toggleRunningItem()
 }
-void KOTodoView::itemClicked(QListViewItem *item)
+void KOTodoView::itemClicked(Q3ListViewItem *item)
 {
    //qDebug("KOTodoView::itemClicked %d", item);
@@ -1442,5 +1458,5 @@ void KOTodoView::itemClicked(QListViewItem *item)
  if ( pendingSubtodo != 0 ) {
      bool allowReparent = true;
-      QListViewItem *par = item;
+      Q3ListViewItem *par = item;
      while ( par ) {
          if ( par ==  pendingSubtodo ) {
@@ -1470,5 +1486,5 @@ void KOTodoView::setDocumentId( const QString &id )
 }
-void KOTodoView::itemStateChanged( QListViewItem *item )
+void KOTodoView::itemStateChanged( Q3ListViewItem *item )
 {
  if (!item) return;
@@ -1543,5 +1559,5 @@ void  KOTodoView::setAllClose()
    resetCurrentItem();
 }
-void  KOTodoView::setOpen( QListViewItem* item, bool setOpenI)
+void  KOTodoView::setOpen( Q3ListViewItem* item, bool setOpenI)
 {
@@ -1564,5 +1580,5 @@ void KOTodoView::displayAllFlat()
    mPopupMenu->setItemChecked( 8,true );
    isFlatDisplay = true;
-    QPtrList<Todo> todoList = calendar()->todos();
+    Q3PtrList<Todo> todoList = calendar()->todos();
    Todo *todo;   
    for(todo = todoList.first(); todo; todo = todoList.next()) {
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index 0cbc087..a9e7f30 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -27,13 +27,23 @@
 #include <qfontmetrics.h>
 #include <qlineedit.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
-#include <qstrlist.h>
+#include <q3strlist.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qlabel.h>
 #include <qmap.h>
 #include <qdialog.h>
 #include <qlabel.h>
-#include <qlistview.h>
+#include <q3listview.h>
+//Added by qt3to4:
+#include <QDragMoveEvent>
+#include <QDropEvent>
+#include <QDragLeaveEvent>
+#include <QWheelEvent>
+#include <QPaintEvent>
+#include <QFocusEvent>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <QDragEnterEvent>
 #include <klistview.h>
@@ -102,5 +112,5 @@ class KOTodoListView : public KListView
    void paintNeeded();
    void todoDropped(Todo *, int);  
-    void double_Clicked(QListViewItem *item);
+    void double_Clicked(Q3ListViewItem *item);
    void reparentTodoSignal( Todo *,Todo * );
    void unparentTodoSignal(Todo *);
@@ -125,5 +135,5 @@ class KOTodoListView : public KListView
    QPoint mPressPos;
    bool mMousePressed;
-    QListViewItem *mOldCurrent;
+    Q3ListViewItem *mOldCurrent;
    bool  mFlagKeyPressed;
    void keyPressEvent ( QKeyEvent * ) ;
@@ -158,6 +168,6 @@ class KOTodoView : public KOrg::BaseView
    ~KOTodoView();
-    QPtrList<Incidence> selectedIncidences();
+    Q3PtrList<Incidence> selectedIncidences();
-    QPtrList<Todo> selectedTodos();
+    Q3PtrList<Todo> selectedTodos();
    DateList selectedDates()
@@ -185,12 +195,12 @@ class KOTodoView : public KOrg::BaseView
    void showDates(const QDate &start, const QDate &end);
-    void showEvents(QPtrList<Event> eventList);
+    void showEvents(Q3PtrList<Event> eventList);
    void clearSelection();
    void jumpToDate ();
-    void editItem(QListViewItem *item);
+    void editItem(Q3ListViewItem *item);
-    void showItem(QListViewItem *item,const QPoint &,int);
+    void showItem(Q3ListViewItem *item,const QPoint &,int);
-    void popupMenu(QListViewItem *item,const QPoint &,int);
+    void popupMenu(Q3ListViewItem *item,const QPoint &,int);
    void newTodo();
    void newSubTodo();
@@ -220,8 +230,8 @@ class KOTodoView : public KOrg::BaseView
    void updateTodo( Todo *, int );
-    void itemClicked(QListViewItem *);
+    void itemClicked(Q3ListViewItem *);
-    void itemStateChanged(QListViewItem *);
+    void itemStateChanged(Q3ListViewItem *);
    void modified(bool);
-    void itemDoubleClicked(QListViewItem *item);
+    void itemDoubleClicked(Q3ListViewItem *item);
    void resetFocusToList();
    void fillCategories ();
@@ -274,16 +284,16 @@ class KOTodoView : public KOrg::BaseView
    friend class KOTodoViewItem;
    QMap<Todo *,KOTodoViewItem *>::ConstIterator insertTodoItem(Todo *todo);
-    void restoreItemState( QListViewItem * );
+    void restoreItemState( Q3ListViewItem * );
    bool checkTodo( Todo * );
    bool isFlatDisplay;
-    void  setOpen( QListViewItem*, bool setOpen);
+    void  setOpen( Q3ListViewItem*, bool setOpen);
    KOTodoListView *mTodoListView;
-    QPopupMenu *mItemPopupMenu;
+    Q3PopupMenu *mItemPopupMenu;
-    QPopupMenu *mPopupMenu;
+    Q3PopupMenu *mPopupMenu;
-    QPopupMenu *mPriorityPopupMenu;
+    Q3PopupMenu *mPriorityPopupMenu;
-    QPopupMenu *mPercentageCompletedPopupMenu;
+    Q3PopupMenu *mPercentageCompletedPopupMenu;
-    QPopupMenu *mCategoryPopupMenu;
+    Q3PopupMenu *mCategoryPopupMenu;
-    QPopupMenu *mCalPopupMenu;
+    Q3PopupMenu *mCalPopupMenu;
    QMap<int, int> mPercentage;
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index 519bb16..c21816d 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -20,5 +20,9 @@
 #include <klocale.h>
 #include <kdebug.h>
-#include <qapp.h>
+#include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3PointArray>
+#include <QPixmap>
 #include <kglobal.h>
@@ -28,6 +32,6 @@
 #include "koprefs.h"
-KOTodoViewItem::KOTodoViewItem( QListView *parent, Todo *todo, KOTodoView *kotodo)
+KOTodoViewItem::KOTodoViewItem( Q3ListView *parent, Todo *todo, KOTodoView *kotodo)
-  : QCheckListItem( parent , "", CheckBox ), mTodo( todo ), mTodoView( kotodo )
+  : Q3CheckListItem( parent , "", CheckBox ), mTodo( todo ), mTodoView( kotodo )
 {
  construct();
@@ -35,5 +39,5 @@ KOTodoViewItem::KOTodoViewItem( QListView *parent, Todo *todo, KOTodoView *kotod
 KOTodoViewItem::KOTodoViewItem( KOTodoViewItem *parent, Todo *todo, KOTodoView *kotodo )
-  : QCheckListItem( parent, "", CheckBox ), mTodo( todo ), mTodoView( kotodo )
+  : Q3CheckListItem( parent, "", CheckBox ), mTodo( todo ), mTodoView( kotodo )
 {  
  construct();
@@ -81,5 +85,5 @@ void KOTodoViewItem::paintBranches(QPainter *p,const QColorGroup & cg,int w,
                                   int y,int h)
 {
-  QListViewItem::paintBranches(p,cg,w,y,h);
+  Q3ListViewItem::paintBranches(p,cg,w,y,h);
 }
 #else
@@ -317,5 +321,5 @@ void KOTodoViewItem::stateChange(bool state)
  }
  if ( state ) {
-      QListViewItem * myChild = firstChild();
+      Q3ListViewItem * myChild = firstChild();
      KOTodoViewItem *item;
      while( myChild ) {
@@ -326,5 +330,5 @@ void KOTodoViewItem::stateChange(bool state)
      }
  } else {
-      QListViewItem * myChild = parent();
+      Q3ListViewItem * myChild = parent();
      if ( myChild )
          (static_cast<KOTodoViewItem*>(myChild))->stateChange(state);
@@ -384,10 +388,10 @@ bool KOTodoViewItem::isAlternate()
       KOTodoViewItem *item;
       bool previous = true;
-       if (QListViewItem::parent())
+       if (Q3ListViewItem::parent())
       {
-          item = static_cast<KOTodoViewItem *>(QListViewItem::parent());
+          item = static_cast<KOTodoViewItem *>(Q3ListViewItem::parent());
          if (item)
             previous = item->m_odd;
-          item = static_cast<KOTodoViewItem *>(QListViewItem::parent()->firstChild());
+          item = static_cast<KOTodoViewItem *>(Q3ListViewItem::parent()->firstChild());
       }
       else
@@ -477,5 +481,5 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i
          QColor fc = KOPrefs::instance()->mHighlightColor;
          if ( mTodo->percentComplete() == 100 )
-              fc = darkGreen;
+              fc = Qt::darkGreen;
          p->drawRect( 2, 2, width-4, height()-4);
          p->fillRect( 3, 3, progress, height()-6, 
@@ -483,5 +487,5 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i
          p->restore();
      } else {
-          QCheckListItem::paintCell(p, _cg, column, width, alignment);
+          Q3CheckListItem::paintCell(p, _cg, column, width, alignment);
      }
      return;
@@ -495,10 +499,10 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i
    p->fillRect( 0, 0, width, height(), _cg.brush( QColorGroup::Base ) );
-    QListView *lv = listView();
+    Q3ListView *lv = listView();
    if ( !lv )
        return;
    int marg = 2;//lv->itemMargin();
    int r = 0;
-    QCheckListItem::Type myType = QCheckListItem::CheckBox;
+    Q3CheckListItem::Type myType = Q3CheckListItem::CheckBox;
    int BoxSize = 20;
    int boxOffset = 2;
@@ -523,5 +527,5 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i
            r += BoxSize + 4;
    } else {
-        ASSERT( lv ); //###
+        Q_ASSERT( lv ); //###
                //QFontMetrics fm( lv->font() );
                //int d = fm.height();
@@ -540,5 +544,5 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i
                y++;
                if ( isOn() ) {
-                    QPointArray a( 7*2 );
+                    Q3PointArray a( 7*2 );
                    int i, xx, yy;
                    xx = x+xOffset+marg+(boxOffset/2);
@@ -556,5 +560,5 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i
                        xx++; yy--;
                    }
-                    p->setPen( darkGreen );
+                    p->setPen( Qt::darkGreen );
                    p->drawLineSegments( a );
                }
@@ -566,7 +570,7 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i
    p->translate( r, 0 );
    p->setPen( QPen( _cg.text() ) );
-    QListViewItem::paintCell( p, _cg, column, width - r, align );
+    Q3ListViewItem::paintCell( p, _cg, column, width - r, align );
    if ( mTodo->cancelled () ) {
-        p->setPen( black );
+        p->setPen( Qt::black );
        QRect br = p->boundingRect( 1,1,1,1,0,mTodo->summary() );
        int wid = br.width() +lineStart;
diff --git a/korganizer/kotodoviewitem.h b/korganizer/kotodoviewitem.h
index bd024c8..62a635c 100644
--- a/korganizer/kotodoviewitem.h
+++ b/korganizer/kotodoviewitem.h
@@ -23,11 +23,11 @@
 #include <qfontmetrics.h>
 #include <qlineedit.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
-#include <qstrlist.h>
+#include <q3strlist.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qlabel.h>
 #include <qmap.h>
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qpainter.h>
@@ -46,5 +46,5 @@ class KOTodoView;
  @see KOTodoView
 */
-class KOTodoViewItem : public QCheckListItem
+class KOTodoViewItem : public Q3CheckListItem
 {
  public:
@@ -55,5 +55,5 @@ class KOTodoViewItem : public QCheckListItem
      @param ev is the event to have the item display information for.
    */
-    KOTodoViewItem(QListView *parent, Todo *todo, KOTodoView *kotodo);
+    KOTodoViewItem(Q3ListView *parent, Todo *todo, KOTodoView *kotodo);
    KOTodoViewItem(KOTodoViewItem *parent, Todo *todo, KOTodoView *kotodo);
    //~KOTodoViewItem() { qDebug("~KOTodoViewItem() %s ", text(0).latin1() );}
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 4057ae0..07c4295 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -24,5 +24,7 @@
 */
-#include <qwidgetstack.h>
+#include <q3widgetstack.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 #include <kconfig.h>
@@ -458,6 +460,6 @@ void KOViewManager::showListView()
        connect( mListView, SIGNAL( beamIncidenceSignal( Incidence *  ) ),
                 mMainView, SLOT ( beamIncidence( Incidence * ) ) );
-        connect( mListView, SIGNAL( beamIncidenceList( QPtrList<Incidence>  ) ),
+        connect( mListView, SIGNAL( beamIncidenceList( Q3PtrList<Incidence>  ) ),
-                 mMainView, SLOT ( beamIncidenceList( QPtrList<Incidence>  ) ) );
+                 mMainView, SLOT ( beamIncidenceList( Q3PtrList<Incidence>  ) ) );
    }
    // bool temp = mFlagShowNextxDays;
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index f88403c..bfe930f 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -19,5 +19,5 @@
 #include <qlayout.h>
-#include <qtextbrowser.h>
+#include <q3textbrowser.h>
 #include <qtextcodec.h>
 #include <qfileinfo.h>
@@ -25,6 +25,12 @@
 #include <qapplication.h>
+#include <QDesktopWidget>
 #ifdef DESKTOP_VERSION 
-#include <qpaintdevicemetrics.h>
+#include <q3paintdevicemetrics.h>
+//Added by qt3to4:
+#include <Q3PtrList>
+#include <QHideEvent>
+#include <Q3VBoxLayout>
+#include <QShowEvent>
 #endif
 #include <kglobal.h>
@@ -43,5 +49,5 @@
 #include "koeventviewerdialog.h"
 #include "koeventviewer.h"
-#include <qstylesheet.h> 
+#include <q3stylesheet.h> 
 #include "kowhatsnextview.h"
 using namespace KOrg;
@@ -57,5 +63,5 @@ void WhatsNextTextBrowser::setSource(const QString& n)
        return;
    } else {
-        QTextBrowser::setSource(n);
+        Q3TextBrowser::setSource(n);
    }
 }
@@ -73,5 +79,5 @@ void WhatsNextTextBrowser::printMe()
    QPainter p;
    p.begin ( &printer  );
-    QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer );
+    Q3PaintDeviceMetrics m = Q3PaintDeviceMetrics ( &printer );
    float dx, dy;
    int wid = (m.width() * 9)/10;
@@ -104,17 +110,17 @@ KOWhatsNextView::KOWhatsNextView(Calendar *calendar, QWidget *parent,
    mView = new WhatsNextTextBrowser(this);
    connect(mView,SIGNAL(showIncidence(const QString &)),SLOT(showIncidence(const QString &)));
-    QStyleSheet* stsh = mView->styleSheet();
+    Q3StyleSheet* stsh = mView->styleSheet();
-    QStyleSheetItem * style ;
+    Q3StyleSheetItem * style ;
    style   = stsh->item ("h2" );
    if ( style ) {
-        style->setMargin(QStyleSheetItem::MarginAll,0);  
+        style->setMargin(Q3StyleSheetItem::MarginAll,0);  
    }
    style   = stsh->item ("h3" );
    if ( style ) {
-        style->setMargin(QStyleSheetItem::MarginAll,0);  
+        style->setMargin(Q3StyleSheetItem::MarginAll,0);  
    }
    mEventViewer = 0;
-    QBoxLayout *topLayout = new QVBoxLayout(this);
+    Q3BoxLayout *topLayout = new Q3VBoxLayout(this);
    //  topLayout->addWidget(mDateLabel);
    topLayout->addWidget(mView);
@@ -145,7 +151,7 @@ void KOWhatsNextView::clearList()
    mView->setText(" ");
 }
-QPtrList<Incidence> KOWhatsNextView::selectedIncidences()
+Q3PtrList<Incidence> KOWhatsNextView::selectedIncidences()
 {
-    QPtrList<Incidence> eventList;
+    Q3PtrList<Incidence> eventList;
    return eventList;
@@ -220,6 +226,6 @@ void KOWhatsNextView::updateView()
    int iii;
    mTodos.clear();
-    QPtrList<Event> events;  
+    Q3PtrList<Event> events;  
-    QPtrList<Todo> todos = calendar()->todos(); 
+    Q3PtrList<Todo> todos = calendar()->todos(); 
    Todo * todo;
    //mText += "<h2>" + i18n("Events: ") + "</h2>\n";
@@ -455,5 +461,5 @@ void KOWhatsNextView::showDates(const QDate &, const QDate &)
 }
-void KOWhatsNextView::showEvents(QPtrList<Event>)
+void KOWhatsNextView::showEvents(Q3PtrList<Event>)
 {
 }
@@ -742,5 +748,5 @@ bool KOWhatsNextView::appendTodo(Incidence *ev, QString ind , bool isSub )
        mText += "</li>\n";
    }
-    QPtrList<Incidence> Relations = ev->relations();
+    Q3PtrList<Incidence> Relations = ev->relations();
    Incidence *to;
    for (to=Relations.first();to;to=Relations.next()) {
diff --git a/korganizer/kowhatsnextview.h b/korganizer/kowhatsnextview.h
index 93574ef..49fc448 100644
--- a/korganizer/kowhatsnextview.h
+++ b/korganizer/kowhatsnextview.h
@@ -20,10 +20,16 @@
 #define KOWHATSNEXTVIEW_H
-#include <qtextbrowser.h>
+#include <q3textbrowser.h>
 #include <qtimer.h>
+//Added by qt3to4:
+#include <QShowEvent>
+#include <QHideEvent>
+#include <QLabel>
+#include <Q3ValueList>
+#include <Q3PtrList>
 #include <korganizer/baseview.h>
-class QListView;
+class Q3ListView;
 class QLabel;
@@ -32,8 +38,8 @@ class KOEventViewerDialog;
 #include <qpainter.h>
 #include <qwidget.h>
-class WhatsNextTextBrowser : public QTextBrowser {
+class WhatsNextTextBrowser : public Q3TextBrowser {
    Q_OBJECT
  public:
-    WhatsNextTextBrowser(QWidget *parent) : QTextBrowser(parent) {};
+    WhatsNextTextBrowser(QWidget *parent) : Q3TextBrowser(parent) {};
    void setSource(const QString &);
@@ -59,5 +65,5 @@ class KOWhatsNextView : public KOrg::BaseView
    virtual int currentDateCount();
    void setEventViewer(KOEventViewerDialog* v );
-    virtual QPtrList<Incidence> selectedIncidences();
+    virtual Q3PtrList<Incidence> selectedIncidences();
    void clearList();
    DateList selectedDates()
@@ -71,5 +77,5 @@ class KOWhatsNextView : public KOrg::BaseView
    void printMe();
    virtual void showDates(const QDate &start, const QDate &end);
-    virtual void showEvents(QPtrList<Event> eventList);
+    virtual void showEvents(Q3PtrList<Event> eventList);
    void updateConfig();
    void changeEventDisplay(Event *, int);
@@ -97,5 +103,5 @@ class KOWhatsNextView : public KOrg::BaseView
    KOEventViewerDialog *mEventViewer;
    
-    QValueList<Incidence *> mTodos;
+    Q3ValueList<Incidence *> mTodos;
 };
diff --git a/korganizer/ktimeedit.cpp b/korganizer/ktimeedit.cpp
index df9b2fc..e2ae4a6 100644
--- a/korganizer/ktimeedit.cpp
+++ b/korganizer/ktimeedit.cpp
@@ -22,10 +22,13 @@
 */
-#include <qkeycode.h>
+#include <qnamespace.h>
 #include <qcombobox.h>
 #include <qdatetime.h>
 #include <qlineedit.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <QKeyEvent>
 #include <kmessagebox.h>
@@ -46,5 +49,5 @@
 // But Qt-3.2 will offer QLineEdit::setMask, so a "99:99" mask would help.
 KOTimeEdit::KOTimeEdit(QWidget *parent, QTime qt, const char *name)
-  : QComboBox(TRUE, parent, name)
+  : Q3ComboBox(TRUE, parent, name)
 {
  setInsertionPolicy(NoInsertion);
@@ -65,10 +68,10 @@ KOTimeEdit::KOTimeEdit(QWidget *parent, QTime qt, const char *name)
    insertItem(KGlobal::locale()->formatTime(timeEntry));
    timeEntry = timeEntry.addSecs(60*15);
-  } while (!timeEntry.isNull());
+  } while ( !( timeEntry.hour() || timeEntry.minute()  ) );
  // Add end of day.
  insertItem( KGlobal::locale()->formatTime( QTime( 23, 59, 59 ) ) );
  updateText();
-  setFocusPolicy(QWidget::StrongFocus);
+  setFocusPolicy(Qt::StrongFocus);
  connect(this, SIGNAL(activated(int)), this, SLOT(activ(int)));
@@ -209,6 +212,6 @@ void KOTimeEdit::keyPressEvent(QKeyEvent *e)
  }
  // Tap -> Focus Next Widget
-  if ( e->key() == Key_Tab ) {
+  if ( e->key() == Qt::Key_Tab ) {
-    QComboBox::keyPressEvent(e);
+    Q3ComboBox::keyPressEvent(e);
    return;
  }
@@ -221,10 +224,10 @@ void KOTimeEdit::keyPressEvent(QKeyEvent *e)
  // Switch for arrows, backspace and escape
  switch(e->key()) {
-  case Key_Escape:
+      case Qt::Key_Escape:
      lineEdit()->deselect();
-  case Key_Tab:
+      case Qt::Key_Tab:
-      QComboBox::keyPressEvent(e);
+      Q3ComboBox::keyPressEvent(e);
    break;
-  case Key_Up:
+      case Qt::Key_Up:
      if ( e->state () == Qt::ControlButton ) {
          addTime(QTime(0,15,0), false );
@@ -268,5 +271,5 @@ void KOTimeEdit::keyPressEvent(QKeyEvent *e)
              }
      break;
-  case Key_Down:
+      case Qt::Key_Down:
      if ( e->state () == Qt::ControlButton ) {
          subTime(QTime(0,15,0), false );
@@ -311,5 +314,5 @@ void KOTimeEdit::keyPressEvent(QKeyEvent *e)
      break;
  // set cursor to correct place
-  case Key_Left:
+      case Qt::Key_Left:
    if ( cpos == 3 )
        --cpos;
@@ -322,5 +325,5 @@ void KOTimeEdit::keyPressEvent(QKeyEvent *e)
    break;
  // set cursor to correct place
-  case Key_Right:
+      case Qt::Key_Right:
    if ( cpos == 1 )
        ++cpos;
@@ -331,11 +334,11 @@ void KOTimeEdit::keyPressEvent(QKeyEvent *e)
    break;
  // rest
-  case Key_Prior:
+      case Qt::Key_Prior:
    subTime(QTime(1,0,0));
    break;
-  case Key_Next:
+      case Qt::Key_Next:
    addTime(QTime(1,0,0));
    break;
-  case Key_Backspace:
+      case Qt::Key_Backspace:
      if ( cpos >  0) {
          if ( cpos == 3 )
@@ -343,5 +346,5 @@ void KOTimeEdit::keyPressEvent(QKeyEvent *e)
          if ( cpos > 5)
              cpos = 5;
-          text.at( cpos-1 ) = '0';
+          text[ cpos-1 ] = '0';
          lineEdit()->setText( text );
          lineEdit()->setCursorPosition(--cpos);
@@ -353,5 +356,5 @@ void KOTimeEdit::keyPressEvent(QKeyEvent *e)
  // if cursor at string end, alltext market and keyEvent don't ArrowLeft -> deselect and cpos
-  if( cpos > 4 && lineEdit()->markedText().length() == 5 && e->key() != Key_Left ) {
+  if( cpos > 4 && lineEdit()->markedText().length() == 5 && e->key() != Qt::Key_Left ) {
      lineEdit()->deselect();
      cpos = 0;
@@ -368,6 +371,6 @@ void KOTimeEdit::keyPressEvent(QKeyEvent *e)
      // switch another keys
      switch(e->key()) {
-      case Key_Delete:
+          case Qt::Key_Delete:
-          text.at( cpos ) = '0';
+          text[ cpos ] = '0';
          lineEdit()->setText( text );
          lineEdit()->setCursorPosition(cpos);
@@ -375,33 +378,33 @@ void KOTimeEdit::keyPressEvent(QKeyEvent *e)
          changedText();
          break;
-      case Key_9:
+          case Qt::Key_9:
-      case Key_8:
+          case Qt::Key_8:
-      case Key_7:
+          case Qt::Key_7:
-      case Key_6:
+          case Qt::Key_6:
          if ( !(cpos == 1 ||  cpos == 4)  )
              return;
          if ( cpos == 1  && text.at( 0 ) > '1')
-              text.at( 0 ) = '1';
+              text[ 0 ] = '1';
-      case Key_5:
+          case Qt::Key_5:
-      case Key_4:
+          case Qt::Key_4:
-      case Key_3:
+          case Qt::Key_3:
          if ( cpos < 1 )
              return;
          if ( hour12Format  && cpos == 1  )
              return;
-      case Key_2:
+          case Qt::Key_2:
          if ( hour12Format  && cpos == 0 )
              return;
          if ( cpos == 0  && text.at( 1 ) > '3')
-              text.at( 1 ) = '3';
+              text[ 1 ] = '3';
-      case Key_1:
+          case Qt::Key_1:
-      case Key_0:
+          case Qt::Key_0:
          if ( hour12Format ) {
-              if ( e->key() == Key_0  && cpos == 1 && text.at( 0 ) == '0' )
+              if ( e->key() == Qt::Key_0  && cpos == 1 && text.at( 0 ) == '0' )
                  return;
-              if ( e->key() == Key_0  && cpos == 0 && text.at( 1 ) == '0' )
+              if ( e->key() == Qt::Key_0  && cpos == 0 && text.at( 1 ) == '0' )
-                 text.at( 1 ) = '1';
+                 text[ 1 ] = '1';
          }
-          text.at( cpos ) = QChar ( e->key() );
+          text[ cpos ] = QChar ( e->key() );
          lineEdit()->setText( text );
          if ( cpos == 1 )
@@ -412,9 +415,9 @@ void KOTimeEdit::keyPressEvent(QKeyEvent *e)
            changedText();
        break;
-      case Key_Home:
+          case Qt::Key_Home:
            lineEdit()->setCursorPosition(0);
            setSelect( cpos , 1 );
        break;
-      case Key_End:
+          case Qt::Key_End:
            lineEdit()->setCursorPosition(5);
            lineEdit()->deselect();
@@ -426,11 +429,11 @@ void KOTimeEdit::keyPressEvent(QKeyEvent *e)
  } else if ( cpos == 5 ) {// if cpos < 5
      if ( hour12Format ) {
-          if ( e->key() == Key_A ) {
+          if ( e->key() == Qt::Key_A ) {
-              text.at( 5 ) = 'a';
+              text[ 5 ] = 'a';
              lineEdit()->setText( text );
              lineEdit()->setCursorPosition(5);
-          } else if ( e->key() == Key_P ) {
+          } else if ( e->key() == Qt::Key_P ) {
-              text.at( 5 ) = 'p';
+              text[ 5 ] = 'p';
              lineEdit()->setText( text );
              lineEdit()->setCursorPosition(5);
diff --git a/korganizer/ktimeedit.h b/korganizer/ktimeedit.h
index b3d842d..1c7d18d 100644
--- a/korganizer/ktimeedit.h
+++ b/korganizer/ktimeedit.h
@@ -25,8 +25,11 @@
 #include <qevent.h>
-#include <qkeycode.h>
+#include <qnamespace.h>
 #include <qstring.h>
 #include <qdatetime.h>
 #include <qcombobox.h>
+#include <Q3ComboBox>
+//Added by qt3to4:
+#include <QKeyEvent>
 #include <kapplication.h>
@@ -39,5 +42,5 @@
  @author Preston Brown, Ian Dawes
 */
-class KOTimeEdit : public QComboBox
+class KOTimeEdit : public Q3ComboBox
 {
    Q_OBJECT
diff --git a/korganizer/lineview.cpp b/korganizer/lineview.cpp
index e72e41c..012455e 100644
--- a/korganizer/lineview.cpp
+++ b/korganizer/lineview.cpp
@@ -8,5 +8,5 @@
 LineView::LineView( QWidget *parent, const char *name ) :
-  QScrollView( parent, name )
+  Q3ScrollView( parent, name )
 {
  mPixelWidth = 1000;
diff --git a/korganizer/lineview.h b/korganizer/lineview.h
index aa34dbc..52ae9cf 100644
--- a/korganizer/lineview.h
+++ b/korganizer/lineview.h
@@ -2,8 +2,8 @@
 #define LINEVIEW_H
-#include <qscrollview.h>
+#include <q3scrollview.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
-class LineView : public QScrollView
+class LineView : public Q3ScrollView
 {
    Q_OBJECT
@@ -29,5 +29,5 @@ class LineView : public QScrollView
    };
-    QPtrList<Line> mLines;
+    Q3PtrList<Line> mLines;
    int mPixelWidth;
 };
diff --git a/korganizer/main.cpp b/korganizer/main.cpp
index 4a0e24f..211fde6 100644
--- a/korganizer/main.cpp
+++ b/korganizer/main.cpp
@@ -5,4 +5,6 @@
 #include <qcopchannel_qws.h> 
 #include <qpe/global.h>
+//Added by qt3to4:
+#include <Q3CString>
 #include <stdlib.h>
 #else
@@ -10,6 +12,4 @@
 #include <qstring.h>
 #include <qwindowsstyle.h> 
-#include <qplatinumstyle.h> 
-#include <qsgistyle.h> 
 #include <stdlib.h>
 #endif
@@ -27,4 +27,5 @@ void dumpMissing();
 int main( int argc, char **argv )
 {
+    if(!getenv("QPEDIR")) putenv("QPEDIR=/usr/lib/kdepimpi");
 #ifndef DESKTOP_VERSION
  QPEApplication a( argc, argv );
@@ -32,5 +33,4 @@ int main( int argc, char **argv )
 #else
  QApplication a( argc, argv ); 
-  QApplication::setStyle( new QPlatinumStyle ());
 #ifdef _WIN32_
  QString hdir ( getenv( "HOME") );
@@ -90,5 +90,5 @@ int main( int argc, char **argv )
 #ifndef DESKTOP_VERSION
     
-      QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&m, SLOT(receiveStart(  const QCString&, const QByteArray& )));
+      QObject::connect( &a, SIGNAL (appMessage ( const Q3CString &, const QByteArray & )),&m, SLOT(receiveStart(  const Q3CString&, const QByteArray& )));
      a.showMainWidget(&m );
 #else
@@ -99,5 +99,5 @@ int main( int argc, char **argv )
 #endif
      if ( argc > 1 ) {
-          QCString command = argv[1];
+          Q3CString command = argv[1];
          if ( argc > 2 )
              command += argv[2];
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 69ccde1..2004939 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -2,7 +2,8 @@
 #include <qaction.h>
-#include <qpopupmenu.h>
+#include <Q3Action>
+#include <q3popupmenu.h>
 #include <qpainter.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
 #include <qpushbutton.h>
 #include <qmessagebox.h>
@@ -11,5 +12,5 @@
 #include <qfile.h>
 #include <qdir.h>
-#include <qapp.h>
+#include <qapplication.h>
 #include <qfileinfo.h>
 #include <qlabel.h>
@@ -17,7 +18,7 @@
 #include <qcheckbox.h>
 #include <qmap.h>
-#include <qwmatrix.h>
+#include <qmatrix.h>
-#include <qtextbrowser.h>
+#include <q3textbrowser.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/global.h>
@@ -29,6 +30,15 @@
 //#include <unistd.h> // for sleep
 #else
-#include <qtoolbar.h>
+#include <q3toolbar.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QPixmap>
+#include <QCloseEvent>
+#include <QKeyEvent>
+#include <Q3VBoxLayout>
+#include <QHideEvent>
+#include <Q3CString>
+#include <Q3PtrList>
 //#include <resource.h>
@@ -81,20 +91,20 @@ class KOex2phonePrefs : public QDialog
    {
        setCaption( i18n("Export to phone options") );
-        QVBoxLayout* lay = new QVBoxLayout( this );
+        Q3VBoxLayout* lay = new Q3VBoxLayout( this );
        lay->setSpacing( 3 );
        lay->setMargin( 3 );
        QLabel *lab;
        lay->addWidget(lab = new QLabel( i18n("Please read Help-Sync Howto\nto know what settings to use."), this ) );  
-        lab->setAlignment (AlignHCenter  ); 
+        lab->setAlignment (Qt::AlignHCenter  ); 
-        QHBox* temphb;
+        Q3HBox* temphb;
-        temphb = new QHBox( this );
+        temphb = new Q3HBox( this );
        new QLabel( i18n("I/O device: "), temphb ); 
        mPhoneDevice = new QLineEdit( temphb);
        lay->addWidget( temphb );
-        temphb = new QHBox( this );
+        temphb = new Q3HBox( this );
        new QLabel( i18n("Connection: "), temphb ); 
        mPhoneConnection = new QLineEdit( temphb);
        lay->addWidget( temphb );
-        temphb = new QHBox( this );
+        temphb = new Q3HBox( this );
        new QLabel( i18n("Model(opt.): "), temphb ); 
        mPhoneModel = new QLineEdit( temphb);
@@ -103,5 +113,5 @@ class KOex2phonePrefs : public QDialog
        mWriteBackFuture->setChecked( true );
        lay->addWidget( mWriteBackFuture );
-        temphb = new QHBox( this );
+        temphb = new Q3HBox( this );
        new QLabel( i18n("Max. weeks in future: ") , temphb );
        mWriteBackFutureWeeks= new QSpinBox(1,104, 1, temphb);
@@ -109,5 +119,5 @@ class KOex2phonePrefs : public QDialog
        lay->addWidget( temphb );  
        lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ntodo/calendar data on phone!"), this ) );  
-        lab->setAlignment (AlignHCenter  ); 
+        lab->setAlignment (Qt::AlignHCenter  ); 
        QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this );
        lay->addWidget( ok );
@@ -135,5 +145,5 @@ QPixmap* sgListViewJournalPix;
 int globalFlagBlockStartup;
 MainWindow::MainWindow( QWidget *parent, const char *name ) :
-    QMainWindow( parent, name )
+    Q3MainWindow( parent, name )
 {
    sgListViewCompletedPix[5] = &listviewPix;
@@ -186,16 +196,16 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
    if ( p->mHourSize >  22 )
        p->mHourSize = 22;
-    QMainWindow::ToolBarDock tbd;
+    Qt::ToolBarDock tbd;
    if ( p->mToolBarHor ) {
        if ( p->mToolBarUp )
-            tbd = Bottom;
+            tbd = Qt::Bottom;
        else
-            tbd = Top;
+            tbd = Qt::Top;
    }
    else {
        if ( p->mToolBarUp )
-            tbd = Right;
+            tbd = Qt::Right;
        else
-            tbd = Left;
+            tbd = Qt::Left;
    }
    if ( KOPrefs::instance()->mUseAppColors )
@@ -214,13 +224,13 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
        if ( p->mToolBarHorF ) {
            if ( p->mToolBarUpF )
-                tbd = Bottom;
+                tbd = Qt::Bottom;
            else
-                tbd = Top;
+                tbd = Qt::Top;
        }
        else {
            if ( p->mToolBarUpF )
-            tbd = Right;
+            tbd = Qt::Right;
            else
-                tbd = Left;
+                tbd = Qt::Left;
        }
        filterToolBar = new QPEToolBar ( this );
@@ -231,5 +241,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
        filterMenubar->setFocusPolicy( NoFocus );
 #endif     
-        filterPopupMenu = new QPopupMenu( this );
+        filterPopupMenu = new Q3PopupMenu( this );
        filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0  );
        QString addTest = "A";  
@@ -260,13 +270,13 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
        if ( p->mToolBarHorV ) {
            if ( p->mToolBarUpV )
-                tbd = Bottom;
+                tbd = Qt::Bottom;
            else
-                tbd = Top;
+                tbd = Qt::Top;
        }
        else {
            if ( p->mToolBarUpV )
-                tbd = Right;
+                tbd = Qt::Right;
            else
-                tbd = Left;
+                tbd = Qt::Left;
        }
        viewToolBar = new QPEToolBar( this );
@@ -274,13 +284,13 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
        if ( p->mToolBarHorN ) {
            if ( p->mToolBarUpN )
-                tbd = Bottom;
+                tbd = Qt::Bottom;
            else
-                tbd = Top;
+                tbd = Qt::Top;
        }
        else {
            if ( p->mToolBarUpN )
-                tbd = Right;
+                tbd = Qt::Right;
            else
-                tbd = Left;
+                tbd = Qt::Left;
        }
        navigatorToolBar = new QPEToolBar( this );
@@ -441,7 +451,7 @@ void  MainWindow::loadDataAfterStart()
             SLOT( slotModifiedChanged( bool ) ) );
 #ifndef DESKTOP_VERSION
-    connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
+    connect(qApp, SIGNAL (appMessage ( const Q3CString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const Q3CString &, const QByteArray & )));
-    connect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(recieve(  const QCString&, const QByteArray& )));
+    connect( qApp, SIGNAL (appMessage ( const Q3CString &, const QByteArray & )), this, SLOT(recieve(  const Q3CString&, const QByteArray& )));
-    disconnect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(receiveStart(  const QCString&, const QByteArray& )));
+    disconnect( qApp, SIGNAL (appMessage ( const Q3CString &, const QByteArray & )), this, SLOT(receiveStart(  const Q3CString&, const QByteArray& )));
    if ( !mCStringMess.isEmpty() ) 
        recieve( mCStringMess, mByteData );
@@ -510,5 +520,5 @@ void MainWindow::toggleBeamReceive()
    brAction->setOn(true);
    infrared = new QCopChannel("QPE/Application/datebook",this, "channel" ) ;   
-    QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(recieve(  const QCString&, const QByteArray& )));
+    QObject::connect( infrared, SIGNAL (received ( const Q3CString &, const QByteArray & )),this, SLOT(recieve(  const Q3CString&, const QByteArray& )));
 #endif
 }
@@ -601,5 +611,5 @@ void MainWindow::closeEvent( QCloseEvent* ce )
 }
-void MainWindow::receiveStart( const QCString& cmsg, const QByteArray& data )
+void MainWindow::receiveStart( const Q3CString& cmsg, const QByteArray& data )
 {
    qDebug("KO: QCOP start message received: %s ", cmsg.data()  );
@@ -607,7 +617,7 @@ void MainWindow::receiveStart( const QCString& cmsg, const QByteArray& data )
    mByteData = data;
 }
-void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
+void MainWindow::recieve( const Q3CString& cmsg, const QByteArray& data )
 {
-    QDataStream stream( data, IO_ReadOnly );
+    QDataStream stream( const_cast<QByteArray*>(&data), QIODevice::ReadOnly );
    // QMessageBox::about( this, "About KOrganizer/Pi", "*" +msg +"*" );
    //QString datamess;
@@ -616,5 +626,5 @@ void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
 
    if ( cmsg == "setDocument(QString)" ) {
-        QDataStream stream( data, IO_ReadOnly );
+        QDataStream stream( const_cast<QByteArray*>(&data), QIODevice::ReadOnly );
        QString fileName;
        stream >> fileName;
@@ -745,19 +755,19 @@ void MainWindow::initActions()
    //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar );
-    QPopupMenu *viewMenu = new QPopupMenu( this );
+    Q3PopupMenu *viewMenu = new Q3PopupMenu( this );
-    QPopupMenu *actionMenu = new QPopupMenu( this );
+    Q3PopupMenu *actionMenu = new Q3PopupMenu( this );
-    mCurrentItemMenu = new QPopupMenu ( this );
+    mCurrentItemMenu = new Q3PopupMenu ( this );
-    QPopupMenu *nextConflictMenu = new QPopupMenu ( this );
+    Q3PopupMenu *nextConflictMenu = new Q3PopupMenu ( this );
-    QPopupMenu *importMenu = new QPopupMenu( this );
+    Q3PopupMenu *importMenu = new Q3PopupMenu( this );
-    QPopupMenu *importMenu_X = new QPopupMenu( this );
+    Q3PopupMenu *importMenu_X = new Q3PopupMenu( this );
-    QPopupMenu *exportMenu_X = new QPopupMenu( this );
+    Q3PopupMenu *exportMenu_X = new Q3PopupMenu( this );
-    QPopupMenu *beamMenu_X = new QPopupMenu( this );
+    Q3PopupMenu *beamMenu_X = new Q3PopupMenu( this );
-    selectFilterMenu = new QPopupMenu( this );
+    selectFilterMenu = new Q3PopupMenu( this );
    selectFilterMenu->setCheckable( true );
-    syncMenu = new QPopupMenu( this );
+    syncMenu = new Q3PopupMenu( this );
-    configureAgendaMenu = new QPopupMenu( this );
+    configureAgendaMenu = new Q3PopupMenu( this );
-    configureToolBarMenu = new QPopupMenu( this );
+    configureToolBarMenu = new Q3PopupMenu( this );
-    QPopupMenu *helpMenu = new QPopupMenu( this );
+    Q3PopupMenu *helpMenu = new Q3PopupMenu( this );
-    QIconSet icon;
+    QIcon icon;
    int pixWid = 22, pixHei = 22;
    QString pathString = "";
@@ -792,5 +802,5 @@ void MainWindow::initActions()
    } else {
        menuBar1 = new KMenuBar( iconToolBar );
-        QPopupMenu *menuBar = new QPopupMenu( this );
+        Q3PopupMenu *menuBar = new Q3PopupMenu( this );
        icon = loadPixmap( pathString + "z_menu" );
        menuBar1->insertItem( icon.pixmap(), menuBar);
@@ -819,5 +829,5 @@ void MainWindow::initActions()
    mWeekPixmap.fill( mWeekBgColor );
    icon = mWeekPixmap;
-    mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this );
+    mWeekAction = new Q3Action( i18n("Select week number"),icon, i18n("Select week number"), 0, this );
    if ( p-> mShowIconWeekNum )
        mWeekAction->addTo( iconToolBar );
@@ -841,9 +851,9 @@ void MainWindow::initActions()
    if ( p->mShowIconFilterview ) {
        icon = loadPixmap( pathString + "filter" );
-        actionFilterMenuTB = new QAction( i18n("Filter selector"), icon, i18n("Filter selector"), 0, this );
+        actionFilterMenuTB = new Q3Action( i18n("Filter selector"), icon, i18n("Filter selector"), 0, this );
        connect( actionFilterMenuTB, SIGNAL( activated() ),
                 this, SLOT( fillFilterMenuTB() ) );
        actionFilterMenuTB->addTo( iconToolBar  );
-        selectFilterMenuTB = new QPopupMenu( this );
+        selectFilterMenuTB = new Q3PopupMenu( this );
        selectFilterMenuTB->setCheckable( true ); 
        connect ( selectFilterMenuTB, SIGNAL( activated ( int )  ), this, SLOT (selectFilter( int ) ) );
@@ -852,5 +862,5 @@ void MainWindow::initActions()
    //#endif
    // ******************
-    QAction *action;
+    Q3Action *action;
    // QPopupMenu *configureMenu= new QPopupMenu( menuBar );
    configureToolBarMenu->setCheckable( true );
@@ -867,5 +877,5 @@ void MainWindow::initActions()
             this, SLOT( showConfigureAgenda( ) ) );
    icon = loadPixmap( pathString + "today" );
-    QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
+    Q3Action* today_action = new Q3Action( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
    today_action->addTo( actionMenu );
    connect( today_action, SIGNAL( activated() ),
@@ -873,5 +883,5 @@ void MainWindow::initActions()
    icon = loadPixmap( pathString + "picker" );
-    QAction* dPickerAction = new QAction( i18n("Select Date..."), icon, i18n("Select Date..."), 0, this );
+    Q3Action* dPickerAction = new Q3Action( i18n("Select Date..."), icon, i18n("Select Date..."), 0, this );
    dPickerAction->addTo( actionMenu );
    connect( dPickerAction, SIGNAL( activated() ),
@@ -879,5 +889,5 @@ void MainWindow::initActions()
    icon = loadPixmap( pathString + "search" );
-    QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this );
+    Q3Action* search_action = new Q3Action( i18n("Search"), icon, i18n("Search..."), 0, this );
    search_action->addTo( actionMenu );
    connect( search_action, SIGNAL( activated() ),
@@ -885,15 +895,15 @@ void MainWindow::initActions()
    actionMenu->insertItem( i18n("Show next conflict for"), nextConflictMenu );
-    action = new QAction( "Undo Delete", i18n("All events"), 0, this );
+    action = new Q3Action( "Undo Delete", i18n("All events"), 0, this );
    action->addTo( nextConflictMenu );
    connect( action, SIGNAL( activated() ),
             mView, SLOT( conflictAll() ) );
-    action = new QAction( "Undo Delete", i18n("Allday events"), 0, this );
+    action = new Q3Action( "Undo Delete", i18n("Allday events"), 0, this );
    action->addTo( nextConflictMenu );
    connect( action, SIGNAL( activated() ),
             mView, SLOT( conflictAllday() ) );
-    action = new QAction( "Undo Delete", i18n("Events with time"), 0, this );
+    action = new Q3Action( "Undo Delete", i18n("Events with time"), 0, this );
    action->addTo( nextConflictMenu );
    connect( action, SIGNAL( activated() ),
@@ -903,14 +913,14 @@ void MainWindow::initActions()
    
     icon = loadPixmap( pathString + "newevent" );
-    QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this );
+    Q3Action* ne_action = new Q3Action( i18n("New Event..."), icon, i18n("New Event..."), 0, this );
    ne_action->addTo( mCurrentItemMenu );
    connect( ne_action, SIGNAL( activated() ),
             mView, SLOT( newEvent() ) );
    icon = loadPixmap( pathString + "newtodo" );
-    QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this );
+    Q3Action* nt_action = new Q3Action( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this );
    nt_action->addTo( mCurrentItemMenu );
    connect( nt_action, SIGNAL( activated() ),
             mView, SLOT( newTodo() ) );
-    mNewSubTodoAction = new QAction( "new_subtodo", i18n("New Sub-Todo..."), 0,
+    mNewSubTodoAction = new Q3Action( "new_subtodo", i18n("New Sub-Todo..."), 0,
                                     this );
    mNewSubTodoAction->addTo(  mCurrentItemMenu );
@@ -931,15 +941,15 @@ void MainWindow::initActions()
    //actionMenu->insertItem (  i18n("Selected Item"),  mCurrentItemMenu);
-    mShowAction = new QAction( "show_incidence", i18n("Show"), 0, this );
+    mShowAction = new Q3Action( "show_incidence", i18n("Show"), 0, this );
    mShowAction->addTo( mCurrentItemMenu  );
    connect( mShowAction, SIGNAL( activated() ),
             mView, SLOT( showIncidence() ) );
-    mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this );
+    mEditAction = new Q3Action( "edit_incidence", i18n("Edit..."), 0, this );
    mEditAction->addTo( mCurrentItemMenu  );
    connect( mEditAction, SIGNAL( activated() ),
             mView, SLOT( editIncidence() ) );
-    mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this );
+    mDeleteAction = new Q3Action( "delete_incidence", i18n("Delete..."), 0, this );
    mDeleteAction->addTo(  mCurrentItemMenu );
    connect( mDeleteAction, SIGNAL( activated() ),
@@ -947,19 +957,19 @@ void MainWindow::initActions()
-    mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this );
+    mCloneAction = new Q3Action( "clone_incidence", i18n("Clone..."), 0, this );
    mCloneAction->addTo( mCurrentItemMenu  );
    connect( mCloneAction, SIGNAL( activated() ),
             mView, SLOT( cloneIncidence() ) );
-    mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this );
+    mMoveAction = new Q3Action( "Move_incidence", i18n("Move..."), 0, this );
    mMoveAction->addTo( mCurrentItemMenu  );
    connect( mMoveAction, SIGNAL( activated() ),
             mView, SLOT( moveIncidence() ) );
 #ifndef DESKTOP_VERSION
-    mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this );
+    mBeamAction = new Q3Action( "Beam_incidence", i18n("Beam..."), 0, this );
    mBeamAction->addTo(mCurrentItemMenu  );
    connect( mBeamAction, SIGNAL( activated() ),
             mView, SLOT( beamIncidence() ) );
 #endif
-    mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this );
+    mCancelAction = new Q3Action( "Cancel_incidence", i18n("Toggle Cancel"), 0, this );
    mCancelAction->addTo( mCurrentItemMenu  );
    connect( mCancelAction, SIGNAL( activated() ),
@@ -968,5 +978,5 @@ void MainWindow::initActions()
  
   mCurrentItemMenu->insertSeparator();
-    action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this );
+    action = new Q3Action( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this );
    action->addTo( mCurrentItemMenu );
    connect( action, SIGNAL( activated() ),
@@ -980,5 +990,5 @@ void MainWindow::initActions()
    }
    configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 );
-    QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this );
+    Q3Action* FSaction = new Q3Action( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this );
    FSaction->addTo( viewMenu );
    connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() ));
@@ -988,5 +998,5 @@ void MainWindow::initActions()
    configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 );
    icon = loadPixmap( pathString + "configure" );
-    action = new QAction( i18n("Toggle Resource View"), icon, i18n("Toggle Resource View"), 0, this );
+    action = new Q3Action( i18n("Toggle Resource View"), icon, i18n("Toggle Resource View"), 0, this );
    action->addTo( viewMenu );
    connect( action, SIGNAL( activated() ),
@@ -995,5 +1005,5 @@ void MainWindow::initActions()
    icon = loadPixmap( pathString + "navi" );
    configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 );
-    action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
+    action = new Q3Action( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
    action->addTo( viewMenu );
    connect( action, SIGNAL( activated() ),
@@ -1002,5 +1012,5 @@ void MainWindow::initActions()
    icon = loadPixmap( pathString + "allday" );
    configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 );
-    action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this );
+    action = new Q3Action( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this );
    action->addTo( viewMenu );
    connect( action, SIGNAL( activated() ),
@@ -1032,5 +1042,5 @@ void MainWindow::initActions()
    icon = loadPixmap( pathString + "whatsnext" );
    configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 );
-    QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this );
+    Q3Action* whatsnext_action = new Q3Action( i18n("What's Next"), icon, i18n("What's Next"), 0, this );
    whatsnext_action->addTo( viewMenu );
    connect( whatsnext_action, SIGNAL( activated() ),
@@ -1039,5 +1049,5 @@ void MainWindow::initActions()
    icon = loadPixmap( pathString + "xdays" );
    configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 );
-    QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this );
+    Q3Action* xdays_action = new Q3Action( i18n("Next days"), icon, i18n("Next days"), 0, this );
    xdays_action->addTo( viewMenu );
    connect( xdays_action, SIGNAL( activated() ),
@@ -1047,5 +1057,5 @@ void MainWindow::initActions()
    icon = loadPixmap( pathString + "journal" );
    configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 );
-    QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this );
+    Q3Action* viewjournal_action = new Q3Action( i18n("Journal"), icon, i18n("Journal"), 0, this );
    viewjournal_action->addTo( viewMenu );
    connect( viewjournal_action, SIGNAL( activated() ),
@@ -1055,5 +1065,5 @@ void MainWindow::initActions()
    icon = loadPixmap( pathString + "day" );
    configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 );
-    QAction* day1_action = new QAction( i18n("Day View"), icon, i18n("Day View"), 0, this );
+    Q3Action* day1_action = new Q3Action( i18n("Day View"), icon, i18n("Day View"), 0, this );
    day1_action->addTo( viewMenu );
    //  action->addTo( toolBar );
@@ -1063,5 +1073,5 @@ void MainWindow::initActions()
    icon = loadPixmap( pathString + "workweek" );
    configureToolBarMenu->insertItem(icon, i18n("Work Week"), 50 );
-    QAction* day5_action = new QAction( i18n("Work Week"), icon, i18n("Work Week"), 0, this );
+    Q3Action* day5_action = new Q3Action( i18n("Work Week"), icon, i18n("Work Week"), 0, this );
    day5_action->addTo( viewMenu );
    connect( day5_action, SIGNAL( activated() ),
@@ -1070,5 +1080,5 @@ void MainWindow::initActions()
    icon = loadPixmap( pathString + "week" );
    configureToolBarMenu->insertItem(icon, i18n("Week"), 60 );
-    QAction* day7_action = new QAction( i18n("Week"), icon, i18n("Week"), 0, this );
+    Q3Action* day7_action = new Q3Action( i18n("Week"), icon, i18n("Week"), 0, this );
    day7_action->addTo( viewMenu );
    connect( day7_action, SIGNAL( activated() ),
@@ -1077,5 +1087,5 @@ void MainWindow::initActions()
    icon = loadPixmap( pathString + "workweek2" );
    configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 );
-    QAction* day6_action = new QAction( i18n("List week"), icon, i18n("List week"), 0, this );
+    Q3Action* day6_action = new Q3Action( i18n("List week"), icon, i18n("List week"), 0, this );
    day6_action->addTo( viewMenu );
    connect( day6_action, SIGNAL( activated() ),
@@ -1084,5 +1094,5 @@ void MainWindow::initActions()
    icon = loadPixmap( pathString + "month" );
    configureToolBarMenu->insertItem(icon, i18n("Month"), 70 );
-    QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this );
+    Q3Action* month_action = new Q3Action( i18n("Month"), icon, i18n("Month"), 0, this );
    month_action->addTo( viewMenu );
    connect( month_action, SIGNAL( activated() ),
@@ -1091,5 +1101,5 @@ void MainWindow::initActions()
     icon = loadPixmap( pathString + "list" );
    configureToolBarMenu->insertItem(icon, i18n("List View"), 30 );
-    QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this );
+    Q3Action* showlist_action = new Q3Action( i18n("List View"), icon, i18n("List View"), 0, this );
    showlist_action->addTo( viewMenu );
    connect( showlist_action, SIGNAL( activated() ),
@@ -1098,5 +1108,5 @@ void MainWindow::initActions()
    icon = loadPixmap( pathString + "todo" );
    configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 );
-    QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this );
+    Q3Action* todoview_action = new Q3Action( i18n("Todo View"), icon, i18n("Todo View"), 0, this );
    todoview_action->addTo( viewMenu );
    connect( todoview_action, SIGNAL( activated() ),
@@ -1106,5 +1116,5 @@ void MainWindow::initActions()
 #if 0
-    action = new QAction( "view_timespan", "Time Span", 0, this );
+    action = new Q3Action( "view_timespan", "Time Span", 0, this );
    action->addTo( viewMenu );
    connect( action, SIGNAL( activated() ),
@@ -1114,5 +1124,5 @@ void MainWindow::initActions()
 
-    action = new QAction( "purge_completed", i18n("Purge Completed..."), 0,
+    action = new Q3Action( "purge_completed", i18n("Purge Completed..."), 0,
                          this );
    action->addTo( actionMenu );
@@ -1126,10 +1136,10 @@ void MainWindow::initActions()
    actionMenu->insertSeparator();
-     action = new QAction( "manage cat", i18n("Edit category list..."), 0,
+     action = new Q3Action( "manage cat", i18n("Edit category list..."), 0,
                          this );
    action->addTo(  actionMenu );
    connect( action, SIGNAL( activated() ), mView, SLOT( editCategories() ) );
-     action = new QAction( "manage cat", i18n("Manage new categories..."), 0,
+     action = new Q3Action( "manage cat", i18n("Manage new categories..."), 0,
                          this );
    action->addTo(  actionMenu );
@@ -1139,13 +1149,13 @@ void MainWindow::initActions()
    actionMenu->insertSeparator();
    icon = loadPixmap( pathString + "configure" );
-    action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this );
+    action = new Q3Action( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this );
    action->addTo( actionMenu );
    connect( action, SIGNAL( activated() ),
             mView, SLOT( edit_options() ) );  
-    action = new QAction( i18n("Configure"),icon, i18n("Configure Calendar Files..."), 0, this );
+    action = new Q3Action( i18n("Configure"),icon, i18n("Configure Calendar Files..."), 0, this );
    action->addTo( actionMenu );
    connect( action, SIGNAL( activated() ),
             this, SLOT( calHint() ) );  
-    action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this );
+    action = new Q3Action( i18n("Configure"),icon, i18n("Global Settings..."), 0, this );
    action->addTo( actionMenu );
    connect( action, SIGNAL( activated() ),
@@ -1156,14 +1166,14 @@ void MainWindow::initActions()
    }
    // actionMenu->insertSeparator();
-    action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0,
+    action = new Q3Action( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0,
                          this );
    action->addTo( importMenu_X );
    connect( action, SIGNAL( activated() ), SLOT( importIcal() ) );
-    action = new QAction( "import_quick", i18n("Import last file"), 0,
+    action = new Q3Action( "import_quick", i18n("Import last file"), 0,
                          this );
    action->addTo( importMenu_X );
    connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) );
    importMenu_X->insertSeparator();
-    action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0,
+    action = new Q3Action( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0,
                          this );
    action->addTo( importMenu_X );
@@ -1171,5 +1181,5 @@ void MainWindow::initActions()
    //#ifndef DESKTOP_VERSION
    importMenu_X->insertSeparator();
-    action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0,
+    action = new Q3Action( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0,
                          this );
    action->addTo( importMenu_X );
@@ -1178,5 +1188,5 @@ void MainWindow::initActions()
 #ifdef _OL_IMPORT_
    importMenu_X->insertSeparator();
-    action = new QAction( "import_ol", i18n("Import from OL"), 0,
+    action = new Q3Action( "import_ol", i18n("Import from OL"), 0,
                          this );
    action->addTo( importMenu_X );
@@ -1187,10 +1197,10 @@ void MainWindow::initActions()
    //importMenu->insertSeparator();
 #if 0
-    action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0,
+    action = new Q3Action( "load_cal", i18n("Load Calendar Backup"), 0,
                          this );
    action->addTo( importMenu );
    connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) );
 #endif
-    action = new QAction( "save_cal", i18n("Save Backup..."), 0,
+    action = new Q3Action( "save_cal", i18n("Save Backup..."), 0,
                          this );
    action->addTo( importMenu );
@@ -1199,9 +1209,9 @@ void MainWindow::initActions()
    importMenu->insertItem( i18n("Import"), importMenu_X );
    //importMenu->insertSeparator();
-    action = new QAction( "export ical", i18n("Export All Data"), 0,
+    action = new Q3Action( "export ical", i18n("Export All Data"), 0,
                          this );
    action->addTo( exportMenu_X );    
    connect( action, SIGNAL( activated() ), SLOT( exportICalendar() ) );
-    action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0,
+    action = new Q3Action( "import_qtopia", i18n("Export VCalendar"), 0,
                          this );
    action->addTo( exportMenu_X );    
@@ -1210,5 +1220,5 @@ void MainWindow::initActions()
    //LR
-    QPopupMenu *ex2phone = new QPopupMenu( this );
+    Q3PopupMenu *ex2phone = new Q3PopupMenu( this );
    ex2phone->insertItem(i18n("Complete calendar..."), 1 );
    ex2phone->insertItem(i18n("Filtered calendar..."), 2 );
@@ -1220,5 +1230,5 @@ void MainWindow::initActions()
 #ifndef DESKTOP_VERSION
    //importMenu->insertSeparator();
-    brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0,
+    brAction = new Q3Action( "beam toggle", i18n("Beam receive enabled"), 0,
                          this );
    brAction->addTo( beamMenu_X ); 
@@ -1226,10 +1236,10 @@ void MainWindow::initActions()
    connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) );
-    action = new QAction( "beam all", i18n("Beam complete calendar..."), 0,
+    action = new Q3Action( "beam all", i18n("Beam complete calendar..."), 0,
                          this );
    action->addTo( beamMenu_X );
    connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) );
-    action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0,
+    action = new Q3Action( "beam all", i18n("Beam filtered calendar..."), 0,
                          this );
    action->addTo( beamMenu_X );
@@ -1239,5 +1249,5 @@ void MainWindow::initActions()
    //importMenu->insertSeparator();
    icon = loadPixmap( pathString + "print" );
-    action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this );
+    action = new Q3Action( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this );
    action->addTo( beamMenu_X );
    connect( action, SIGNAL( activated() ),
@@ -1245,10 +1255,10 @@ void MainWindow::initActions()
    icon = loadPixmap( pathString + "week" );
-    action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this );
+    action = new Q3Action( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this );
    action->addTo( beamMenu_X );
    connect( action, SIGNAL( activated() ),
             this, SLOT( printSel() ) );  
    icon = loadPixmap( pathString + "whatsnext" );
-    action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this );
+    action = new Q3Action( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this );
    action->addTo( beamMenu_X );
    connect( action, SIGNAL( activated() ),
@@ -1257,5 +1267,5 @@ void MainWindow::initActions()
 
    icon = loadPixmap( pathString + "list" );
-    action = new QAction( i18n("Print List View..."),icon,i18n("Print List View..."), 0, this );
+    action = new Q3Action( i18n("Print List View..."),icon,i18n("Print List View..."), 0, this );
    action->addTo( beamMenu_X );
    connect( action, SIGNAL( activated() ),
@@ -1263,5 +1273,5 @@ void MainWindow::initActions()
    icon = loadPixmap( pathString + "newevent" );
-   action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this );
+   action = new Q3Action( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this );
    action->addTo( beamMenu_X );
    connect( action, SIGNAL( activated() ),
@@ -1272,9 +1282,9 @@ void MainWindow::initActions()
    
    importMenu->insertSeparator();
-    action = new QAction( "beam all", i18n("Save"), 0,
+    action = new Q3Action( "beam all", i18n("Save"), 0,
                          this );
    action->addTo( importMenu );
    connect( action, SIGNAL( activated() ), this, SLOT( save() ) );
-    action = new QAction( "beam all", i18n("Exit (+save)"), 0,
+    action = new Q3Action( "beam all", i18n("Exit (+save)"), 0,
                          this );
    action->addTo( importMenu );
@@ -1285,57 +1295,57 @@ void MainWindow::initActions()
    icon = loadPixmap( "korganizer/korganizer" );
-    action = new QAction( "Whats New", i18n("What's new?"), 0,this );
+    action = new Q3Action( "Whats New", i18n("What's new?"), 0,this );
    action->addTo( helpMenu );
    connect( action, SIGNAL( activated() ),
             SLOT( whatsNew() ) );
-    action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this );
+    action = new Q3Action( "featureHowto", i18n("Features + hints..."), 0,this );
    action->addTo( helpMenu );
    connect( action, SIGNAL( activated() ),
             SLOT( features() ) );
-    action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this );
+    action = new Q3Action( "Keys + Colors", i18n("Keys + Colors..."), 0, this );
    action->addTo( helpMenu );
    connect( action, SIGNAL( activated() ),
             SLOT( keyBindings() ) ); 
-    action = new QAction( "Storage Howto", i18n("Storage HowTo..."), 0,this );
+    action = new Q3Action( "Storage Howto", i18n("Storage HowTo..."), 0,this );
    action->addTo( helpMenu );
    connect( action, SIGNAL( activated() ),
             SLOT( storagehowto() ) ); 
-    action = new QAction( "Timetracking Howto", i18n("Timetracking HowTo..."), 0,this );
+    action = new Q3Action( "Timetracking Howto", i18n("Timetracking HowTo..."), 0,this );
    action->addTo( helpMenu );
    connect( action, SIGNAL( activated() ),
             SLOT( timetrackinghowto() ) );
-    action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this );
+    action = new Q3Action( "Sync Howto", i18n("Sync HowTo..."), 0,this );
    action->addTo( helpMenu );
    connect( action, SIGNAL( activated() ),
             SLOT( synchowto() ) );
-    action = new QAction( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this );
+    action = new Q3Action( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this );
    action->addTo( helpMenu );
    connect( action, SIGNAL( activated() ),
             SLOT( kdesynchowto() ) );
-    action = new QAction( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this );
+    action = new Q3Action( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this );
    action->addTo( helpMenu );
    connect( action, SIGNAL( activated() ),
             SLOT( multisynchowto() ) );
-    action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this );
+    action = new Q3Action( "Auto saving", i18n("Auto saving..."), 0, this );
    action->addTo( helpMenu );
    connect( action, SIGNAL( activated() ),
             SLOT( aboutAutoSaving() ) );
-    action = new QAction( "Problemd", i18n("Known Problems..."), 0,this );
+    action = new Q3Action( "Problemd", i18n("Known Problems..."), 0,this );
    action->addTo( helpMenu );
    connect( action, SIGNAL( activated() ),
             SLOT( aboutKnownBugs() ) );
-    action = new QAction( "Translate Howto", i18n("User translation..."), 0,this );
+    action = new Q3Action( "Translate Howto", i18n("User translation..."), 0,this );
    action->addTo( helpMenu );
    connect( action, SIGNAL( activated() ),
             SLOT( usertrans() ) );
-    action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this );
+    action = new Q3Action( "Frequently asked questions", i18n("FAQ..."), 0,this );
    action->addTo( helpMenu );
    connect( action, SIGNAL( activated() ),
             SLOT( faq() ) );
-    action = new QAction( "licence", i18n("Licence..."), 0, this );
+    action = new Q3Action( "licence", i18n("Licence..."), 0, this );
    action->addTo( helpMenu );
    connect( action, SIGNAL( activated() ),
             SLOT( licence() ) );
-    action = new QAction( "about", i18n("About..."), 0, this );
+    action = new Q3Action( "about", i18n("About..."), 0, this );
    action->addTo( helpMenu );
    connect( action, SIGNAL( activated() ),
@@ -1357,5 +1367,5 @@ void MainWindow::initActions()
        search_action->addTo( iconToolBar  );
    if (p-> mShowIconWhatsThis)
-        QWhatsThis::whatsThisButton (  iconToolBar );
+        Q3WhatsThis::whatsThisButton (  iconToolBar );
    if (p-> mShowIconNext)
        whatsnext_action->addTo( viewToolBar  );
@@ -1382,5 +1392,5 @@ void MainWindow::initActions()
    configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200);
    if (p-> mShowIconBackFast) {
-        action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this );
+        action = new Q3Action( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this );
        connect( action, SIGNAL( activated() ),
                 mView, SLOT( goPreviousMonth() ) );
@@ -1390,5 +1400,5 @@ void MainWindow::initActions()
    configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210);
    if (p-> mShowIconBack) {
-        action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this );
+        action = new Q3Action( i18n("Go backward"), icon, i18n("Go backward"),0 , this );
        connect( action, SIGNAL( activated() ),
                 mView, SLOT( goPrevious() ) );
@@ -1402,5 +1412,5 @@ void MainWindow::initActions()
    configureToolBarMenu->insertItem(icon, i18n("Go forward"), 220);
    if (p-> mShowIconForward) {
-        action = new QAction( i18n("Go forward"), icon, i18n("Go forward"),0 , this );
+        action = new Q3Action( i18n("Go forward"), icon, i18n("Go forward"),0 , this );
        connect( action, SIGNAL( activated() ),
                 mView, SLOT( goNext() ) );
@@ -1410,5 +1420,5 @@ void MainWindow::initActions()
    configureToolBarMenu->insertItem(icon, i18n("Next month"), 230);
    if (p-> mShowIconForwardFast) {
-        action = new QAction( i18n("Next month"), icon, i18n("Next month"),0 , this );
+        action = new Q3Action( i18n("Next month"), icon, i18n("Next month"),0 , this );
        connect( action, SIGNAL( activated() ),
                 mView, SLOT( goNextMonth() ) );
@@ -1525,5 +1535,5 @@ void MainWindow::exportToPhone( int mode )
    if ( ex2phone.mWriteBackFuture->isChecked() )
        inFuture =  ex2phone.mWriteBackFutureWeeks->value();
-    QPtrList<Incidence> delSel;
+    Q3PtrList<Incidence> delSel;
    if ( mode == 1 )
        delSel  = mCalendar->rawIncidences(); 
@@ -1596,8 +1606,8 @@ void MainWindow::displayText( QString text ,QString cap  )
    QDialog dia( this, "name", true ); ;
    dia.setCaption( cap );
-    QVBoxLayout* lay = new QVBoxLayout( &dia );
+    Q3VBoxLayout* lay = new Q3VBoxLayout( &dia );
    lay->setSpacing( 3 );
    lay->setMargin( 3 );
-    QTextBrowser tb ( &dia );
+    Q3TextBrowser tb ( &dia );
    lay->addWidget( &tb );
    tb.setText( text );
@@ -1778,7 +1788,7 @@ void MainWindow::updateWeek(QDate seda)
    QPainter p ( &mWeekPixmap );
    p.setFont( mWeekFont );
-    p.drawText( 0,0,mWeekPixmap.width(), mWeekPixmap.height(),AlignCenter, QString::number( weekNum) );
+    p.drawText( 0,0,mWeekPixmap.width(), mWeekPixmap.height(),Qt::AlignCenter, QString::number( weekNum) );
    p.end();   
-    QIconSet icon3 ( mWeekPixmap );
+    QIcon icon3 ( mWeekPixmap );
    mWeekAction->setIconSet ( icon3 );
@@ -1813,5 +1823,5 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
            if ( incidence->isBirthday() || incidence->isAnniversary() ) {
                bool ok;
-                QDateTime noc = incidence->getNextOccurence( mView->startDate().addDays(-1), &ok );
+                QDateTime noc = incidence->getNextOccurence( (QDateTime)mView->startDate().addDays(-1), &ok );
                if ( ok ) {
                    int years = noc.date().year() - incidence->dtStart().date().year();
@@ -1847,11 +1857,11 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
    static QPixmap eP = SmallIcon( "newevent" );
    static QPixmap tP = SmallIcon( "newtodo" );
-    QIconSet icon;
+    QIcon icon;
    if ( incidence->typeID() == todoID )
-        icon = QIconSet ( tP );
+        icon = QIcon ( tP );
    else if ( incidence->typeID() == eventID )
-        icon =  QIconSet ( eP );
+        icon =  QIcon ( eP );
    else if ( incidence->typeID() == journalID )
-        icon =  QIconSet ( jP );
+        icon =  QIcon ( jP );
    mPrintSelAction->setIconSet ( icon );
 #endif
@@ -2046,5 +2056,5 @@ void MainWindow::backupAllFiles()
        qDebug("KO: Backup created.");
        // backup ok
-        QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
+        Q3PtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
        KopiCalendarFile * cal = calendars.first();
        cal = calendars.next();
@@ -2342,5 +2352,5 @@ void MainWindow::fillFilterMenuTB()
   
    selectFilterMenuTB->insertSeparator();
-    QPtrList<CalFilter> fili = mView->filters();
+    Q3PtrList<CalFilter> fili = mView->filters();
    CalFilter *curfilter = mView->filterView()->selectedFilter();
    CalFilter *filter = fili.first();
@@ -2387,5 +2397,5 @@ void MainWindow::fillFilterMenu()
   
    selectFilterMenu->insertSeparator();
-    QPtrList<CalFilter> fili = mView->filters();
+    Q3PtrList<CalFilter> fili = mView->filters();
    CalFilter *curfilter = mView->filterView()->selectedFilter();
    CalFilter *filter = fili.first();
@@ -2408,5 +2418,5 @@ void MainWindow::fillFilterMenuPopup()
   
    filterPopupMenu->insertSeparator();
-    QPtrList<CalFilter> fili = mView->filters();
+    Q3PtrList<CalFilter> fili = mView->filters();
    CalFilter *curfilter = mView->filterView()->selectedFilter();
    CalFilter *filter = fili.first();
@@ -2820,4 +2830,4 @@ void MainWindow::resizeEvent( QResizeEvent* e)
    }
 #endif
-    QMainWindow::resizeEvent( e);
+    Q3MainWindow::resizeEvent( e);
 }
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index a533d8b..6756216 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -2,11 +2,19 @@
 #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>
@@ -16,10 +24,10 @@
 #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;
@@ -32,5 +40,5 @@ class CalendarLocal;
 using namespace KCal;
-class MainWindow : public QMainWindow
+class MainWindow : public Q3MainWindow
 {
    Q_OBJECT
@@ -50,6 +58,6 @@ class MainWindow : public QMainWindow
    virtual void showMaximized (); 
     void configureAgenda( int );
-    void recieve( const QCString& msg, const QByteArray& data );
+    void recieve( const Q3CString& msg, const QByteArray& data );
-    void receiveStart( const QCString& msg, const QByteArray& data );
+    void receiveStart( const Q3CString& msg, const QByteArray& data );
 protected slots: 
    void autoSaveWarning();
@@ -125,5 +133,5 @@ class MainWindow : public QMainWindow
    bool mAutoSaveDisabled;
    bool checkAutosave();
-    QCString mCStringMess;
+    Q3CString mCStringMess;
    QByteArray mByteData;
@@ -133,5 +141,5 @@ class MainWindow : public QMainWindow
    QCopChannel* infrared;
 #endif
-    QAction* brAction; 
+    Q3Action* brAction; 
    KSyncManager* mSyncManager;
    bool mClosed;
@@ -145,6 +153,6 @@ class MainWindow : public QMainWindow
    QPEToolBar *filterToolBar;
    KMenuBar *filterMenubar;
-    QPopupMenu * filterPopupMenu;
+    Q3PopupMenu * filterPopupMenu;
-    QPopupMenu * mCurrentItemMenu;
+    Q3PopupMenu * mCurrentItemMenu;
    void initActions();
    void setDefaultPreferences(); 
@@ -152,29 +160,29 @@ class MainWindow : public QMainWindow
    void keyPressEvent ( QKeyEvent * ) ;
    void keyReleaseEvent ( QKeyEvent * ) ;
-    QPopupMenu *configureToolBarMenu;
+    Q3PopupMenu *configureToolBarMenu;
-    QPopupMenu *selectFilterMenu;
+    Q3PopupMenu *selectFilterMenu;
-    QPopupMenu *selectFilterMenuTB;
+    Q3PopupMenu *selectFilterMenuTB;
-    QPopupMenu *configureAgendaMenu, *syncMenu;
+    Q3PopupMenu *configureAgendaMenu, *syncMenu;
    CalendarLocal *mCalendar;
    CalendarView *mView;
-    QAction *mNewSubTodoAction;
+    Q3Action *mNewSubTodoAction;
-    QAction *mWeekAction;
+    Q3Action *mWeekAction;
    QFont mWeekFont;
    QPixmap mWeekPixmap;
    QColor mWeekBgColor;
    
-    QAction *mShowAction;
+    Q3Action *mShowAction;
-    QAction *mEditAction;
+    Q3Action *mEditAction;
-    QAction *mDeleteAction;
+    Q3Action *mDeleteAction;
-    QAction *mCloneAction;
+    Q3Action *mCloneAction;
-    QAction *mMoveAction;
+    Q3Action *mMoveAction;
-    QAction *mBeamAction;
+    Q3Action *mBeamAction;
-    QAction *mCancelAction;
+    Q3Action *mCancelAction;
-    QAction *mPrintSelAction;
+    Q3Action *mPrintSelAction;
-    QAction *mToggleNav;
+    Q3Action *mToggleNav;
-    QAction *mToggleFilter;
+    Q3Action *mToggleFilter;
-    QAction *mToggleAllday;
+    Q3Action *mToggleAllday;
-    QAction *actionFilterMenuTB;
+    Q3Action *actionFilterMenuTB;
    void closeEvent( QCloseEvent* ce );
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index f6a1a6a..59c3e45 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -27,8 +27,11 @@
 #include <qpushbutton.h>
 #include <qlayout.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlabel.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
 #include <kdebug.h>
@@ -54,9 +57,9 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam
  : QWidget( parent, name )
 {
-  QBoxLayout *topLayout = new QHBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3HBoxLayout( this );
  // Set up the control buttons and date label
-  mCtrlFrame = new QFrame( this );
+  mCtrlFrame = new Q3Frame( this );
-  mCtrlFrame->setFrameStyle(QFrame::Panel|QFrame::Raised);
+  mCtrlFrame->setFrameStyle(Q3Frame::Panel|Q3Frame::Raised);
  mCtrlFrame->setLineWidth(1);
@@ -130,5 +133,5 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam
  
  // set up control frame layout
-  QBoxLayout *ctrlLayout = new QHBoxLayout( mCtrlFrame, 1 );
+  Q3BoxLayout *ctrlLayout = new Q3HBoxLayout( mCtrlFrame, 1 );
  ctrlLayout->addWidget( mPrevYear, 3 );
  ctrlLayout->addWidget( mPrevMonth, 3 );
@@ -151,11 +154,11 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam
  connect( mNextYear, SIGNAL( clicked() ), SIGNAL( goNextYear() ) );
  connect( mSelectMonth, SIGNAL( clicked() ),SLOT( selectMonth() ) );
-  mPrevYear->setFocusPolicy(NoFocus);
+  mPrevYear->setFocusPolicy(Qt::NoFocus);
-  mPrevMonth->setFocusPolicy(NoFocus);
+  mPrevMonth->setFocusPolicy(Qt::NoFocus);
-  mNextMonth->setFocusPolicy(NoFocus);
+  mNextMonth->setFocusPolicy(Qt::NoFocus);
-  mPrevWeek->setFocusPolicy(NoFocus);
+  mPrevWeek->setFocusPolicy(Qt::NoFocus);
-  mNextWeek->setFocusPolicy(NoFocus);
+  mNextWeek->setFocusPolicy(Qt::NoFocus);
-  mNextYear->setFocusPolicy(NoFocus);
+  mNextYear->setFocusPolicy(Qt::NoFocus);
-  mSelectMonth->setFocusPolicy(NoFocus);
+  mSelectMonth->setFocusPolicy(Qt::NoFocus);
  setSizePolicy( QSizePolicy (  QSizePolicy::Expanding ,QSizePolicy::Fixed ) );
   
diff --git a/korganizer/navigatorbar.h b/korganizer/navigatorbar.h
index 9ccef14..a1880f5 100644
--- a/korganizer/navigatorbar.h
+++ b/korganizer/navigatorbar.h
@@ -28,7 +28,10 @@
 #include <qwidget.h>
+//Added by qt3to4:
+#include <Q3Frame>
+#include <QLabel>
 class QPushButton;
-class QFrame;
+class Q3Frame;
 class QLabel;
@@ -61,5 +64,5 @@ class NavigatorBar: public QWidget
    int mCurrentMinWid;
    int mCurrentButtonMinWid;
-    QFrame *mCtrlFrame;
+    Q3Frame *mCtrlFrame;
    QPushButton *mPrevYear;
diff --git a/korganizer/outgoingdialog.cpp b/korganizer/outgoingdialog.cpp
index 7253c8e..ab31274 100644
--- a/korganizer/outgoingdialog.cpp
+++ b/korganizer/outgoingdialog.cpp
@@ -22,5 +22,5 @@
 #include <qfile.h>
 #include <qdir.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <kglobal.h>
@@ -45,8 +45,8 @@
 #include "docprefs.h"
-ScheduleItemOut::ScheduleItemOut(QListView *parent,IncidenceBase *ev,
+ScheduleItemOut::ScheduleItemOut(Q3ListView *parent,IncidenceBase *ev,
                                 Scheduler::Method method,
                                 const QString &recipients)
-  : QListViewItem(parent)
+  : Q3ListViewItem(parent)
 {
  mIncidence = ev;
@@ -124,5 +124,5 @@ ScheduleItemOut::ScheduleItemOut(QListView *parent,IncidenceBase *ev,
 OutgoingDialog::OutgoingDialog(Calendar *calendar,QWidget* parent,
                               const char* name,bool modal,
-                               WFlags fl)
+                               Qt::WFlags fl)
    : OutgoingDialog_base(parent,name,modal,fl)
 {
@@ -140,10 +140,10 @@ OutgoingDialog::OutgoingDialog(Calendar *calendar,QWidget* parent,
 #endif
  }
-  mMessageListView->setColumnAlignment(1,AlignHCenter);
+  mMessageListView->setColumnAlignment(1,Qt::AlignHCenter);
-  mMessageListView->setColumnAlignment(2,AlignHCenter);
+  mMessageListView->setColumnAlignment(2,Qt::AlignHCenter);
-  mMessageListView->setColumnAlignment(3,AlignHCenter);
+  mMessageListView->setColumnAlignment(3,Qt::AlignHCenter);
-  mMessageListView->setColumnAlignment(4,AlignHCenter);
+  mMessageListView->setColumnAlignment(4,Qt::AlignHCenter);
-  QObject::connect(mMessageListView,SIGNAL(doubleClicked(QListViewItem *)),
+  QObject::connect(mMessageListView,SIGNAL(doubleClicked(Q3ListViewItem *)),
-                   this,SLOT(showEvent(QListViewItem *)));
+                   this,SLOT(showEvent(Q3ListViewItem *)));
  mDocPrefs = new DocPrefs("groupschedule");
  loadMessages();
@@ -237,5 +237,5 @@ void OutgoingDialog::deleteItem()
 }
-void OutgoingDialog::showEvent(QListViewItem *qitem)
+void OutgoingDialog::showEvent(Q3ListViewItem *qitem)
 {
  ScheduleItemOut *item = (ScheduleItemOut *)qitem;
@@ -295,5 +295,5 @@ bool OutgoingDialog::saveMessage(IncidenceBase *incidence,Scheduler::Method meth
  KTempFile ktfile(locateLocal("data","korganizer/outgoing/"),"ics");
  QString messageText = mFormat->createScheduleMessage(incidence,method);
-  QTextStream *qts = ktfile.textStream();
+  Q3TextStream *qts = ktfile.textStream();
  *qts << messageText;
  *qts << "METHOD-BEGIN:" << endl << method << endl << ":METHOD-END" << endl;
@@ -331,9 +331,9 @@ void OutgoingDialog::loadMessages()
    }
    if (!inserted) {
-    if (!f.open(IO_ReadOnly)) {
+    if (!f.open(QIODevice::ReadOnly)) {
      kdDebug() << "OutgoingDialog::loadMessage(): Can't open file'"
                << (*it) << "'" << endl;
    } else {
-      QTextStream t(&f);
+      Q3TextStream t(&f);
      QString messageString = t.read();
      ScheduleMessage *message = mFormat->parseScheduleMessage(mCalendar,
diff --git a/korganizer/outgoingdialog.h b/korganizer/outgoingdialog.h
index a3d561a..e727087 100644
--- a/korganizer/outgoingdialog.h
+++ b/korganizer/outgoingdialog.h
@@ -24,5 +24,5 @@
 #define OUTGOINGDIALOG_H
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qmap.h>
 #include <qstring.h>
@@ -35,8 +35,8 @@
 using namespace KCal;
-class ScheduleItemOut : public QListViewItem
+class ScheduleItemOut : public Q3ListViewItem
 {
  public:
-    ScheduleItemOut(QListView *parent,IncidenceBase *ev,
+    ScheduleItemOut(Q3ListView *parent,IncidenceBase *ev,
        Scheduler::Method method, const QString &recipients=QString::null);
    virtual ~ScheduleItemOut() {}
@@ -57,5 +57,5 @@ class OutgoingDialog : public OutgoingDialog_base
  public:
    OutgoingDialog(Calendar *,QWidget* parent=0,const char* name=0,
-                   bool modal=false,WFlags fl=0);
+                   bool modal=false,Qt::WFlags fl=0);
    ~OutgoingDialog();
@@ -73,5 +73,5 @@ class OutgoingDialog : public OutgoingDialog_base
    void send();
    void deleteItem();
-    void showEvent(QListViewItem *);
+    void showEvent(Q3ListViewItem *);
  private:
diff --git a/korganizer/outgoingdialog_base.cpp b/korganizer/outgoingdialog_base.cpp
index 1873b44..be8a870 100644
--- a/korganizer/outgoingdialog_base.cpp
+++ b/korganizer/outgoingdialog_base.cpp
@@ -12,10 +12,12 @@
 #include <qvariant.h>
-#include <qheader.h>
+#include <q3header.h>
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qtooltip.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 /* 
@@ -26,5 +28,5 @@
 *  TRUE to construct a modal dialog.
 */
-OutgoingDialog_base::OutgoingDialog_base( QWidget* parent, const char* name, bool modal, WFlags fl )
+OutgoingDialog_base::OutgoingDialog_base( QWidget* parent, const char* name, bool modal, Qt::WFlags fl )
    : QDialog( parent, name, modal, fl )
@@ -32,7 +34,7 @@ OutgoingDialog_base::OutgoingDialog_base( QWidget* parent, const char* name, boo
    if ( !name )
        setName( "OutgoingDialog_base" );
-    OutgoingDialog_baseLayout = new QGridLayout( this, 1, 1, 11, 6, "OutgoingDialog_baseLayout"); 
+    OutgoingDialog_baseLayout = new Q3GridLayout( this, 1, 1, 11, 6, "OutgoingDialog_baseLayout"); 
-    mMessageListView = new QListView( this, "mMessageListView" );
+    mMessageListView = new Q3ListView( this, "mMessageListView" );
    mMessageListView->addColumn( tr2i18n( "Summary" ) );
    mMessageListView->addColumn( tr2i18n( "Start Date" ) );
@@ -41,6 +43,6 @@ OutgoingDialog_base::OutgoingDialog_base( QWidget* parent, const char* name, boo
    mMessageListView->addColumn( tr2i18n( "End Time" ) );
    mMessageListView->addColumn( tr2i18n( "Method" ) );
-    mMessageListView->setFrameShape( QListView::StyledPanel );
+    mMessageListView->setFrameShape( Q3ListView::StyledPanel );
-    mMessageListView->setFrameShadow( QListView::Sunken );
+    mMessageListView->setFrameShadow( Q3ListView::Sunken );
    mMessageListView->setAllColumnsShowFocus( TRUE );
diff --git a/korganizer/outgoingdialog_base.h b/korganizer/outgoingdialog_base.h
index af71bb1..5e81725 100644
--- a/korganizer/outgoingdialog_base.h
+++ b/korganizer/outgoingdialog_base.h
@@ -13,10 +13,14 @@
 #include <qvariant.h>
 #include <qdialog.h>
+//Added by qt3to4:
-class QVBoxLayout;
+#include <Q3GridLayout>
-class QHBoxLayout;
+#include <Q3HBoxLayout>
-class QGridLayout;
+#include <Q3VBoxLayout>
-class QListView;
-class QListViewItem;
+class Q3VBoxLayout;
+class Q3HBoxLayout;
+class Q3GridLayout;
+class Q3ListView;
+class Q3ListViewItem;
 class QPushButton;
@@ -26,8 +30,8 @@ class OutgoingDialog_base : public QDialog
 public:
-    OutgoingDialog_base( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    OutgoingDialog_base( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, Qt::WFlags fl = 0 );
    ~OutgoingDialog_base();
-    QListView* mMessageListView;
+    Q3ListView* mMessageListView;
    QPushButton* PushButton5;
    QPushButton* PushButton7;
@@ -35,5 +39,5 @@ public:
 protected:
-    QGridLayout* OutgoingDialog_baseLayout;
+    Q3GridLayout* OutgoingDialog_baseLayout;
 protected slots:
diff --git a/korganizer/publishdialog.cpp b/korganizer/publishdialog.cpp
index 2ae6720..ede9840 100644
--- a/korganizer/publishdialog.cpp
+++ b/korganizer/publishdialog.cpp
@@ -36,5 +36,5 @@
 PublishDialog::PublishDialog(QWidget* parent, const char* name,
-                               bool modal, WFlags fl)
+                               bool modal, Qt::WFlags fl)
    : PublishDialog_base(parent,name,modal,fl)
 {
@@ -42,5 +42,5 @@ PublishDialog::PublishDialog(QWidget* parent, const char* name,
  mNameLineEdit->setEnabled(false);
  mEmailLineEdit->setEnabled(false);
-  connect(mAddressListView,SIGNAL(selectionChanged(QListViewItem *)),
+  connect(mAddressListView,SIGNAL(selectionChanged(Q3ListViewItem *)),
          SLOT(updateInput()));
 }
@@ -54,5 +54,5 @@ void PublishDialog::addAttendee(Attendee *attendee)
  mNameLineEdit->setEnabled(true);
  mEmailLineEdit->setEnabled(true);
-  QListViewItem *item = new QListViewItem(mAddressListView);
+  Q3ListViewItem *item = new Q3ListViewItem(mAddressListView);
  item->setText(0,attendee->name());
  item->setText(1,attendee->email());
@@ -63,5 +63,5 @@ QString PublishDialog::addresses()
 {
  QString to = "";
-  QListViewItem *item;
+  Q3ListViewItem *item;
  int i, count;
  count = mAddressListView->childCount();
@@ -81,5 +81,5 @@ void PublishDialog::addItem()
  mNameLineEdit->setEnabled(true);
  mEmailLineEdit->setEnabled(true);
-  QListViewItem *item = new QListViewItem(mAddressListView);
+  Q3ListViewItem *item = new Q3ListViewItem(mAddressListView);
  mAddressListView->insertItem(item);
  mAddressListView->setSelected(item,true);
@@ -90,5 +90,5 @@ void PublishDialog::addItem()
 void PublishDialog::removeItem()
 {
-  QListViewItem *item;
+  Q3ListViewItem *item;
  item = mAddressListView->selectedItem();
  if (!item) return;
@@ -120,5 +120,5 @@ void PublishDialog::openAddressbook()
      mNameLineEdit->setEnabled(true);
      mEmailLineEdit->setEnabled(true);
-      QListViewItem *item = new QListViewItem(mAddressListView);
+      Q3ListViewItem *item = new Q3ListViewItem(mAddressListView);
      mAddressListView->setSelected(item,true);
      mNameLineEdit->setText(a.realName());
@@ -132,5 +132,5 @@ void PublishDialog::openAddressbook()
 void PublishDialog::updateItem()
 {
-  QListViewItem *item;
+  Q3ListViewItem *item;
  item = mAddressListView->selectedItem();
  if (!item) return;
@@ -141,5 +141,5 @@ void PublishDialog::updateItem()
 void PublishDialog::updateInput()
 {
-  QListViewItem *item;
+  Q3ListViewItem *item;
  item = mAddressListView->selectedItem();
  if (!item) return;
diff --git a/korganizer/publishdialog.h b/korganizer/publishdialog.h
index 338603c..3ffeec4 100644
--- a/korganizer/publishdialog.h
+++ b/korganizer/publishdialog.h
@@ -24,5 +24,5 @@
 #define PUBLISHDIALOG_H
-#include <qlistview.h>
+#include <q3listview.h>
 #include <libkcal/attendee.h>
@@ -36,5 +36,5 @@ class PublishDialog : public PublishDialog_base
  public:
    PublishDialog(QWidget* parent=0,const char* name=0,
-                   bool modal=true,WFlags fl=0);
+                   bool modal=true,Qt::WFlags fl=0);
    ~PublishDialog();
diff --git a/korganizer/publishdialog_base.cpp b/korganizer/publishdialog_base.cpp
index 683f7e9..ce5c542 100644
--- a/korganizer/publishdialog_base.cpp
+++ b/korganizer/publishdialog_base.cpp
@@ -12,13 +12,16 @@
 #include <qvariant.h>
-#include <qframe.h>
+#include <q3frame.h>
-#include <qheader.h>
+#include <q3header.h>
 #include <qlabel.h>
 #include <qlineedit.h>
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qtooltip.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3HBoxLayout>
 /* 
@@ -29,5 +32,5 @@
 *  TRUE to construct a modal dialog.
 */
-PublishDialog_base::PublishDialog_base( QWidget* parent, const char* name, bool modal, WFlags fl )
+PublishDialog_base::PublishDialog_base( QWidget* parent, const char* name, bool modal, Qt::WFlags fl )
    : QDialog( parent, name, modal, fl )
@@ -35,7 +38,7 @@ PublishDialog_base::PublishDialog_base( QWidget* parent, const char* name, bool
    if ( !name )
        setName( "PublishDialog_base" );
-    PublishDialog_baseLayout = new QGridLayout( this, 1, 1, 11, 6, "PublishDialog_baseLayout"); 
+    PublishDialog_baseLayout = new Q3GridLayout( this, 1, 1, 11, 6, "PublishDialog_baseLayout"); 
-    mAddressListView = new QListView( this, "mAddressListView" );
+    mAddressListView = new Q3ListView( this, "mAddressListView" );
    mAddressListView->addColumn( tr2i18n( "Name" ) );
    mAddressListView->addColumn( tr2i18n( "Email" ) );
@@ -73,12 +76,12 @@ PublishDialog_base::PublishDialog_base( QWidget* parent, const char* name, bool
    PublishDialog_baseLayout->addMultiCell( spacer, 3, 5, 2, 2 );
-    Line2 = new QFrame( this, "Line2" );
+    Line2 = new Q3Frame( this, "Line2" );
-    Line2->setFrameShape( QFrame::HLine );
+    Line2->setFrameShape( Q3Frame::HLine );
-    Line2->setFrameShadow( QFrame::Sunken );
+    Line2->setFrameShadow( Q3Frame::Sunken );
-    Line2->setFrameShape( QFrame::HLine );
+    Line2->setFrameShape( Q3Frame::HLine );
    PublishDialog_baseLayout->addMultiCellWidget( Line2, 6, 6, 0, 2 );
-    layout95 = new QHBoxLayout( 0, 0, 6, "layout95"); 
+    layout95 = new Q3HBoxLayout( 0, 0, 6, "layout95"); 
    QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
    layout95->addItem( spacer_2 );
diff --git a/korganizer/publishdialog_base.h b/korganizer/publishdialog_base.h
index 932474e..d1b40ae 100644
--- a/korganizer/publishdialog_base.h
+++ b/korganizer/publishdialog_base.h
@@ -13,13 +13,19 @@
 #include <qvariant.h>
 #include <qdialog.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <Q3Frame>
+#include <Q3GridLayout>
+#include <Q3HBoxLayout>
+#include <QLabel>
-class QVBoxLayout;
+class Q3VBoxLayout;
-class QHBoxLayout;
+class Q3HBoxLayout;
-class QGridLayout;
+class Q3GridLayout;
-class QFrame;
+class Q3Frame;
 class QLabel;
 class QLineEdit;
-class QListView;
+class Q3ListView;
-class QListViewItem;
+class Q3ListViewItem;
 class QPushButton;
@@ -29,8 +35,8 @@ class PublishDialog_base : public QDialog
 public:
-    PublishDialog_base( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    PublishDialog_base( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, Qt::WFlags fl = 0 );
    ~PublishDialog_base();
-    QListView* mAddressListView;
+    Q3ListView* mAddressListView;
    QLabel* TextLabel1;
    QLabel* TextLabel2;
@@ -40,11 +46,11 @@ public:
    QPushButton* PushButton12;
    QPushButton* PushButton11;
-    QFrame* Line2;
+    Q3Frame* Line2;
    QPushButton* PushButton9;
    QPushButton* PushButton8;
 protected:
-    QGridLayout* PublishDialog_baseLayout;
+    Q3GridLayout* PublishDialog_baseLayout;
-    QHBoxLayout* layout95;
+    Q3HBoxLayout* layout95;
 protected slots:
diff --git a/korganizer/savetemplatedialog.cpp b/korganizer/savetemplatedialog.cpp
index 3544081..35bedba 100644
--- a/korganizer/savetemplatedialog.cpp
+++ b/korganizer/savetemplatedialog.cpp
@@ -23,4 +23,7 @@
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <Q3Frame>
 #include <keditlistbox.h>
@@ -36,6 +39,6 @@ SaveTemplateDialog::SaveTemplateDialog( IncidenceType type, QWidget *parent )
    mType( type )
 {
-  QFrame *topFrame = plainPage();
+  Q3Frame *topFrame = plainPage();
-  QVBoxLayout *topLayout = new QVBoxLayout( topFrame, 0, spacingHint() );
+  Q3VBoxLayout *topLayout = new Q3VBoxLayout( topFrame, 0, spacingHint() );
  mEditListBox = new KEditListBox( i18n("Select Template Name"), topFrame,
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 9cfdc35..105b844 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -25,12 +25,19 @@
 #include <qlayout.h>
 #include <qcheckbox.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
 #include <qlabel.h>
-#include <qlistview.h>
+#include <q3listview.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
-#include <qhbuttongroup.h>
+//#include <qhbuttongroup.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3Frame>
+#include <Q3PtrList>
+#include <QKeyEvent>
+#include <Q3VBoxLayout>
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -47,13 +54,13 @@
 SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
-    : QVBox( 0  )
+    : Q3VBox( 0  )
 {
    mCalendar = calendar;
-    QFrame *topFrame = new QFrame( this ) ;//plainPage();
+    Q3Frame *topFrame = new Q3Frame( this ) ;//plainPage();
-    QVBoxLayout *layout = new QVBoxLayout(topFrame,KDialog::marginHint(),KDialog::spacingHint());
+    Q3VBoxLayout *layout = new Q3VBoxLayout(topFrame,KDialog::marginHint(),KDialog::spacingHint());
    // Search expression
-    QHBoxLayout *subLayout = new QHBoxLayout();
+    Q3HBoxLayout *subLayout = new Q3HBoxLayout();
    layout->addLayout(subLayout);
    /*
@@ -99,5 +106,5 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
    //                                        topFrame);
-    incidenceGroup = new QHBox( topFrame );
+    incidenceGroup = new Q3HBox( topFrame );
    layout->addWidget(incidenceGroup);
@@ -107,5 +114,5 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
    mSearchJournal = new QCheckBox(i18n("Journals"),incidenceGroup);
-    subjectGroup = new QHBox( topFrame );
+    subjectGroup = new Q3HBox( topFrame );
    layout->addWidget(subjectGroup);
@@ -115,5 +122,5 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
    mCategoryCheck = new QCheckBox(i18n("Categories"),subjectGroup);
-    attendeeGroup = new QHBox( topFrame );
+    attendeeGroup = new Q3HBox( topFrame );
    layout->addWidget(attendeeGroup );
    new QLabel( i18n("Attendee:"),attendeeGroup );
@@ -128,5 +135,5 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
    int space = KDialog::spacingHint();
    if ( QApplication::desktop()->width() <= 240 ) space = 1;
-    QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,space);
+    Q3HBoxLayout *rangeLayout = new Q3HBoxLayout(rangeWidget,0,space);
    rangeLayout->addWidget(new QLabel(i18n("From:"),rangeWidget));
    mStartDate = new KDateEdit(rangeWidget);
@@ -136,5 +143,5 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
    mEndDate->setDate(QDate::currentDate().addDays(365));
    rangeLayout->addWidget(mEndDate);
-    QToolButton *wt = QWhatsThis::whatsThisButton (  rangeWidget );
+    QToolButton *wt = Q3WhatsThis::whatsThisButton (  rangeWidget );
    rangeLayout->addWidget( (QWidget*)wt );
    layout->addWidget(rangeWidget);
@@ -342,5 +349,5 @@ void SearchDialog::updateView()
 void SearchDialog::search(const QRegExp &re)
 {
-    QPtrList<Event> events;
+    Q3PtrList<Event> events;
    if ( !mAddItems->isChecked() && !mSubItems->isChecked() ) {
        if ( mRefineItems->isChecked() ) events = mMatchedEvents;
@@ -420,5 +427,5 @@ void SearchDialog::search(const QRegExp &re)
            }
            if ( mSearchAName->isChecked() || mSearchAEmail->isChecked() ) {
-                QPtrList<Attendee> tmpAList = ev->attendees();
+                Q3PtrList<Attendee> tmpAList = ev->attendees();
                Attendee *a;
                for (a = tmpAList.first(); a; a = tmpAList.next()) {
@@ -459,5 +466,5 @@ void SearchDialog::search(const QRegExp &re)
        }
    }
-    QPtrList<Todo> todos;
+    Q3PtrList<Todo> todos;
    if ( !mAddItems->isChecked() && !mSubItems->isChecked() ) {
@@ -513,5 +520,5 @@ void SearchDialog::search(const QRegExp &re)
            }
            if ( mSearchAName->isChecked() || mSearchAEmail->isChecked() ) {
-                QPtrList<Attendee> tmpAList = tod->attendees();
+                Q3PtrList<Attendee> tmpAList = tod->attendees();
                Attendee *a;
                for (a = tmpAList.first(); a; a = tmpAList.next()) {
@@ -549,5 +556,5 @@ void SearchDialog::search(const QRegExp &re)
    }
-    QPtrList<Journal> journals;
+    Q3PtrList<Journal> journals;
    if ( !mAddItems->isChecked() && !mSubItems->isChecked() ) {
        if ( mRefineItems->isChecked() ) journals = mMatchedJournals ;
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h
index 945ff65..5df6116 100644
--- a/korganizer/searchdialog.h
+++ b/korganizer/searchdialog.h
@@ -27,6 +27,10 @@
 #include <qregexp.h>
 #include <qradiobutton.h>
+//Added by qt3to4:
+#include <QLabel>
+#include <QKeyEvent>
+#include <Q3PtrList>
 #include <kdialogbase.h>
-#include <qvbox.h>
+#include <q3vbox.h>
 #include <libkcal/calendar.h>
@@ -42,5 +46,5 @@ class CalendarView;
 using namespace KCal;
-class SearchDialog : public  QVBox 
+class SearchDialog : public  Q3VBox 
 {
    Q_OBJECT
@@ -73,12 +77,12 @@ class SearchDialog : public  QVBox
  private:
-    QHBox *incidenceGroup ,*subjectGroup ,*attendeeGroup;
+    Q3HBox *incidenceGroup ,*subjectGroup ,*attendeeGroup;
    void search(const QRegExp &);
    Calendar *mCalendar;
    
-    QPtrList<Event> mMatchedEvents;
+    Q3PtrList<Event> mMatchedEvents;
-    QPtrList<Todo> mMatchedTodos;
+    Q3PtrList<Todo> mMatchedTodos;
-    QPtrList<Journal> mMatchedJournals;
+    Q3PtrList<Journal> mMatchedJournals;
    
    QLabel *searchLabel;
diff --git a/korganizer/statusdialog.cpp b/korganizer/statusdialog.cpp
index 7137c49..8186ebb 100644
--- a/korganizer/statusdialog.cpp
+++ b/korganizer/statusdialog.cpp
@@ -22,4 +22,7 @@
 #include <qstringlist.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <Q3HBoxLayout>
 #include <kdebug.h>
@@ -33,9 +36,9 @@ StatusDialog::StatusDialog(QWidget* parent, const char* name) :
  setCaption(i18n("Set Your Status"));
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
  topLayout->setSpacing( spacingHint() );
  topLayout->setMargin( marginHint() );
-  QBoxLayout *statusLayout = new QHBoxLayout( topLayout );
+  Q3BoxLayout *statusLayout = new Q3HBoxLayout( topLayout );
  QLabel *text = new QLabel(i18n("Set your status"),this);
@@ -46,5 +49,5 @@ StatusDialog::StatusDialog(QWidget* parent, const char* name) :
  statusLayout->addWidget( mStatus );
-  QBoxLayout *buttonLayout = new QHBoxLayout( topLayout );
+  Q3BoxLayout *buttonLayout = new Q3HBoxLayout( topLayout );
  QPushButton *ok = new QPushButton(i18n("&OK"), this);
diff --git a/korganizer/timeline.cpp b/korganizer/timeline.cpp
index 11be432..a6c3cdc 100644
--- a/korganizer/timeline.cpp
+++ b/korganizer/timeline.cpp
@@ -6,5 +6,5 @@
 TimeLine::TimeLine( QWidget *parent, const char *name ) :
-  QScrollView( parent, name )
+  Q3ScrollView( parent, name )
 {
  mPixelWidth = 1000;
@@ -12,5 +12,5 @@ TimeLine::TimeLine( QWidget *parent, const char *name ) :
  resizeContents( mPixelWidth, 20 );
-  viewport()->setBackgroundMode( PaletteBackground );
+  viewport()->setBackgroundMode( Qt::PaletteBackground );
  setHScrollBarMode(AlwaysOff);
@@ -59,4 +59,4 @@ void TimeLine::setDateRange( const QDateTime &start, const QDateTime &end )
 void TimeLine::setContentsPos( int pos )
 {
-  QScrollView::setContentsPos ( pos, 0 );
+  Q3ScrollView::setContentsPos ( pos, 0 );
 }
diff --git a/korganizer/timeline.h b/korganizer/timeline.h
index ab3e5d3..bf301fa 100644
--- a/korganizer/timeline.h
+++ b/korganizer/timeline.h
@@ -2,8 +2,8 @@
 #define TIMELINE_H
-#include <qscrollview.h>
+#include <q3scrollview.h>
 #include <qdatetime.h>
-class TimeLine : public QScrollView
+class TimeLine : public Q3ScrollView
 {
    Q_OBJECT
diff --git a/korganizer/timespanview.cpp b/korganizer/timespanview.cpp
index df8ff88..0908056 100644
--- a/korganizer/timespanview.cpp
+++ b/korganizer/timespanview.cpp
@@ -5,8 +5,12 @@
 #include <qsplitter.h>
 #endif
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qlayout.h>
-#include <qheader.h>
+#include <q3header.h>
 #include <qpushbutton.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
+#include <Q3ValueList>
 #include <klocale.h>
@@ -22,5 +26,5 @@ TimeSpanView::TimeSpanView( QWidget *parent, const char *name ) :
  QWidget( parent, name )
 {
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
 #ifndef DESKTOP_VERSION
  mSplitter = new QKSplitter( this );
@@ -30,9 +34,9 @@ TimeSpanView::TimeSpanView( QWidget *parent, const char *name ) :
  topLayout->addWidget( mSplitter );
-  mList = new QListView( mSplitter );
+  mList = new Q3ListView( mSplitter );
  mList->addColumn( i18n("Summary") );
  
  QWidget *rightPane = new QWidget( mSplitter );
-  QBoxLayout *rightPaneLayout = new QVBoxLayout( rightPane );
+  Q3BoxLayout *rightPaneLayout = new Q3VBoxLayout( rightPane );
  mTimeLine = new TimeLine( rightPane );
@@ -43,5 +47,5 @@ TimeSpanView::TimeSpanView( QWidget *parent, const char *name ) :
  rightPaneLayout->addWidget( mLineView );
-  QBoxLayout *buttonLayout = new QHBoxLayout( rightPaneLayout );
+  Q3BoxLayout *buttonLayout = new Q3HBoxLayout( rightPaneLayout );
  
  QPushButton *zoomInButton = new QPushButton( i18n("Zoom In"), rightPane );
@@ -65,10 +69,10 @@ TimeSpanView::~TimeSpanView()
 }
-QValueList<int> TimeSpanView::splitterSizes()
+Q3ValueList<int> TimeSpanView::splitterSizes()
 {
  return mSplitter->sizes();
 }
-void TimeSpanView::setSplitterSizes( QValueList<int> sizes )
+void TimeSpanView::setSplitterSizes( Q3ValueList<int> sizes )
 {
  mSplitter->setSizes( sizes );
@@ -77,5 +81,5 @@ void TimeSpanView::setSplitterSizes( QValueList<int> sizes )
 void TimeSpanView::addItem( KCal::Event *event )
 {
-  new QListViewItem( mList, event->summary() );
+  new Q3ListViewItem( mList, event->summary() );
  
  QDateTime startDt = event->dtStart();
diff --git a/korganizer/timespanview.h b/korganizer/timespanview.h
index 34cb1f7..f652374 100644
--- a/korganizer/timespanview.h
+++ b/korganizer/timespanview.h
@@ -3,4 +3,6 @@
 #include <qwidget.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <libkcal/event.h>
@@ -13,5 +15,5 @@ class QSplitter;
 #define QKSplitter QSplitter
 #endif
-class QListView;
+class Q3ListView;
 class LineView;
 class TimeLine;
@@ -27,6 +29,6 @@ class TimeSpanView : public QWidget
    void addItem( KCal::Event * );
-    QValueList<int> splitterSizes();
+    Q3ValueList<int> splitterSizes();
-    void setSplitterSizes( QValueList<int> );
+    void setSplitterSizes( Q3ValueList<int> );
    
    void clear();
@@ -49,5 +51,5 @@ class TimeSpanView : public QWidget
  private:
    QKSplitter *mSplitter;
-    QListView *mList;
+    Q3ListView *mList;
    TimeLine *mTimeLine;
    LineView *mLineView;