-rw-r--r-- | libkcal/sharpformat.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp index 9b757f7..b8c2aa7 100644 --- a/libkcal/sharpformat.cpp +++ b/libkcal/sharpformat.cpp | |||
@@ -23,10 +23,10 @@ | |||
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 <qxml.h> | 32 | #include <qxml.h> |
@@ -367,9 +367,9 @@ bool SharpFormat::load( Calendar *calendar, Calendar *existngCal ) | |||
367 | } | 367 | } |
368 | QFile file( fileName ); | 368 | QFile file( fileName ); |
369 | if (!file.open( IO_ReadOnly ) ) { | 369 | if (!file.open( QIODevice::ReadOnly ) ) { |
370 | return false; | 370 | return false; |
371 | 371 | ||
372 | } | 372 | } |
373 | QTextStream ts( &file ); | 373 | Q3TextStream ts( &file ); |
374 | ts.setCodec( QTextCodec::codecForName("utf8") ); | 374 | ts.setCodec( QTextCodec::codecForName("utf8") ); |
375 | text = ts.read(); | 375 | text = ts.read(); |
@@ -389,5 +389,5 @@ bool SharpFormat::load( Calendar *calendar, Calendar *existngCal ) | |||
389 | } | 389 | } |
390 | file.setName( fileName ); | 390 | file.setName( fileName ); |
391 | if (!file.open( IO_ReadOnly ) ) { | 391 | if (!file.open( QIODevice::ReadOnly ) ) { |
392 | return false; | 392 | return false; |
393 | 393 | ||
@@ -476,5 +476,5 @@ bool SharpFormat::save( Calendar *calendar) | |||
476 | QString tPrefix = "CARDID,CATEGORY,ETDY,LTDY,FNDY,MARK,PRTY,TITL,MEM1\n"; | 476 | QString tPrefix = "CARDID,CATEGORY,ETDY,LTDY,FNDY,MARK,PRTY,TITL,MEM1\n"; |
477 | QString command; | 477 | QString command; |
478 | QPtrList<Event> er = calendar->rawEvents(); | 478 | Q3PtrList<Event> er = calendar->rawEvents(); |
479 | Event* ev = er.first(); | 479 | Event* ev = er.first(); |
480 | QString fileName = "/tmp/kopitempout"; | 480 | QString fileName = "/tmp/kopitempout"; |
@@ -504,8 +504,8 @@ bool SharpFormat::save( Calendar *calendar) | |||
504 | QString fileNameIn = "/tmp/kopitempin"; | 504 | QString fileNameIn = "/tmp/kopitempin"; |
505 | QFile fileIn( fileNameIn ); | 505 | QFile fileIn( fileNameIn ); |
506 | if (!fileIn.open( IO_WriteOnly ) ) { | 506 | if (!fileIn.open( QIODevice::WriteOnly ) ) { |
507 | return false; | 507 | return false; |
508 | } | 508 | } |
509 | QTextStream tsIn( &fileIn ); | 509 | Q3TextStream tsIn( &fileIn ); |
510 | tsIn.setCodec( QTextCodec::codecForName("utf8") ); | 510 | tsIn.setCodec( QTextCodec::codecForName("utf8") ); |
511 | tsIn << ePrefix << eString ; | 511 | tsIn << ePrefix << eString ; |
@@ -518,9 +518,9 @@ bool SharpFormat::save( Calendar *calendar) | |||
518 | system ( command.utf8() ); | 518 | system ( command.utf8() ); |
519 | QFile file( fileName ); | 519 | QFile file( fileName ); |
520 | if (!file.open( IO_ReadOnly ) ) { | 520 | if (!file.open( QIODevice::ReadOnly ) ) { |
521 | return false; | 521 | return false; |
522 | 522 | ||
523 | } | 523 | } |
524 | QTextStream ts( &file ); | 524 | Q3TextStream ts( &file ); |
525 | ts.setCodec( QTextCodec::codecForName("utf8") ); | 525 | ts.setCodec( QTextCodec::codecForName("utf8") ); |
526 | answer = ts.read(); | 526 | answer = ts.read(); |
@@ -545,9 +545,9 @@ bool SharpFormat::save( Calendar *calendar) | |||
545 | if ( changeEnt ) { | 545 | if ( changeEnt ) { |
546 | QFile file( fileName ); | 546 | QFile file( fileName ); |
547 | if (!file.open( IO_WriteOnly ) ) { | 547 | if (!file.open( QIODevice::WriteOnly ) ) { |
548 | return false; | 548 | return false; |
549 | 549 | ||
550 | } | 550 | } |
551 | QTextStream ts( &file ); | 551 | Q3TextStream ts( &file ); |
552 | ts.setCodec( QTextCodec::codecForName("utf8") ); | 552 | ts.setCodec( QTextCodec::codecForName("utf8") ); |
553 | ts << changeString ; | 553 | ts << changeString ; |
@@ -563,9 +563,9 @@ bool SharpFormat::save( Calendar *calendar) | |||
563 | if ( deleteEnt ) { | 563 | if ( deleteEnt ) { |
564 | QFile file( fileName ); | 564 | QFile file( fileName ); |
565 | if (!file.open( IO_WriteOnly ) ) { | 565 | if (!file.open( QIODevice::WriteOnly ) ) { |
566 | return false; | 566 | return false; |
567 | 567 | ||
568 | } | 568 | } |
569 | QTextStream ts( &file ); | 569 | Q3TextStream ts( &file ); |
570 | ts.setCodec( QTextCodec::codecForName("utf8") ); | 570 | ts.setCodec( QTextCodec::codecForName("utf8") ); |
571 | ts << deleteString; | 571 | ts << deleteString; |
@@ -581,5 +581,5 @@ bool SharpFormat::save( Calendar *calendar) | |||
581 | status.setText ( i18n("Processing todos ...") ); | 581 | status.setText ( i18n("Processing todos ...") ); |
582 | qApp->processEvents(); | 582 | qApp->processEvents(); |
583 | QPtrList<Todo> tl = calendar->rawTodos(); | 583 | Q3PtrList<Todo> tl = calendar->rawTodos(); |
584 | Todo* to = tl.first(); | 584 | Todo* to = tl.first(); |
585 | i = 0; | 585 | i = 0; |
@@ -606,8 +606,8 @@ bool SharpFormat::save( Calendar *calendar) | |||
606 | QString fileNameIn = "/tmp/kopitempin"; | 606 | QString fileNameIn = "/tmp/kopitempin"; |
607 | QFile fileIn( fileNameIn ); | 607 | QFile fileIn( fileNameIn ); |
608 | if (!fileIn.open( IO_WriteOnly ) ) { | 608 | if (!fileIn.open( QIODevice::WriteOnly ) ) { |
609 | return false; | 609 | return false; |
610 | } | 610 | } |
611 | QTextStream tsIn( &fileIn ); | 611 | Q3TextStream tsIn( &fileIn ); |
612 | tsIn.setCodec( QTextCodec::codecForName("utf8") ); | 612 | tsIn.setCodec( QTextCodec::codecForName("utf8") ); |
613 | tsIn << tPrefix << eString ; | 613 | tsIn << tPrefix << eString ; |
@@ -616,8 +616,8 @@ bool SharpFormat::save( Calendar *calendar) | |||
616 | system ( command.utf8() ); | 616 | system ( command.utf8() ); |
617 | QFile file( fileName ); | 617 | QFile file( fileName ); |
618 | if (!file.open( IO_ReadOnly ) ) { | 618 | if (!file.open( QIODevice::ReadOnly ) ) { |
619 | return false; | 619 | return false; |
620 | } | 620 | } |
621 | QTextStream ts( &file ); | 621 | Q3TextStream ts( &file ); |
622 | ts.setCodec( QTextCodec::codecForName("utf8") ); | 622 | ts.setCodec( QTextCodec::codecForName("utf8") ); |
623 | answer = ts.read(); | 623 | answer = ts.read(); |
@@ -643,9 +643,9 @@ bool SharpFormat::save( Calendar *calendar) | |||
643 | if ( changeEnt ) { | 643 | if ( changeEnt ) { |
644 | QFile file( fileName ); | 644 | QFile file( fileName ); |
645 | if (!file.open( IO_WriteOnly ) ) { | 645 | if (!file.open( QIODevice::WriteOnly ) ) { |
646 | return false; | 646 | return false; |
647 | 647 | ||
648 | } | 648 | } |
649 | QTextStream ts( &file ); | 649 | Q3TextStream ts( &file ); |
650 | ts.setCodec( QTextCodec::codecForName("utf8") ); | 650 | ts.setCodec( QTextCodec::codecForName("utf8") ); |
651 | ts << changeString ; | 651 | ts << changeString ; |
@@ -661,9 +661,9 @@ bool SharpFormat::save( Calendar *calendar) | |||
661 | if ( deleteEnt ) { | 661 | if ( deleteEnt ) { |
662 | QFile file( fileName ); | 662 | QFile file( fileName ); |
663 | if (!file.open( IO_WriteOnly ) ) { | 663 | if (!file.open( QIODevice::WriteOnly ) ) { |
664 | return false; | 664 | return false; |
665 | 665 | ||
666 | } | 666 | } |
667 | QTextStream ts( &file ); | 667 | Q3TextStream ts( &file ); |
668 | ts.setCodec( QTextCodec::codecForName("utf8") ); | 668 | ts.setCodec( QTextCodec::codecForName("utf8") ); |
669 | ts << deleteString; | 669 | ts << deleteString; |
@@ -784,5 +784,5 @@ QString SharpFormat::getEventString( Event* event ) | |||
784 | { | 784 | { |
785 | int count = 1; | 785 | int count = 1; |
786 | QPtrList<Recurrence::rMonthPos> rmp; | 786 | Q3PtrList<Recurrence::rMonthPos> rmp; |
787 | rmp = rec->monthPositions(); | 787 | rmp = rec->monthPositions(); |
788 | if ( rmp.first()->negative ) | 788 | if ( rmp.first()->negative ) |