1 files changed, 77 insertions, 71 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 8385bcc..c1a2f76 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -34,3 +34,3 @@
 #include <qradiobutton.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <qlayout.h>
@@ -39,9 +39,9 @@
 #include <qmessagebox.h>
-#include <qprogressbar.h>
-#include <qmultilineedit.h>
+#include <q3progressbar.h>
+#include <q3multilineedit.h>
 #include <qtimer.h>
-#include <qwidgetstack.h>
-#include <qptrlist.h>
+#include <q3widgetstack.h>
+#include <q3ptrlist.h>
 #include <qregexp.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qfile.h>
@@ -50,2 +50,8 @@
 #include <qsplitter.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <QKeyEvent>
+#include <Q3Frame>
+#include <QLabel>
+#include <Q3ValueList>
 #endif
@@ -130,3 +136,3 @@
 #else
-#include <qprocess.h>
+#include <q3process.h>
 #endif
@@ -142,3 +148,3 @@ 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) 
 
@@ -279,9 +285,9 @@ 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 ) ;
@@ -314,3 +320,3 @@ class KOCatPrefs : public QDialog
         setCaption( i18n("Manage new Categories") );
-        QVBoxLayout* lay = new QVBoxLayout( this );
+        Q3VBoxLayout* lay = new Q3VBoxLayout( this );
         lay->setSpacing( 3 );
@@ -319,3 +325,3 @@ class KOCatPrefs : public QDialog
         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 ); 
@@ -375,3 +381,3 @@ void CalendarView::init()
     mNextAlarmDateTime = QDateTime::currentDateTime();
-    setFocusPolicy (NoFocus ); 
+    setFocusPolicy (Qt::NoFocus ); 
     mViewerCallerIsSearchDialog = false;
@@ -396,3 +402,3 @@ void CalendarView::init()
 
-    QBoxLayout *topLayout = (QBoxLayout*)layout();
+    Q3BoxLayout *topLayout = (Q3BoxLayout*)layout();
 #ifndef KORG_NOSPLITTER
@@ -427,5 +433,5 @@ void CalendarView::init()
     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 );
@@ -456,3 +462,3 @@ void CalendarView::init()
 #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 ); 
@@ -503,4 +509,4 @@ void CalendarView::init()
     //mainBoxLayout->addWidget ( rightBox, 10 );
-    QBoxLayout *rightLayout = new QVBoxLayout( rightBox );
-    mRightFrame = new QWidgetStack( rightBox );
+    Q3BoxLayout *rightLayout = new Q3VBoxLayout( rightBox );
+    mRightFrame = new Q3WidgetStack( rightBox );
     rightLayout->addWidget( mRightFrame, 10 );
@@ -618,5 +624,5 @@ void CalendarView::init()
 
-    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);
@@ -671,3 +677,3 @@ void CalendarView::nextConflict( bool all, bool allday )
     flag_blockConflict = true;
-    QPtrList<Event> testlist = mCalendar->events();
+    Q3PtrList<Event> testlist = mCalendar->events();
     Event * test = testlist.first();
@@ -687,3 +693,3 @@ void CalendarView::nextConflict( bool all, bool allday )
     Event * cE2 = 0;
-    QPtrList<Event> testlist2 = testlist;
+    Q3PtrList<Event> testlist2 = testlist;
     test = testlist.first();
@@ -837,3 +843,3 @@ void CalendarView::checkFiles()
     QString message;
-    QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
+    Q3PtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
     KopiCalendarFile * cal = calendars.first();
@@ -859,3 +865,3 @@ void CalendarView::checkAlarms()
     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);
@@ -869,4 +875,4 @@ void CalendarView::checkAlarms()
     //qDebug("KO: Current Time %s ",QDateTime::currentDateTime().toString().latin1() );
-    QPtrList<Incidence> el = mCalendar->rawIncidences(); 
-    QPtrList<Incidence> al;
+    Q3PtrList<Incidence> el = mCalendar->rawIncidences(); 
+    Q3PtrList<Incidence> al;
     Incidence* inL = el.first(); 
@@ -888,5 +894,5 @@ 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 );
@@ -1218,3 +1224,3 @@ void  CalendarView::computeAlarm( QString msg )
 #else
