author | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
commit | a08aff328d4393031d5ba7d622c2b05705a89d73 (patch) (unidiff) | |
tree | 8ee90d686081c52e7c69b5ce946e9b1a7d690001 /korganizer/calendarview.cpp | |
parent | 11edc920afe4f274c0964436633aa632c8288a40 (diff) | |
download | kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.zip kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.gz kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.bz2 |
initial public commit of qt4 portp1
-rw-r--r-- | korganizer/calendarview.cpp | 148 |
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 | |||
@@ -32,22 +32,28 @@ | |||
32 | 32 | ||
33 | #include <qapplication.h> | 33 | #include <qapplication.h> |
34 | #include <qradiobutton.h> | 34 | #include <qradiobutton.h> |
35 | #include <qbuttongroup.h> | 35 | #include <q3buttongroup.h> |
36 | #include <qlayout.h> | 36 | #include <qlayout.h> |
37 | #include <qclipboard.h> | 37 | #include <qclipboard.h> |
38 | #include <qcursor.h> | 38 | #include <qcursor.h> |
39 | #include <qmessagebox.h> | 39 | #include <qmessagebox.h> |
40 | #include <qprogressbar.h> | 40 | #include <q3progressbar.h> |
41 | #include <qmultilineedit.h> | 41 | #include <q3multilineedit.h> |
42 | #include <qtimer.h> | 42 | #include <qtimer.h> |
43 | #include <qwidgetstack.h> | 43 | #include <q3widgetstack.h> |
44 | #include <qptrlist.h> | 44 | #include <q3ptrlist.h> |
45 | #include <qregexp.h> | 45 | #include <qregexp.h> |
46 | #include <qgroupbox.h> | 46 | #include <q3groupbox.h> |
47 | #include <qfile.h> | 47 | #include <qfile.h> |
48 | #include <qdir.h> | 48 | #include <qdir.h> |
49 | #ifndef KORG_NOSPLITTER | 49 | #ifndef KORG_NOSPLITTER |
50 | #include <qsplitter.h> | 50 | #include <qsplitter.h> |
51 | //Added by qt3to4: | ||
52 | #include <Q3VBoxLayout> | ||
53 | #include <QKeyEvent> | ||
54 | #include <Q3Frame> | ||
55 | #include <QLabel> | ||
56 | #include <Q3ValueList> | ||
51 | #endif | 57 | #endif |
52 | 58 | ||
53 | #include <kglobal.h> | 59 | #include <kglobal.h> |
@@ -128,7 +134,7 @@ | |||
128 | #include <stdio.h> | 134 | #include <stdio.h> |
129 | #include <unistd.h> | 135 | #include <unistd.h> |
130 | #else | 136 | #else |
131 | #include <qprocess.h> | 137 | #include <q3process.h> |
132 | #endif | 138 | #endif |
133 | 139 | ||
134 | #ifdef DESKTOP_VERSION | 140 | #ifdef DESKTOP_VERSION |
@@ -140,7 +146,7 @@ extern int globalFlagBlockAgenda; | |||
140 | extern int globalFlagBlockStartup; | 146 | extern int globalFlagBlockStartup; |
141 | 147 | ||
142 | 148 | ||
143 | MissedAlarmTextBrowser::MissedAlarmTextBrowser(QWidget *parent, QPtrList<Incidence> alarms,QDateTime start ) : QTextBrowser(parent) | 149 | MissedAlarmTextBrowser::MissedAlarmTextBrowser(QWidget *parent, Q3PtrList<Incidence> alarms,QDateTime start ) : Q3TextBrowser(parent) |
144 | 150 | ||
145 | { | 151 | { |
146 | mAlarms = alarms; | 152 | mAlarms = alarms; |
@@ -277,13 +283,13 @@ class KOBeamPrefs : public QDialog | |||
277 | QDialog( parent, name, true ) | 283 | QDialog( parent, name, true ) |
278 | { | 284 | { |
279 | setCaption( i18n("Beam Options") ); | 285 | setCaption( i18n("Beam Options") ); |
280 | QVBoxLayout* lay = new QVBoxLayout( this ); | 286 | Q3VBoxLayout* lay = new Q3VBoxLayout( this ); |
281 | lay->setSpacing( 3 ); | 287 | lay->setSpacing( 3 ); |
282 | lay->setMargin( 3 ); | 288 | lay->setMargin( 3 ); |
283 | QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("File format"), this ); | 289 | Q3ButtonGroup* format = new Q3ButtonGroup( 1, Qt::Horizontal, i18n("File format"), this ); |
284 | lay->addWidget( format ); | 290 | lay->addWidget( format ); |
285 | format->setExclusive ( true ) ; | 291 | format->setExclusive ( true ) ; |
286 | QButtonGroup* time = new QButtonGroup(1, Horizontal, i18n("Time format"), this ); | 292 | Q3ButtonGroup* time = new Q3ButtonGroup(1, Qt::Horizontal, i18n("Time format"), this ); |
287 | lay->addWidget( time ); time->setExclusive ( true ) ; | 293 | lay->addWidget( time ); time->setExclusive ( true ) ; |
288 | vcal = new QRadioButton(" vCalendar ", format ); | 294 | vcal = new QRadioButton(" vCalendar ", format ); |
289 | ical = new QRadioButton(" iCalendar ", format ); | 295 | ical = new QRadioButton(" iCalendar ", format ); |
@@ -312,12 +318,12 @@ class KOCatPrefs : public QDialog | |||
312 | QDialog( parent, name, true ) | 318 | QDialog( parent, name, true ) |
313 | { | 319 | { |
314 | setCaption( i18n("Manage new Categories") ); | 320 | setCaption( i18n("Manage new Categories") ); |
315 | QVBoxLayout* lay = new QVBoxLayout( this ); | 321 | Q3VBoxLayout* lay = new Q3VBoxLayout( this ); |
316 | lay->setSpacing( 3 ); | 322 | lay->setSpacing( 3 ); |
317 | lay->setMargin( 3 ); | 323 | lay->setMargin( 3 ); |
318 | 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 ); | 324 | 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 ); |
319 | lay->addWidget( lab ); | 325 | lay->addWidget( lab ); |
320 | QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("New categories not in list:"), this ); | 326 | Q3ButtonGroup* format = new Q3ButtonGroup( 1, Qt::Horizontal, i18n("New categories not in list:"), this ); |
321 | lay->addWidget( format ); | 327 | lay->addWidget( format ); |
322 | format->setExclusive ( true ) ; | 328 | format->setExclusive ( true ) ; |
323 | addCatBut = new QRadioButton(i18n("Add to category list"), format ); | 329 | addCatBut = new QRadioButton(i18n("Add to category list"), format ); |
@@ -373,7 +379,7 @@ void CalendarView::init() | |||
373 | flag_clearallviewsEventDisplay = false; | 379 | flag_clearallviewsEventDisplay = false; |
374 | flag_clearallviewsupdateView = false; | 380 | flag_clearallviewsupdateView = false; |
375 | mNextAlarmDateTime = QDateTime::currentDateTime(); | 381 | mNextAlarmDateTime = QDateTime::currentDateTime(); |
376 | setFocusPolicy (NoFocus ); | 382 | setFocusPolicy (Qt::NoFocus ); |
377 | mViewerCallerIsSearchDialog = false; | 383 | mViewerCallerIsSearchDialog = false; |
378 | mBlockShowDates = false; | 384 | mBlockShowDates = false; |
379 | mConflictingEvent = 0; | 385 | mConflictingEvent = 0; |
@@ -394,7 +400,7 @@ void CalendarView::init() | |||
394 | mStorage = new FileStorage( mCalendar ); | 400 | mStorage = new FileStorage( mCalendar ); |
395 | mNavigator = new DateNavigator( this, "datevav", mViewManager ); | 401 | mNavigator = new DateNavigator( this, "datevav", mViewManager ); |
396 | 402 | ||
397 | QBoxLayout *topLayout = (QBoxLayout*)layout(); | 403 | Q3BoxLayout *topLayout = (Q3BoxLayout*)layout(); |
398 | #ifndef KORG_NOSPLITTER | 404 | #ifndef KORG_NOSPLITTER |
399 | // create the main layout frames. | 405 | // create the main layout frames. |
400 | mPanner = new QSplitter(QSplitter::Horizontal,this,"CalendarView::Panner"); | 406 | mPanner = new QSplitter(QSplitter::Horizontal,this,"CalendarView::Panner"); |
@@ -425,9 +431,9 @@ void CalendarView::init() | |||
425 | } | 431 | } |
426 | #endif | 432 | #endif |
427 | QWidget *rightBox = new QWidget( mPanner ); | 433 | QWidget *rightBox = new QWidget( mPanner ); |
428 | QBoxLayout *rightLayout = new QVBoxLayout( rightBox ); | 434 | Q3BoxLayout *rightLayout = new Q3VBoxLayout( rightBox ); |
429 | 435 | ||
430 | mRightFrame = new QWidgetStack( rightBox ); | 436 | mRightFrame = new Q3WidgetStack( rightBox ); |
431 | rightLayout->addWidget( mRightFrame, 1 ); | 437 | rightLayout->addWidget( mRightFrame, 1 ); |
432 | 438 | ||
433 | mLeftFrame = mLeftSplitter; | 439 | mLeftFrame = mLeftSplitter; |
@@ -454,7 +460,7 @@ void CalendarView::init() | |||
454 | //QBoxLayout * leftFrameLayout; | 460 | //QBoxLayout * leftFrameLayout; |
455 | topLayout->addWidget( mMainFrame ); | 461 | topLayout->addWidget( mMainFrame ); |
456 | #ifdef DESKTOP_VERSION | 462 | #ifdef DESKTOP_VERSION |
457 | mDateScrollBar = new QScrollBar ( 1, 365, 1,30, 200,QScrollBar::Horizontal, this ); | 463 | mDateScrollBar = new QScrollBar ( 1, 365, 1,30, 200,Qt::Horizontal, this ); |
458 | topLayout->addWidget( mDateScrollBar ); | 464 | topLayout->addWidget( mDateScrollBar ); |
459 | connect( mDateScrollBar, SIGNAL( valueChanged ( int ) ),this, SLOT( scrollBarValue( int )) ); | 465 | connect( mDateScrollBar, SIGNAL( valueChanged ( int ) ),this, SLOT( scrollBarValue( int )) ); |
460 | if ( QApplication::desktop()->width() < 800 ) | 466 | if ( QApplication::desktop()->width() < 800 ) |
@@ -501,8 +507,8 @@ void CalendarView::init() | |||
501 | mCalEditView->hide(); | 507 | mCalEditView->hide(); |
502 | QWidget *rightBox = new QWidget( mMainFrame ); | 508 | QWidget *rightBox = new QWidget( mMainFrame ); |
503 | //mainBoxLayout->addWidget ( rightBox, 10 ); | 509 | //mainBoxLayout->addWidget ( rightBox, 10 ); |
504 | QBoxLayout *rightLayout = new QVBoxLayout( rightBox ); | 510 | Q3BoxLayout *rightLayout = new Q3VBoxLayout( rightBox ); |
505 | mRightFrame = new QWidgetStack( rightBox ); | 511 | mRightFrame = new Q3WidgetStack( rightBox ); |
506 | rightLayout->addWidget( mRightFrame, 10 ); | 512 | rightLayout->addWidget( mRightFrame, 10 ); |
507 | 513 | ||
508 | //mLeftFrame = (QWidget *)leftFrame; | 514 | //mLeftFrame = (QWidget *)leftFrame; |
@@ -616,9 +622,9 @@ void CalendarView::init() | |||
616 | 622 | ||
617 | // kdDebug() << "CalendarView::CalendarView() done" << endl; | 623 | // kdDebug() << "CalendarView::CalendarView() done" << endl; |
618 | 624 | ||
619 | mDateFrame = new QVBox(0,0,WType_Popup); | 625 | mDateFrame = new Q3VBox(0,0,Qt::WType_Popup); |
620 | //mDateFrame->setFrameStyle(QFrame::PopupPanel | QFrame::Raised); | 626 | //mDateFrame->setFrameStyle(QFrame::PopupPanel | QFrame::Raised); |
621 | mDateFrame->setFrameStyle( QFrame::WinPanel |QFrame::Raised ); | 627 | mDateFrame->setFrameStyle( Q3Frame::WinPanel |Q3Frame::Raised ); |
622 | mDateFrame->setLineWidth(3); | 628 | mDateFrame->setLineWidth(3); |
623 | mDateFrame->hide(); | 629 | mDateFrame->hide(); |
624 | mDateFrame->setCaption( i18n( "Pick a date to display")); | 630 | mDateFrame->setCaption( i18n( "Pick a date to display")); |
@@ -669,7 +675,7 @@ void CalendarView::nextConflict( bool all, bool allday ) | |||
669 | { | 675 | { |
670 | if ( flag_blockConflict ) return; | 676 | if ( flag_blockConflict ) return; |
671 | flag_blockConflict = true; | 677 | flag_blockConflict = true; |
672 | QPtrList<Event> testlist = mCalendar->events(); | 678 | Q3PtrList<Event> testlist = mCalendar->events(); |
673 | Event * test = testlist.first(); | 679 | Event * test = testlist.first(); |
674 | while ( test ) { | 680 | while ( test ) { |
675 | test->setTagged( false ); | 681 | test->setTagged( false ); |
@@ -685,7 +691,7 @@ void CalendarView::nextConflict( bool all, bool allday ) | |||
685 | bool found = false; | 691 | bool found = false; |
686 | Event * cE = 0; | 692 | Event * cE = 0; |
687 | Event * cE2 = 0; | 693 | Event * cE2 = 0; |
688 | QPtrList<Event> testlist2 = testlist; | 694 | Q3PtrList<Event> testlist2 = testlist; |
689 | test = testlist.first(); | 695 | test = testlist.first(); |
690 | bool skip = false; | 696 | bool skip = false; |
691 | topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") ); | 697 | topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") ); |
@@ -835,7 +841,7 @@ void CalendarView::updateView(const QDate &start, const QDate &end) | |||
835 | void CalendarView::checkFiles() | 841 | void CalendarView::checkFiles() |
836 | { | 842 | { |
837 | QString message; | 843 | QString message; |
838 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; | 844 | Q3PtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; |
839 | KopiCalendarFile * cal = calendars.first(); | 845 | KopiCalendarFile * cal = calendars.first(); |
840 | while ( cal ) { | 846 | while ( cal ) { |
841 | if ( cal->mErrorOnLoad ) { | 847 | if ( cal->mErrorOnLoad ) { |
@@ -857,7 +863,7 @@ void CalendarView::checkAlarms() | |||
857 | KConfig *config = KOGlobals::config(); | 863 | KConfig *config = KOGlobals::config(); |
858 | config->setGroup( "AppRun" ); | 864 | config->setGroup( "AppRun" ); |
859 | QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) ); | 865 | QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) ); |
860 | int daysto = dt.daysTo( QDate::currentDate() ); | 866 | int daysto = dt.daysTo( (QDateTime)QDate::currentDate() ); |
861 | int days = config->readNumEntry( "LatestProgramStopDays" , daysto); | 867 | int days = config->readNumEntry( "LatestProgramStopDays" , daysto); |
862 | dt = dt.addDays( days ); | 868 | dt = dt.addDays( days ); |
863 | int secto = dt.secsTo( QDateTime::currentDateTime() ); | 869 | int secto = dt.secsTo( QDateTime::currentDateTime() ); |
@@ -867,8 +873,8 @@ void CalendarView::checkAlarms() | |||
867 | QDateTime latest = dt.addSecs ( secs ); | 873 | QDateTime latest = dt.addSecs ( secs ); |
868 | qDebug("KO: Last termination on %s ", latest.toString().latin1()); | 874 | qDebug("KO: Last termination on %s ", latest.toString().latin1()); |
869 | //qDebug("KO: Current Time %s ",QDateTime::currentDateTime().toString().latin1() ); | 875 | //qDebug("KO: Current Time %s ",QDateTime::currentDateTime().toString().latin1() ); |
870 | QPtrList<Incidence> el = mCalendar->rawIncidences(); | 876 | Q3PtrList<Incidence> el = mCalendar->rawIncidences(); |
871 | QPtrList<Incidence> al; | 877 | Q3PtrList<Incidence> al; |
872 | Incidence* inL = el.first(); | 878 | Incidence* inL = el.first(); |
873 | QDateTime cur = QDateTime::currentDateTime().addSecs(-59); | 879 | QDateTime cur = QDateTime::currentDateTime().addSecs(-59); |
874 | qDebug("KO: Checking alarm until %s ", cur.toString().latin1()); | 880 | qDebug("KO: Checking alarm until %s ", cur.toString().latin1()); |
@@ -886,9 +892,9 @@ void CalendarView::checkAlarms() | |||
886 | inL = el.next(); | 892 | inL = el.next(); |
887 | } | 893 | } |
888 | if ( al.count() ) { | 894 | if ( al.count() ) { |
889 | QDialog* dia = new QDialog( this, "huhu", false, WDestructiveClose | WStyle_StaysOnTop ); | 895 | QDialog* dia = new QDialog( this, "huhu", false, Qt::WDestructiveClose | Qt::WStyle_StaysOnTop ); |
890 | dia->setCaption( i18n("KO/Pi: Missing alarms!") ); | 896 | dia->setCaption( i18n("KO/Pi: Missing alarms!") ); |
891 | QVBoxLayout* lay = new QVBoxLayout( dia ); | 897 | Q3VBoxLayout* lay = new Q3VBoxLayout( dia ); |
892 | lay->setSpacing( 0 ); | 898 | lay->setSpacing( 0 ); |
893 | lay->setMargin( 0 ); | 899 | lay->setMargin( 0 ); |
894 | MissedAlarmTextBrowser* matb = new MissedAlarmTextBrowser ( dia, al, latest ); | 900 | MissedAlarmTextBrowser* matb = new MissedAlarmTextBrowser ( dia, al, latest ); |
@@ -1216,7 +1222,7 @@ void CalendarView::computeAlarm( QString msg ) | |||
1216 | return; | 1222 | return; |
1217 | } | 1223 | } |
1218 | #else | 1224 | #else |
1219 | QProcess* p = new QProcess(); | 1225 | Q3Process* p = new Q3Process(); |
1220 | p->addArgument( tempfilename.latin1() ); | 1226 | p->addArgument( tempfilename.latin1() ); |
1221 | p->start(); | 1227 | p->start(); |
1222 | return; | 1228 | return; |
@@ -1266,10 +1272,10 @@ void CalendarView::addSuspendAlarm(const QDateTime &qdt, const QString ¬i ) | |||
1266 | //qDebug("nextsuspendalarm = \n%s ",mess.latin1() ); | 1272 | //qDebug("nextsuspendalarm = \n%s ",mess.latin1() ); |
1267 | QString fn = QDir::homeDirPath() + "/.kopi_suspend_alarm"; | 1273 | QString fn = QDir::homeDirPath() + "/.kopi_suspend_alarm"; |
1268 | QFile file( fn ); | 1274 | QFile file( fn ); |
1269 | if (!file.open( IO_WriteOnly ) ) { | 1275 | if (!file.open( QIODevice::WriteOnly ) ) { |
1270 | qDebug("KO: Error writing next suspend alarm file %s\nContent: \n%s ", fn.latin1(), mess.latin1()); | 1276 | qDebug("KO: Error writing next suspend alarm file %s\nContent: \n%s ", fn.latin1(), mess.latin1()); |
1271 | } else { | 1277 | } else { |
1272 | QTextStream ts( &file ); | 1278 | Q3TextStream ts( &file ); |
1273 | ts << mess; | 1279 | ts << mess; |
1274 | file.close(); | 1280 | file.close(); |
1275 | } | 1281 | } |
@@ -1294,10 +1300,10 @@ void CalendarView::addAlarm(const QDateTime &qdt, const QString ¬i ) | |||
1294 | //qDebug("nextalarm = \n%s ",mess.latin1() ); | 1300 | //qDebug("nextalarm = \n%s ",mess.latin1() ); |
1295 | QString fn = QDir::homeDirPath() + "/.kopi_next_alarm"; | 1301 | QString fn = QDir::homeDirPath() + "/.kopi_next_alarm"; |
1296 | QFile file( fn ); | 1302 | QFile file( fn ); |
1297 | if (!file.open( IO_WriteOnly ) ) { | 1303 | if (!file.open( QIODevice::WriteOnly ) ) { |
1298 | qDebug("KO: Error writing next alarm file %s\nContent: \n%s ", fn.latin1(), mess.latin1()); | 1304 | qDebug("KO: Error writing next alarm file %s\nContent: \n%s ", fn.latin1(), mess.latin1()); |
1299 | } else { | 1305 | } else { |
1300 | QTextStream ts( &file ); | 1306 | Q3TextStream ts( &file ); |
1301 | ts << mess; | 1307 | ts << mess; |
1302 | file.close(); | 1308 | file.close(); |
1303 | } | 1309 | } |
@@ -1570,7 +1576,7 @@ Event* CalendarView::getLastSyncEvent() | |||
1570 | 1576 | ||
1571 | // we check, if the to delete event has a id for a profile | 1577 | // we check, if the to delete event has a id for a profile |
1572 | // if yes, we set this id in the profile to delete | 1578 | // if yes, we set this id in the profile to delete |
1573 | void CalendarView::checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete ) | 1579 | void CalendarView::checkExternSyncEvent( Q3PtrList<Event> lastSync , Incidence* toDelete ) |
1574 | { | 1580 | { |
1575 | if ( lastSync.count() == 0 ) { | 1581 | if ( lastSync.count() == 0 ) { |
1576 | //qDebug(" lastSync.count() == 0"); | 1582 | //qDebug(" lastSync.count() == 0"); |
@@ -1600,7 +1606,7 @@ void CalendarView::checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* t | |||
1600 | } | 1606 | } |
1601 | void CalendarView::checkExternalId( Incidence * inc ) | 1607 | void CalendarView::checkExternalId( Incidence * inc ) |
1602 | { | 1608 | { |
1603 | QPtrList<Event> lastSync = mCalendar->getExternLastSyncEvents() ; | 1609 | Q3PtrList<Event> lastSync = mCalendar->getExternLastSyncEvents() ; |
1604 | checkExternSyncEvent( lastSync, inc ); | 1610 | checkExternSyncEvent( lastSync, inc ); |
1605 | 1611 | ||
1606 | } | 1612 | } |
@@ -1624,8 +1630,8 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1624 | Event* eventRSync; | 1630 | Event* eventRSync; |
1625 | Event* eventLSync; | 1631 | Event* eventLSync; |
1626 | clearAllViews(); | 1632 | clearAllViews(); |
1627 | QPtrList<Event> eventRSyncSharp = remote->getExternLastSyncEvents(); | 1633 | Q3PtrList<Event> eventRSyncSharp = remote->getExternLastSyncEvents(); |
1628 | QPtrList<Event> eventLSyncSharp = local->getExternLastSyncEvents(); | 1634 | Q3PtrList<Event> eventLSyncSharp = local->getExternLastSyncEvents(); |
1629 | bool fullDateRange = false; | 1635 | bool fullDateRange = false; |
1630 | local->resetTempSyncStat(); | 1636 | local->resetTempSyncStat(); |
1631 | mLastCalendarSync = QDateTime::currentDateTime(); | 1637 | mLastCalendarSync = QDateTime::currentDateTime(); |
@@ -1684,10 +1690,10 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1684 | } | 1690 | } |
1685 | //qDebug("*************************** "); | 1691 | //qDebug("*************************** "); |
1686 | qDebug("KO: mLastCalendarSync %s .Full: %d",mLastCalendarSync.toString().latin1(), fullDateRange); | 1692 | qDebug("KO: mLastCalendarSync %s .Full: %d",mLastCalendarSync.toString().latin1(), fullDateRange); |
1687 | QPtrList<Incidence> er = remote->rawIncidences(); | 1693 | Q3PtrList<Incidence> er = remote->rawIncidences(); |
1688 | Incidence* inR = er.first(); | 1694 | Incidence* inR = er.first(); |
1689 | Incidence* inL; | 1695 | Incidence* inL; |
1690 | QProgressBar bar( er.count(),0 ); | 1696 | Q3ProgressBar bar( er.count(),0 ); |
1691 | bar.setCaption (i18n("Syncing - close to abort!") ); | 1697 | bar.setCaption (i18n("Syncing - close to abort!") ); |
1692 | 1698 | ||
1693 | // ************** setting up filter ************* | 1699 | // ************** setting up filter ************* |
@@ -1831,7 +1837,7 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1831 | } | 1837 | } |
1832 | inR = er.next(); | 1838 | inR = er.next(); |
1833 | } | 1839 | } |
1834 | QPtrList<Incidence> el = local->rawIncidences(); | 1840 | Q3PtrList<Incidence> el = local->rawIncidences(); |
1835 | inL = el.first(); | 1841 | inL = el.first(); |
1836 | modulo = (el.count()/10)+1; | 1842 | modulo = (el.count()/10)+1; |
1837 | bar.setCaption (i18n("Add / remove events") ); | 1843 | bar.setCaption (i18n("Add / remove events") ); |
@@ -2048,7 +2054,7 @@ void CalendarView::syncExternal( int mode ) | |||
2048 | if ( syncOK ) { | 2054 | if ( syncOK ) { |
2049 | if ( mSyncManager->mWriteBackFile ) | 2055 | if ( mSyncManager->mWriteBackFile ) |
2050 | { | 2056 | { |
2051 | QPtrList<Incidence> iL = mCalendar->rawIncidences(); | 2057 | Q3PtrList<Incidence> iL = mCalendar->rawIncidences(); |
2052 | Incidence* inc = iL.first(); | 2058 | Incidence* inc = iL.first(); |
2053 | if ( phoneFormat ) { | 2059 | if ( phoneFormat ) { |
2054 | while ( inc ) { | 2060 | while ( inc ) { |
@@ -2115,7 +2121,7 @@ bool CalendarView::importBday() | |||
2115 | for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { | 2121 | for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { |
2116 | ++count; | 2122 | ++count; |
2117 | } | 2123 | } |
2118 | QProgressBar bar(count,0 ); | 2124 | Q3ProgressBar bar(count,0 ); |
2119 | int w = 300; | 2125 | int w = 300; |
2120 | if ( QApplication::desktop()->width() < 320 ) | 2126 | if ( QApplication::desktop()->width() < 320 ) |
2121 | w = 220; | 2127 | w = 220; |
@@ -2186,7 +2192,7 @@ void CalendarView::insertBirthdays(const QString& uid, const QStringList& birthd | |||
2186 | 2192 | ||
2187 | //qDebug("CalView 1 %i", count); | 2193 | //qDebug("CalView 1 %i", count); |
2188 | 2194 | ||
2189 | QProgressBar bar(count,0 ); | 2195 | Q3ProgressBar bar(count,0 ); |
2190 | int w = 300; | 2196 | int w = 300; |
2191 | if ( QApplication::desktop()->width() < 320 ) | 2197 | if ( QApplication::desktop()->width() < 320 ) |
2192 | w = 220; | 2198 | w = 220; |
@@ -2350,7 +2356,7 @@ void CalendarView::setSyncEventsReadOnly() | |||
2350 | 2356 | ||
2351 | bool CalendarView::loadCalendars() | 2357 | bool CalendarView::loadCalendars() |
2352 | { | 2358 | { |
2353 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; | 2359 | Q3PtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; |
2354 | KopiCalendarFile * cal = calendars.first(); | 2360 | KopiCalendarFile * cal = calendars.first(); |
2355 | mCalendar->setDefaultCalendar( 1 ); | 2361 | mCalendar->setDefaultCalendar( 1 ); |
2356 | openCalendar( MainWindow::defaultFileName(), false ); | 2362 | openCalendar( MainWindow::defaultFileName(), false ); |
@@ -2364,7 +2370,7 @@ bool CalendarView::loadCalendars() | |||
2364 | } | 2370 | } |
2365 | bool CalendarView::restoreCalendarSettings() | 2371 | bool CalendarView::restoreCalendarSettings() |
2366 | { | 2372 | { |
2367 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; | 2373 | Q3PtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; |
2368 | KopiCalendarFile * cal = calendars.first(); | 2374 | KopiCalendarFile * cal = calendars.first(); |
2369 | while ( cal ) { | 2375 | while ( cal ) { |
2370 | mCalendar->setCalendarEnabled( cal->mCalNumber,cal->isEnabled ); | 2376 | mCalendar->setCalendarEnabled( cal->mCalNumber,cal->isEnabled ); |
@@ -2529,7 +2535,7 @@ void CalendarView::watchSavedFile() | |||
2529 | } | 2535 | } |
2530 | bool CalendarView::checkAllFileVersions() | 2536 | bool CalendarView::checkAllFileVersions() |
2531 | { | 2537 | { |
2532 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; | 2538 | Q3PtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; |
2533 | KopiCalendarFile * cal = calendars.first(); | 2539 | KopiCalendarFile * cal = calendars.first(); |
2534 | mCalendar->setDefaultCalendar( 1 ); | 2540 | mCalendar->setDefaultCalendar( 1 ); |
2535 | mCalendar->setDefaultCalendarEnabledOnly(); | 2541 | mCalendar->setDefaultCalendarEnabledOnly(); |
@@ -2591,7 +2597,7 @@ bool CalendarView::checkFileVersion(QString fn) | |||
2591 | } | 2597 | } |
2592 | bool CalendarView::saveCalendars() | 2598 | bool CalendarView::saveCalendars() |
2593 | { | 2599 | { |
2594 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; | 2600 | Q3PtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; |
2595 | KopiCalendarFile * cal = calendars.first(); | 2601 | KopiCalendarFile * cal = calendars.first(); |
2596 | mCalendar->setDefaultCalendar( 1 ); | 2602 | mCalendar->setDefaultCalendar( 1 ); |
2597 | mCalendar->setDefaultCalendarEnabledOnly(); | 2603 | mCalendar->setDefaultCalendarEnabledOnly(); |
@@ -2695,7 +2701,7 @@ void CalendarView::readSettings() | |||
2695 | #ifndef KORG_NOSPLITTER | 2701 | #ifndef KORG_NOSPLITTER |
2696 | config->setGroup("KOrganizer Geometry"); | 2702 | config->setGroup("KOrganizer Geometry"); |
2697 | 2703 | ||
2698 | QValueList<int> sizes = config->readIntListEntry("Separator1"); | 2704 | Q3ValueList<int> sizes = config->readIntListEntry("Separator1"); |
2699 | if (sizes.count() != 2) { | 2705 | if (sizes.count() != 2) { |
2700 | sizes << mDateNavigator->minimumSizeHint().width(); | 2706 | sizes << mDateNavigator->minimumSizeHint().width(); |
2701 | sizes << 300; | 2707 | sizes << 300; |
@@ -2763,7 +2769,7 @@ void CalendarView::readSettings() | |||
2763 | config->setGroup( "Views" ); | 2769 | config->setGroup( "Views" ); |
2764 | int dateCount = config->readNumEntry( "ShownDatesCount", 7 ); | 2770 | int dateCount = config->readNumEntry( "ShownDatesCount", 7 ); |
2765 | 2771 | ||
2766 | QValueList<int> sizes = config->readIntListEntry("Left Splitter Frame"); | 2772 | Q3ValueList<int> sizes = config->readIntListEntry("Left Splitter Frame"); |
2767 | 2773 | ||
2768 | int resetval = 0; | 2774 | int resetval = 0; |
2769 | int maxVal = 0; | 2775 | int maxVal = 0; |
@@ -2842,7 +2848,7 @@ void CalendarView::writeSettings() | |||
2842 | writeFilterSettings(config); | 2848 | writeFilterSettings(config); |
2843 | config->setGroup( "AppRun" ); | 2849 | config->setGroup( "AppRun" ); |
2844 | QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) ); | 2850 | QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) ); |
2845 | int days = dt.daysTo( QDate::currentDate() ); | 2851 | int days = dt.daysTo( (QDateTime)QDate::currentDate() ); |
2846 | dt = dt.addDays( days ); | 2852 | dt = dt.addDays( days ); |
2847 | int secs = dt.secsTo( QDateTime::currentDateTime() ); | 2853 | int secs = dt.secsTo( QDateTime::currentDateTime() ); |
2848 | config->writeEntry( "LatestProgramStopDays", days ); | 2854 | config->writeEntry( "LatestProgramStopDays", days ); |
@@ -2869,9 +2875,9 @@ void CalendarView::writeSettings() | |||
2869 | 2875 | ||
2870 | #endif | 2876 | #endif |
2871 | 2877 | ||
2872 | QValueList<int> listINT = mLeftFrame->sizes(); | 2878 | Q3ValueList<int> listINT = mLeftFrame->sizes(); |
2873 | config->writeEntry("Left Splitter Frame",listINT); | 2879 | config->writeEntry("Left Splitter Frame",listINT); |
2874 | QValueList<int> listINT2 = mMainFrame->sizes(); | 2880 | Q3ValueList<int> listINT2 = mMainFrame->sizes(); |
2875 | config->writeEntry("Main Splitter Frame",listINT2); | 2881 | config->writeEntry("Main Splitter Frame",listINT2); |
2876 | #ifdef DESKTOP_VERSION | 2882 | #ifdef DESKTOP_VERSION |
2877 | config->setGroup("WidgetLayout"); | 2883 | config->setGroup("WidgetLayout"); |
@@ -3166,7 +3172,7 @@ void CalendarView::checkConflictForEvent() | |||
3166 | return; | 3172 | return; |
3167 | } | 3173 | } |
3168 | } | 3174 | } |
3169 | QPtrList<Event> testlist = mCalendar->events(); | 3175 | Q3PtrList<Event> testlist = mCalendar->events(); |
3170 | Event * test = testlist.first(); | 3176 | Event * test = testlist.first(); |
3171 | QDateTime conflict; | 3177 | QDateTime conflict; |
3172 | QDateTime retVal; | 3178 | QDateTime retVal; |
@@ -3428,7 +3434,7 @@ void CalendarView::slotSelectPickerDate( QDate d) | |||
3428 | 3434 | ||
3429 | void CalendarView::removeCategories() | 3435 | void CalendarView::removeCategories() |
3430 | { | 3436 | { |
3431 | QPtrList<Incidence> incList = mCalendar->rawIncidences(); | 3437 | Q3PtrList<Incidence> incList = mCalendar->rawIncidences(); |
3432 | QStringList catList = KOPrefs::instance()->mCustomCategories; | 3438 | QStringList catList = KOPrefs::instance()->mCustomCategories; |
3433 | QStringList catIncList; | 3439 | QStringList catIncList; |
3434 | QStringList newCatList; | 3440 | QStringList newCatList; |
@@ -3449,7 +3455,7 @@ void CalendarView::removeCategories() | |||
3449 | 3455 | ||
3450 | int CalendarView::addCategories() | 3456 | int CalendarView::addCategories() |
3451 | { | 3457 | { |
3452 | QPtrList<Incidence> incList = mCalendar->rawIncidences(); | 3458 | Q3PtrList<Incidence> incList = mCalendar->rawIncidences(); |
3453 | QStringList catList = KOPrefs::instance()->mCustomCategories; | 3459 | QStringList catList = KOPrefs::instance()->mCustomCategories; |
3454 | QStringList catIncList; | 3460 | QStringList catIncList; |
3455 | Incidence* inc = incList.first(); | 3461 | Incidence* inc = incList.first(); |
@@ -3507,23 +3513,23 @@ void CalendarView::manageCategories() | |||
3507 | 3513 | ||
3508 | void CalendarView::beamIncidence(Incidence * Inc) | 3514 | void CalendarView::beamIncidence(Incidence * Inc) |
3509 | { | 3515 | { |
3510 | QPtrList<Incidence> delSel ; | 3516 | Q3PtrList<Incidence> delSel ; |
3511 | delSel.append(Inc); | 3517 | delSel.append(Inc); |
3512 | beamIncidenceList( delSel ); | 3518 | beamIncidenceList( delSel ); |
3513 | } | 3519 | } |
3514 | void CalendarView::beamCalendar() | 3520 | void CalendarView::beamCalendar() |
3515 | { | 3521 | { |
3516 | QPtrList<Incidence> delSel = mCalendar->rawIncidences(); | 3522 | Q3PtrList<Incidence> delSel = mCalendar->rawIncidences(); |
3517 | //qDebug("beamCalendar() "); | 3523 | //qDebug("beamCalendar() "); |
3518 | beamIncidenceList( delSel ); | 3524 | beamIncidenceList( delSel ); |
3519 | } | 3525 | } |
3520 | void CalendarView::beamFilteredCalendar() | 3526 | void CalendarView::beamFilteredCalendar() |
3521 | { | 3527 | { |
3522 | QPtrList<Incidence> delSel = mCalendar->incidences(); | 3528 | Q3PtrList<Incidence> delSel = mCalendar->incidences(); |
3523 | //qDebug("beamFilteredCalendar() "); | 3529 | //qDebug("beamFilteredCalendar() "); |
3524 | beamIncidenceList( delSel ); | 3530 | beamIncidenceList( delSel ); |
3525 | } | 3531 | } |
3526 | void CalendarView::beamIncidenceList(QPtrList<Incidence> delSel ) | 3532 | void CalendarView::beamIncidenceList(Q3PtrList<Incidence> delSel ) |
3527 | { | 3533 | { |
3528 | 3534 | ||
3529 | KOBeamPrefs beamDialog; | 3535 | KOBeamPrefs beamDialog; |
@@ -4315,7 +4321,7 @@ void CalendarView::schedule_publish(Incidence *incidence) | |||
4315 | 4321 | ||
4316 | PublishDialog *publishdlg = new PublishDialog(); | 4322 | PublishDialog *publishdlg = new PublishDialog(); |
4317 | if (incidence->attendeeCount()>0) { | 4323 | if (incidence->attendeeCount()>0) { |
4318 | QPtrList<Attendee> attendees = incidence->attendees(); | 4324 | Q3PtrList<Attendee> attendees = incidence->attendees(); |
4319 | attendees.first(); | 4325 | attendees.first(); |
4320 | while ( attendees.current()!=0 ) { | 4326 | while ( attendees.current()!=0 ) { |
4321 | publishdlg->addAttendee(attendees.current()); | 4327 | publishdlg->addAttendee(attendees.current()); |
@@ -4724,7 +4730,7 @@ void CalendarView::showDates(const DateList &selectedDates) | |||
4724 | 4730 | ||
4725 | } | 4731 | } |
4726 | 4732 | ||
4727 | QPtrList<CalFilter> CalendarView::filters() | 4733 | Q3PtrList<CalFilter> CalendarView::filters() |
4728 | { | 4734 | { |
4729 | return mFilters; | 4735 | return mFilters; |
4730 | 4736 | ||
@@ -4765,7 +4771,7 @@ void CalendarView::showFilter(bool visible) | |||
4765 | if (visible) { | 4771 | if (visible) { |
4766 | mCalEditView->readConfig(); | 4772 | mCalEditView->readConfig(); |
4767 | mCalEditView->show(); | 4773 | mCalEditView->show(); |
4768 | QValueList<int> sizes; | 4774 | Q3ValueList<int> sizes; |
4769 | sizes = mLeftFrame->sizes(); | 4775 | sizes = mLeftFrame->sizes(); |
4770 | if ( sizes.count() == 4 && sizes[3] < 20 ) { | 4776 | if ( sizes.count() == 4 && sizes[3] < 20 ) { |
4771 | sizes.clear(); | 4777 | sizes.clear(); |
@@ -4846,21 +4852,21 @@ void CalendarView::takeOverCalendar() | |||
4846 | // TODO: Create Calendar::allIncidences() function and use it here | 4852 | // TODO: Create Calendar::allIncidences() function and use it here |
4847 | 4853 | ||
4848 | clearAllViews(); | 4854 | clearAllViews(); |
4849 | QPtrList<Event> events = mCalendar->events(); | 4855 | Q3PtrList<Event> events = mCalendar->events(); |
4850 | for(uint i=0; i<events.count(); ++i) { | 4856 | for(uint i=0; i<events.count(); ++i) { |
4851 | events.at(i)->setOrganizer(KOPrefs::instance()->email()); | 4857 | events.at(i)->setOrganizer(KOPrefs::instance()->email()); |
4852 | events.at(i)->recreate(); | 4858 | events.at(i)->recreate(); |
4853 | events.at(i)->setReadOnly(false); | 4859 | events.at(i)->setReadOnly(false); |
4854 | } | 4860 | } |
4855 | 4861 | ||
4856 | QPtrList<Todo> todos = mCalendar->todos(); | 4862 | Q3PtrList<Todo> todos = mCalendar->todos(); |
4857 | for(uint i=0; i<todos.count(); ++i) { | 4863 | for(uint i=0; i<todos.count(); ++i) { |
4858 | todos.at(i)->setOrganizer(KOPrefs::instance()->email()); | 4864 | todos.at(i)->setOrganizer(KOPrefs::instance()->email()); |
4859 | todos.at(i)->recreate(); | 4865 | todos.at(i)->recreate(); |
4860 | todos.at(i)->setReadOnly(false); | 4866 | todos.at(i)->setReadOnly(false); |
4861 | } | 4867 | } |
4862 | 4868 | ||
4863 | QPtrList<Journal> journals = mCalendar->journals(); | 4869 | Q3PtrList<Journal> journals = mCalendar->journals(); |
4864 | for(uint i=0; i<journals.count(); ++i) { | 4870 | for(uint i=0; i<journals.count(); ++i) { |
4865 | journals.at(i)->setOrganizer(KOPrefs::instance()->email()); | 4871 | journals.at(i)->setOrganizer(KOPrefs::instance()->email()); |
4866 | journals.at(i)->recreate(); | 4872 | journals.at(i)->recreate(); |
@@ -4875,7 +4881,7 @@ void CalendarView::showIntro() | |||
4875 | kdDebug() << "To be implemented." << endl; | 4881 | kdDebug() << "To be implemented." << endl; |
4876 | } | 4882 | } |
4877 | 4883 | ||
4878 | QWidgetStack *CalendarView::viewStack() | 4884 | Q3WidgetStack *CalendarView::viewStack() |
4879 | { | 4885 | { |
4880 | return mRightFrame; | 4886 | return mRightFrame; |
4881 | } | 4887 | } |
@@ -5060,7 +5066,7 @@ void CalendarView::lookForIncomingMessages() | |||
5060 | bool CalendarView::removeCompletedSubTodos( Todo* t ) | 5066 | bool CalendarView::removeCompletedSubTodos( Todo* t ) |
5061 | { | 5067 | { |
5062 | bool deleteTodo = true; | 5068 | bool deleteTodo = true; |
5063 | QPtrList<Incidence> subTodos; | 5069 | Q3PtrList<Incidence> subTodos; |
5064 | Incidence *aTodo; | 5070 | Incidence *aTodo; |
5065 | subTodos = t->relations(); | 5071 | subTodos = t->relations(); |
5066 | for (aTodo = subTodos.first(); aTodo; aTodo = subTodos.next()) { | 5072 | for (aTodo = subTodos.first(); aTodo; aTodo = subTodos.next()) { |
@@ -5086,8 +5092,8 @@ void CalendarView::purgeCompleted() | |||
5086 | 5092 | ||
5087 | if (result == KMessageBox::Continue) { | 5093 | if (result == KMessageBox::Continue) { |
5088 | 5094 | ||
5089 | QPtrList<Todo> todoCal; | 5095 | Q3PtrList<Todo> todoCal; |
5090 | QPtrList<Todo> rootTodos; | 5096 | Q3PtrList<Todo> rootTodos; |
5091 | //QPtrList<Incidence> rel; | 5097 | //QPtrList<Incidence> rel; |
5092 | Todo *aTodo; | 5098 | Todo *aTodo; |
5093 | todoCal = calendar()->todos(); | 5099 | todoCal = calendar()->todos(); |