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 /libkcal/calendarlocal.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-- | libkcal/calendarlocal.cpp | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp index ce3cd09..cb52b7c 100644 --- a/libkcal/calendarlocal.cpp +++ b/libkcal/calendarlocal.cpp | |||
@@ -22,7 +22,7 @@ | |||
22 | 22 | ||
23 | #include <qdatetime.h> | 23 | #include <qdatetime.h> |
24 | #include <qstring.h> | 24 | #include <qstring.h> |
25 | #include <qptrlist.h> | 25 | #include <q3ptrlist.h> |
26 | 26 | ||
27 | #include <kdebug.h> | 27 | #include <kdebug.h> |
28 | #include <kconfig.h> | 28 | #include <kconfig.h> |
@@ -192,7 +192,7 @@ bool CalendarLocal::mergeCalendar( Calendar* remote ) | |||
192 | // 2 look for raw inc in remote | 192 | // 2 look for raw inc in remote |
193 | // if inc in local, replace it | 193 | // if inc in local, replace it |
194 | // if not in local, add it to default calendar | 194 | // if not in local, add it to default calendar |
195 | QPtrList<Incidence> localInc = rawIncidences(); | 195 | Q3PtrList<Incidence> localInc = rawIncidences(); |
196 | Incidence* inL = localInc.first(); | 196 | Incidence* inL = localInc.first(); |
197 | while ( inL ) { | 197 | while ( inL ) { |
198 | if ( ! inL->isReadOnly () ) | 198 | if ( ! inL->isReadOnly () ) |
@@ -200,7 +200,7 @@ bool CalendarLocal::mergeCalendar( Calendar* remote ) | |||
200 | deleteIncidence( inL ); | 200 | deleteIncidence( inL ); |
201 | inL = localInc.next(); | 201 | inL = localInc.next(); |
202 | } | 202 | } |
203 | QPtrList<Incidence> er = remote->rawIncidences(); | 203 | Q3PtrList<Incidence> er = remote->rawIncidences(); |
204 | Incidence* inR = er.first(); | 204 | Incidence* inR = er.first(); |
205 | while ( inR ) { | 205 | while ( inR ) { |
206 | inL = incidenceForUid( inR->uid(),false ); | 206 | inL = incidenceForUid( inR->uid(),false ); |
@@ -259,9 +259,9 @@ void CalendarLocal::addCalendar( Calendar* cal ) | |||
259 | { | 259 | { |
260 | cal->setDontDeleteIncidencesOnClose(); | 260 | cal->setDontDeleteIncidencesOnClose(); |
261 | setSyncEventsEnabled(); | 261 | setSyncEventsEnabled(); |
262 | QPtrList<Incidence> incList; | 262 | Q3PtrList<Incidence> incList; |
263 | { | 263 | { |
264 | QPtrList<Event> EventList = cal->rawEvents(); | 264 | Q3PtrList<Event> EventList = cal->rawEvents(); |
265 | Event * ev = EventList.first(); | 265 | Event * ev = EventList.first(); |
266 | while ( ev ) { | 266 | while ( ev ) { |
267 | if ( ev->uid().left( 15 ) == QString("last-syncEvent-") ) { | 267 | if ( ev->uid().left( 15 ) == QString("last-syncEvent-") ) { |
@@ -279,7 +279,7 @@ void CalendarLocal::addCalendar( Calendar* cal ) | |||
279 | } | 279 | } |
280 | { | 280 | { |
281 | 281 | ||
282 | QPtrList<Todo> TodoList = cal->rawTodos(); | 282 | Q3PtrList<Todo> TodoList = cal->rawTodos(); |
283 | Todo * ev = TodoList.first(); | 283 | Todo * ev = TodoList.first(); |
284 | while ( ev ) { | 284 | while ( ev ) { |
285 | ev->resetRelatedTo(); | 285 | ev->resetRelatedTo(); |
@@ -299,7 +299,7 @@ void CalendarLocal::addCalendar( Calendar* cal ) | |||
299 | } | 299 | } |
300 | } | 300 | } |
301 | { | 301 | { |
302 | QPtrList<Journal> JournalList = cal->journals(); | 302 | Q3PtrList<Journal> JournalList = cal->journals(); |
303 | Journal * ev = JournalList.first(); | 303 | Journal * ev = JournalList.first(); |
304 | while ( ev ) { | 304 | while ( ev ) { |
305 | Journal * se = journal( ev->uid() ); | 305 | Journal * se = journal( ev->uid() ); |
@@ -481,9 +481,9 @@ void CalendarLocal::deleteTodo( Todo *todo ) | |||
481 | setupRelations( dup ); | 481 | setupRelations( dup ); |
482 | } | 482 | } |
483 | 483 | ||
484 | QPtrList<Todo> CalendarLocal::rawTodos() | 484 | Q3PtrList<Todo> CalendarLocal::rawTodos() |
485 | { | 485 | { |
486 | QPtrList<Todo> el; | 486 | Q3PtrList<Todo> el; |
487 | for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() ) | 487 | for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() ) |
488 | if ( it->calEnabled() ) el.append( it ); | 488 | if ( it->calEnabled() ) el.append( it ); |
489 | return el; | 489 | return el; |
@@ -499,13 +499,13 @@ Todo *CalendarLocal::todo( QString syncProf, QString id ) | |||
499 | } | 499 | } |
500 | void CalendarLocal::removeSyncInfo( QString syncProfile) | 500 | void CalendarLocal::removeSyncInfo( QString syncProfile) |
501 | { | 501 | { |
502 | QPtrList<Incidence> all = rawIncidences() ; | 502 | Q3PtrList<Incidence> all = rawIncidences() ; |
503 | Incidence *inc; | 503 | Incidence *inc; |
504 | for ( inc = all.first(); inc; inc = all.next() ) { | 504 | for ( inc = all.first(); inc; inc = all.next() ) { |
505 | inc->removeID( syncProfile ); | 505 | inc->removeID( syncProfile ); |
506 | } | 506 | } |
507 | if ( syncProfile.isEmpty() ) { | 507 | if ( syncProfile.isEmpty() ) { |
508 | QPtrList<Event> el; | 508 | Q3PtrList<Event> el; |
509 | Event *todo; | 509 | Event *todo; |
510 | for ( todo = mEventList.first(); todo; todo = mEventList.next() ) { | 510 | for ( todo = mEventList.first(); todo; todo = mEventList.next() ) { |
511 | if ( todo->uid().left( 15 ) == QString("last-syncEvent-") ) | 511 | if ( todo->uid().left( 15 ) == QString("last-syncEvent-") ) |
@@ -520,9 +520,9 @@ void CalendarLocal::removeSyncInfo( QString syncProfile) | |||
520 | deleteIncidence ( lse ); | 520 | deleteIncidence ( lse ); |
521 | } | 521 | } |
522 | } | 522 | } |
523 | QPtrList<Event> CalendarLocal::getExternLastSyncEvents() | 523 | Q3PtrList<Event> CalendarLocal::getExternLastSyncEvents() |
524 | { | 524 | { |
525 | QPtrList<Event> el; | 525 | Q3PtrList<Event> el; |
526 | Event *todo; | 526 | Event *todo; |
527 | for ( todo = mEventList.first(); todo; todo = mEventList.next() ) { | 527 | for ( todo = mEventList.first(); todo; todo = mEventList.next() ) { |
528 | if ( todo->uid().left( 15 ) == QString("last-syncEvent-") ) | 528 | if ( todo->uid().left( 15 ) == QString("last-syncEvent-") ) |
@@ -685,9 +685,9 @@ void CalendarLocal::deRegisterAlarm() | |||
685 | // #endif | 685 | // #endif |
686 | } | 686 | } |
687 | 687 | ||
688 | QPtrList<Todo> CalendarLocal::todos( const QDate &date ) | 688 | Q3PtrList<Todo> CalendarLocal::todos( const QDate &date ) |
689 | { | 689 | { |
690 | QPtrList<Todo> todos; | 690 | Q3PtrList<Todo> todos; |
691 | 691 | ||
692 | Todo *todo; | 692 | Todo *todo; |
693 | for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) { | 693 | for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) { |
@@ -786,7 +786,7 @@ Alarm::List CalendarLocal::alarms( const QDateTime &from, const QDateTime &to ) | |||
786 | void CalendarLocal::appendAlarms( Alarm::List &alarms, Incidence *incidence, | 786 | void CalendarLocal::appendAlarms( Alarm::List &alarms, Incidence *incidence, |
787 | const QDateTime &from, const QDateTime &to ) | 787 | const QDateTime &from, const QDateTime &to ) |
788 | { | 788 | { |
789 | QPtrList<Alarm> alarmList = incidence->alarms(); | 789 | Q3PtrList<Alarm> alarmList = incidence->alarms(); |
790 | Alarm *alarm; | 790 | Alarm *alarm; |
791 | for( alarm = alarmList.first(); alarm; alarm = alarmList.next() ) { | 791 | for( alarm = alarmList.first(); alarm; alarm = alarmList.next() ) { |
792 | // kdDebug(5800) << "CalendarLocal::appendAlarms() '" << alarm->text() | 792 | // kdDebug(5800) << "CalendarLocal::appendAlarms() '" << alarm->text() |
@@ -805,7 +805,7 @@ void CalendarLocal::appendRecurringAlarms( Alarm::List &alarms, | |||
805 | const QDateTime &to ) | 805 | const QDateTime &to ) |
806 | { | 806 | { |
807 | 807 | ||
808 | QPtrList<Alarm> alarmList = incidence->alarms(); | 808 | Q3PtrList<Alarm> alarmList = incidence->alarms(); |
809 | Alarm *alarm; | 809 | Alarm *alarm; |
810 | QDateTime qdt; | 810 | QDateTime qdt; |
811 | for( alarm = alarmList.first(); alarm; alarm = alarmList.next() ) { | 811 | for( alarm = alarmList.first(); alarm; alarm = alarmList.next() ) { |
@@ -844,9 +844,9 @@ void CalendarLocal::insertEvent( Event *event ) | |||
844 | } | 844 | } |
845 | 845 | ||
846 | 846 | ||
847 | QPtrList<Event> CalendarLocal::rawEventsForDate( const QDate &qd, bool sorted ) | 847 | Q3PtrList<Event> CalendarLocal::rawEventsForDate( const QDate &qd, bool sorted ) |
848 | { | 848 | { |
849 | QPtrList<Event> eventList; | 849 | Q3PtrList<Event> eventList; |
850 | 850 | ||
851 | Event *event; | 851 | Event *event; |
852 | for( event = mEventList.first(); event; event = mEventList.next() ) { | 852 | for( event = mEventList.first(); event; event = mEventList.next() ) { |
@@ -878,7 +878,7 @@ QPtrList<Event> CalendarLocal::rawEventsForDate( const QDate &qd, bool sorted ) | |||
878 | 878 | ||
879 | // kdDebug(5800) << "Sorting events for date\n" << endl; | 879 | // kdDebug(5800) << "Sorting events for date\n" << endl; |
880 | // now, we have to sort it based on dtStart.time() | 880 | // now, we have to sort it based on dtStart.time() |
881 | QPtrList<Event> eventListSorted; | 881 | Q3PtrList<Event> eventListSorted; |
882 | Event *sortEvent; | 882 | Event *sortEvent; |
883 | for ( event = eventList.first(); event; event = eventList.next() ) { | 883 | for ( event = eventList.first(); event; event = eventList.next() ) { |
884 | sortEvent = eventListSorted.first(); | 884 | sortEvent = eventListSorted.first(); |
@@ -894,12 +894,12 @@ QPtrList<Event> CalendarLocal::rawEventsForDate( const QDate &qd, bool sorted ) | |||
894 | } | 894 | } |
895 | 895 | ||
896 | 896 | ||
897 | QPtrList<Event> CalendarLocal::rawEvents( const QDate &start, const QDate &end, | 897 | Q3PtrList<Event> CalendarLocal::rawEvents( const QDate &start, const QDate &end, |
898 | bool inclusive ) | 898 | bool inclusive ) |
899 | { | 899 | { |
900 | Event *event = 0; | 900 | Event *event = 0; |
901 | 901 | ||
902 | QPtrList<Event> eventList; | 902 | Q3PtrList<Event> eventList; |
903 | 903 | ||
904 | // Get non-recurring events | 904 | // Get non-recurring events |
905 | for( event = mEventList.first(); event; event = mEventList.next() ) { | 905 | for( event = mEventList.first(); event; event = mEventList.next() ) { |
@@ -923,7 +923,7 @@ QPtrList<Event> CalendarLocal::rawEvents( const QDate &start, const QDate &end, | |||
923 | } | 923 | } |
924 | } else { | 924 | } else { |
925 | bool founOne; | 925 | bool founOne; |
926 | QDate next = event->getNextOccurence( start, &founOne ).date(); | 926 | QDate next = event->getNextOccurence( (QDateTime)start, &founOne ).date(); |
927 | if ( founOne ) { | 927 | if ( founOne ) { |
928 | if ( next <= end ) { | 928 | if ( next <= end ) { |
929 | found = true; | 929 | found = true; |
@@ -972,14 +972,14 @@ QPtrList<Event> CalendarLocal::rawEvents( const QDate &start, const QDate &end, | |||
972 | return eventList; | 972 | return eventList; |
973 | } | 973 | } |
974 | 974 | ||
975 | QPtrList<Event> CalendarLocal::rawEventsForDate( const QDateTime &qdt ) | 975 | Q3PtrList<Event> CalendarLocal::rawEventsForDate( const QDateTime &qdt ) |
976 | { | 976 | { |
977 | return rawEventsForDate( qdt.date() ); | 977 | return rawEventsForDate( qdt.date() ); |
978 | } | 978 | } |
979 | 979 | ||
980 | QPtrList<Event> CalendarLocal::rawEvents() | 980 | Q3PtrList<Event> CalendarLocal::rawEvents() |
981 | { | 981 | { |
982 | QPtrList<Event> el; | 982 | Q3PtrList<Event> el; |
983 | for ( Event *it = mEventList.first(); it; it = mEventList.next() ) | 983 | for ( Event *it = mEventList.first(); it; it = mEventList.next() ) |
984 | if ( it->calEnabled() ) el.append( it ); | 984 | if ( it->calEnabled() ) el.append( it ); |
985 | return el; | 985 | return el; |
@@ -1006,9 +1006,9 @@ void CalendarLocal::deleteJournal( Journal *journal ) | |||
1006 | } | 1006 | } |
1007 | } | 1007 | } |
1008 | 1008 | ||
1009 | QPtrList<Journal> CalendarLocal::journals4Date( const QDate & date ) | 1009 | Q3PtrList<Journal> CalendarLocal::journals4Date( const QDate & date ) |
1010 | { | 1010 | { |
1011 | QPtrList<Journal> el; | 1011 | Q3PtrList<Journal> el; |
1012 | for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() ) | 1012 | for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() ) |
1013 | if ( it->calEnabled() && it->dtStart().date() == date) el.append( it ); | 1013 | if ( it->calEnabled() && it->dtStart().date() == date) el.append( it ); |
1014 | return el; | 1014 | return el; |
@@ -1040,9 +1040,9 @@ Journal *CalendarLocal::journal( const QString &uid ) | |||
1040 | return retVal; | 1040 | return retVal; |
1041 | } | 1041 | } |
1042 | 1042 | ||
1043 | QPtrList<Journal> CalendarLocal::journals() | 1043 | Q3PtrList<Journal> CalendarLocal::journals() |
1044 | { | 1044 | { |
1045 | QPtrList<Journal> el; | 1045 | Q3PtrList<Journal> el; |
1046 | for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() ) | 1046 | for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() ) |
1047 | if ( it->calEnabled() ) el.append( it ); | 1047 | if ( it->calEnabled() ) el.append( it ); |
1048 | return el; | 1048 | return el; |
@@ -1051,7 +1051,7 @@ void CalendarLocal::setCalendarRemove( int id ) | |||
1051 | { | 1051 | { |
1052 | 1052 | ||
1053 | { | 1053 | { |
1054 | QPtrList<Event> EventList = mEventList; | 1054 | Q3PtrList<Event> EventList = mEventList; |
1055 | Event * ev = EventList.first(); | 1055 | Event * ev = EventList.first(); |
1056 | while ( ev ) { | 1056 | while ( ev ) { |
1057 | if ( ev->calID() == id && ev->uid().left( 15 ) != QString("last-syncEvent-") ) | 1057 | if ( ev->calID() == id && ev->uid().left( 15 ) != QString("last-syncEvent-") ) |
@@ -1061,7 +1061,7 @@ void CalendarLocal::setCalendarRemove( int id ) | |||
1061 | } | 1061 | } |
1062 | { | 1062 | { |
1063 | 1063 | ||
1064 | QPtrList<Todo> TodoList = mTodoList; | 1064 | Q3PtrList<Todo> TodoList = mTodoList; |
1065 | Todo * ev = TodoList.first(); | 1065 | Todo * ev = TodoList.first(); |
1066 | while ( ev ) { | 1066 | while ( ev ) { |
1067 | if ( ev->calID() == id ) | 1067 | if ( ev->calID() == id ) |
@@ -1070,7 +1070,7 @@ void CalendarLocal::setCalendarRemove( int id ) | |||
1070 | } | 1070 | } |
1071 | } | 1071 | } |
1072 | { | 1072 | { |
1073 | QPtrList<Journal> JournalList = mJournalList; | 1073 | Q3PtrList<Journal> JournalList = mJournalList; |
1074 | Journal * ev = JournalList.first(); | 1074 | Journal * ev = JournalList.first(); |
1075 | while ( ev ) { | 1075 | while ( ev ) { |
1076 | if ( ev->calID() == id ) | 1076 | if ( ev->calID() == id ) |