-                QProcess* p = new QProcess();
+                Q3Process* p = new Q3Process();
                 p->addArgument(  tempfilename.latin1()  );
@@ -1268,6 +1274,6 @@ void CalendarView::addSuspendAlarm(const QDateTime &qdt, const QString &noti  )
         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;
@@ -1296,6 +1302,6 @@ void CalendarView::addAlarm(const QDateTime &qdt, const QString &noti  )
         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;
@@ -1572,3 +1578,3 @@ Event* CalendarView::getLastSyncEvent()
 //  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 )
 {
@@ -1602,3 +1608,3 @@ void CalendarView::checkExternalId( Incidence * inc )
 {
-    QPtrList<Event> lastSync = mCalendar->getExternLastSyncEvents() ;
+    Q3PtrList<Event> lastSync = mCalendar->getExternLastSyncEvents() ;
     checkExternSyncEvent( lastSync, inc );
@@ -1626,4 +1632,4 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     clearAllViews();
-    QPtrList<Event>  eventRSyncSharp = remote->getExternLastSyncEvents();
-    QPtrList<Event>  eventLSyncSharp = local->getExternLastSyncEvents();
+    Q3PtrList<Event>  eventRSyncSharp = remote->getExternLastSyncEvents();
+    Q3PtrList<Event>  eventLSyncSharp = local->getExternLastSyncEvents();
     bool fullDateRange = false;
@@ -1686,6 +1692,6 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     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!") );
@@ -1833,3 +1839,3 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     }
-    QPtrList<Incidence> el = local->rawIncidences(); 
+    Q3PtrList<Incidence> el = local->rawIncidences(); 
     inL = el.first();
@@ -2050,3 +2056,3 @@ void CalendarView::syncExternal( int mode  )
             {
-                QPtrList<Incidence> iL = mCalendar->rawIncidences(); 
+                Q3PtrList<Incidence> iL = mCalendar->rawIncidences(); 
                 Incidence* inc = iL.first();
@@ -2117,3 +2123,3 @@ bool CalendarView::importBday()
     }
-    QProgressBar bar(count,0 );
+    Q3ProgressBar bar(count,0 );
     int w = 300;
@@ -2188,3 +2194,3 @@ void CalendarView::insertBirthdays(const QString& uid, const QStringList& birthd
 
-    QProgressBar bar(count,0 );
+    Q3ProgressBar bar(count,0 );
     int w = 300;
@@ -2352,3 +2358,3 @@ bool CalendarView::loadCalendars()
 {
-    QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
+    Q3PtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
     KopiCalendarFile * cal = calendars.first();
@@ -2366,3 +2372,3 @@ bool CalendarView::restoreCalendarSettings()
 {
-    QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
+    Q3PtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
     KopiCalendarFile * cal = calendars.first();
@@ -2531,3 +2537,3 @@ bool CalendarView::checkAllFileVersions()
 {
-    QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
+    Q3PtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
     KopiCalendarFile * cal = calendars.first();
@@ -2593,3 +2599,3 @@ bool CalendarView::saveCalendars()
 {
-    QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
+    Q3PtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
     KopiCalendarFile * cal = calendars.first();
@@ -2697,3 +2703,3 @@ void CalendarView::readSettings()
 
-    QValueList<int> sizes = config->readIntListEntry("Separator1");
+    Q3ValueList<int> sizes = config->readIntListEntry("Separator1");
     if (sizes.count() != 2) {
@@ -2765,3 +2771,3 @@ void CalendarView::readSettings()
 
-    QValueList<int> sizes = config->readIntListEntry("Left Splitter Frame");
+    Q3ValueList<int> sizes = config->readIntListEntry("Left Splitter Frame");
    
@@ -2844,3 +2850,3 @@ void CalendarView::writeSettings()
     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 );
@@ -2871,5 +2877,5 @@ void CalendarView::writeSettings()
 
-    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);
@@ -3168,3 +3174,3 @@ void CalendarView::checkConflictForEvent()
     }
-    QPtrList<Event> testlist = mCalendar->events();
+    Q3PtrList<Event> testlist = mCalendar->events();
     Event * test = testlist.first();
@@ -3430,3 +3436,3 @@ void CalendarView::removeCategories()
 {
-    QPtrList<Incidence> incList  = mCalendar->rawIncidences(); 
+    Q3PtrList<Incidence> incList  = mCalendar->rawIncidences(); 
     QStringList catList = KOPrefs::instance()->mCustomCategories;
@@ -3451,3 +3457,3 @@ int CalendarView::addCategories()
 { 
-    QPtrList<Incidence> incList  = mCalendar->rawIncidences(); 
+    Q3PtrList<Incidence> incList  = mCalendar->rawIncidences(); 
     QStringList catList = KOPrefs::instance()->mCustomCategories;
@@ -3509,3 +3515,3 @@ void CalendarView::beamIncidence(Incidence * Inc)
 {
-    QPtrList<Incidence> delSel ;
+    Q3PtrList<Incidence> delSel ;
     delSel.append(Inc);
@@ -3515,3 +3521,3 @@ void CalendarView::beamCalendar()
 {
-    QPtrList<Incidence> delSel  = mCalendar->rawIncidences(); 
+    Q3PtrList<Incidence> delSel  = mCalendar->rawIncidences(); 
     //qDebug("beamCalendar()  ");
@@ -3521,3 +3527,3 @@ void CalendarView::beamFilteredCalendar()
 {
-    QPtrList<Incidence> delSel  = mCalendar->incidences(); 
+    Q3PtrList<Incidence> delSel  = mCalendar->incidences(); 
     //qDebug("beamFilteredCalendar()  ");
@@ -3525,3 +3531,3 @@ void CalendarView::beamFilteredCalendar()
 }
-void  CalendarView::beamIncidenceList(QPtrList<Incidence> delSel )
+void  CalendarView::beamIncidenceList(Q3PtrList<Incidence> delSel )
 {
@@ -4317,3 +4323,3 @@ void CalendarView::schedule_publish(Incidence *incidence)
     if (incidence->attendeeCount()>0) {
-        QPtrList<Attendee> attendees = incidence->attendees();
+        Q3PtrList<Attendee> attendees = incidence->attendees();
         attendees.first();
@@ -4726,3 +4732,3 @@ void CalendarView::showDates(const DateList &selectedDates)
 
-QPtrList<CalFilter> CalendarView::filters()
+Q3PtrList<CalFilter> CalendarView::filters()
 {
@@ -4767,3 +4773,3 @@ void CalendarView::showFilter(bool visible)
         mCalEditView->show(); 
-        QValueList<int> sizes;
+        Q3ValueList<int> sizes;
         sizes = mLeftFrame->sizes();
@@ -4848,3 +4854,3 @@ void CalendarView::takeOverCalendar()
     clearAllViews();
-    QPtrList<Event> events = mCalendar->events();
+    Q3PtrList<Event> events = mCalendar->events();
     for(uint i=0; i<events.count(); ++i) {
@@ -4855,3 +4861,3 @@ void CalendarView::takeOverCalendar()
 
-    QPtrList<Todo> todos = mCalendar->todos();
+    Q3PtrList<Todo> todos = mCalendar->todos();
     for(uint i=0; i<todos.count(); ++i) {
@@ -4862,3 +4868,3 @@ void CalendarView::takeOverCalendar()
 
-    QPtrList<Journal> journals = mCalendar->journals();
+    Q3PtrList<Journal> journals = mCalendar->journals();
     for(uint i=0; i<journals.count(); ++i) {
@@ -4877,3 +4883,3 @@ void CalendarView::showIntro()
 
-QWidgetStack *CalendarView::viewStack()
+Q3WidgetStack *CalendarView::viewStack()
 {
@@ -5062,3 +5068,3 @@ bool  CalendarView::removeCompletedSubTodos( Todo* t )
     bool deleteTodo = true;
-    QPtrList<Incidence> subTodos;
+    Q3PtrList<Incidence> subTodos;
     Incidence *aTodo;
@@ -5088,4 +5094,4 @@ void CalendarView::purgeCompleted()
 
-        QPtrList<Todo> todoCal;
-        QPtrList<Todo> rootTodos;
+        Q3PtrList<Todo> todoCal;
+        Q3PtrList<Todo> rootTodos;
         //QPtrList<Incidence> rel;