-rw-r--r-- | libkcal/phoneformat.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp index 900fc04..794e4b4 100644 --- a/libkcal/phoneformat.cpp +++ b/libkcal/phoneformat.cpp | |||
@@ -23,13 +23,14 @@ | |||
23 | #include <qstring.h> | 23 | #include <qstring.h> |
24 | #include <qapplication.h> | 24 | #include <qapplication.h> |
25 | #include <qptrlist.h> | 25 | #include <q3ptrlist.h> |
26 | #include <qregexp.h> | 26 | #include <qregexp.h> |
27 | #include <qmessagebox.h> | 27 | #include <qmessagebox.h> |
28 | #include <qclipboard.h> | 28 | #include <qclipboard.h> |
29 | #include <qfile.h> | 29 | #include <qfile.h> |
30 | #include <qtextstream.h> | 30 | #include <q3textstream.h> |
31 | #include <qtextcodec.h> | 31 | #include <qtextcodec.h> |
32 | #include <qdir.h> | 32 | #include <qdir.h> |
33 | #include <qlabel.h> | 33 | #include <qlabel.h> |
34 | #include <QDesktopWidget> | ||
34 | 35 | ||
35 | #include <kdebug.h> | 36 | #include <kdebug.h> |
@@ -202,5 +203,5 @@ ulong PhoneFormat::getCsumEvent( Event* event ) | |||
202 | { | 203 | { |
203 | int count = 1; | 204 | int count = 1; |
204 | QPtrList<Recurrence::rMonthPos> rmp; | 205 | Q3PtrList<Recurrence::rMonthPos> rmp; |
205 | rmp = rec->monthPositions(); | 206 | rmp = rec->monthPositions(); |
206 | if ( rmp.first()->negative ) | 207 | if ( rmp.first()->negative ) |
@@ -242,5 +243,5 @@ ulong PhoneFormat::getCsumEvent( Event* event ) | |||
242 | if ( rec->endDate().isValid() ) { // 15 + 16 | 243 | if ( rec->endDate().isValid() ) { // 15 + 16 |
243 | list.append( "1" ); | 244 | list.append( "1" ); |
244 | list.append( PhoneParser::dtToString( rec->endDate()) ); | 245 | list.append( PhoneParser::dtToString( (QDateTime)rec->endDate()) ); |
245 | } else { | 246 | } else { |
246 | list.append( "0" ); | 247 | list.append( "0" ); |
@@ -306,5 +307,5 @@ bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal) | |||
306 | if ( ! vfload.load( calendar, fileName ) ) | 307 | if ( ! vfload.load( calendar, fileName ) ) |
307 | return false; | 308 | return false; |
308 | QPtrList<Event> er = calendar->rawEvents(); | 309 | Q3PtrList<Event> er = calendar->rawEvents(); |
309 | Event* ev = er.first(); | 310 | Event* ev = er.first(); |
310 | qDebug("reading events... "); | 311 | qDebug("reading events... "); |
@@ -341,5 +342,5 @@ bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal) | |||
341 | { | 342 | { |
342 | qDebug("reading todos... "); | 343 | qDebug("reading todos... "); |
343 | QPtrList<Todo> tr = calendar->rawTodos(); | 344 | Q3PtrList<Todo> tr = calendar->rawTodos(); |
344 | Todo* ev = tr.first(); | 345 | Todo* ev = tr.first(); |
345 | while ( ev ) { | 346 | while ( ev ) { |
@@ -466,5 +467,5 @@ void PhoneFormat::copyTodo( Todo* to, Todo* from ) | |||
466 | 467 | ||
467 | } | 468 | } |
468 | #include <qcstring.h> | 469 | #include <q3cstring.h> |
469 | 470 | ||
470 | void PhoneFormat::afterSave( Incidence* inc,const QString& id ,const QString& csum) | 471 | void PhoneFormat::afterSave( Incidence* inc,const QString& id ,const QString& csum) |
@@ -498,5 +499,5 @@ bool PhoneFormat::save( Calendar *calendar) | |||
498 | 499 | ||
499 | // 1 remove events which should be deleted | 500 | // 1 remove events which should be deleted |
500 | QPtrList<Event> er = calendar->rawEvents(); | 501 | Q3PtrList<Event> er = calendar->rawEvents(); |
501 | Event* ev = er.first(); | 502 | Event* ev = er.first(); |
502 | while ( ev ) { | 503 | while ( ev ) { |
@@ -509,5 +510,5 @@ bool PhoneFormat::save( Calendar *calendar) | |||
509 | } | 510 | } |
510 | // 2 remove todos which should be deleted | 511 | // 2 remove todos which should be deleted |
511 | QPtrList<Todo> tl = calendar->rawTodos(); | 512 | Q3PtrList<Todo> tl = calendar->rawTodos(); |
512 | Todo* to = tl.first(); | 513 | Todo* to = tl.first(); |
513 | while ( to ) { | 514 | while ( to ) { |
@@ -553,5 +554,5 @@ bool PhoneFormat::save( Calendar *calendar) | |||
553 | ev = er.first(); | 554 | ev = er.first(); |
554 | message = i18n(" Comparing event # "); | 555 | message = i18n(" Comparing event # "); |
555 | QPtrList<Event> er1 = calendarTemp->rawEvents(); | 556 | Q3PtrList<Event> er1 = calendarTemp->rawEvents(); |
556 | Event* ev1; | 557 | Event* ev1; |
557 | int procCount = 0; | 558 | int procCount = 0; |
@@ -581,5 +582,5 @@ bool PhoneFormat::save( Calendar *calendar) | |||
581 | to = tl.first(); | 582 | to = tl.first(); |
582 | procCount = 0; | 583 | procCount = 0; |
583 | QPtrList<Todo> tl1 = calendarTemp->rawTodos(); | 584 | Q3PtrList<Todo> tl1 = calendarTemp->rawTodos(); |
584 | Todo* to1 ; | 585 | Todo* to1 ; |
585 | message = i18n(" Comparing todo # "); | 586 | message = i18n(" Comparing todo # "); |