initial public commit of qt4 portp1

1 files changed, 16 insertions, 16 deletions

diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp
index 6f3a799..3829bc1 100644
--- a/libkcal/icalformat.cpp
+++ b/libkcal/icalformat.cpp
@@ -22,3 +22,3 @@
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qregexp.h>
@@ -26,3 +26,3 @@
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qtextcodec.h>
@@ -72,3 +72,3 @@ bool ICalFormat::load( Calendar *calendar, const QString &fileName)
   QFile file( fileName );  
-  if (!file.open( IO_ReadOnly ) ) {
+  if (!file.open( QIODevice::ReadOnly ) ) {
     setException(new ErrorFormat(ErrorFormat::LoadError));
@@ -76,6 +76,6 @@ bool ICalFormat::load( Calendar *calendar, const QString &fileName)
   } 
-  QTextStream ts( &file );
+  Q3TextStream ts( &file );
   QString text; 
 
-  ts.setEncoding( QTextStream::Latin1 );
+  ts.setEncoding( Q3TextStream::Latin1 );
   text = ts.read(); 
@@ -100,3 +100,3 @@ bool ICalFormat::save( Calendar *calendar, const QString &fileName )
   QFile file( fileName );
-  if (!file.open( IO_WriteOnly ) ) {
+  if (!file.open( QIODevice::WriteOnly ) ) {
     setException(new ErrorFormat(ErrorFormat::SaveError,
@@ -105,5 +105,5 @@ bool ICalFormat::save( Calendar *calendar, const QString &fileName )
   }
-  QTextStream ts( &file );
+  Q3TextStream ts( &file );
 
-  ts.setEncoding( QTextStream::Latin1 );
+  ts.setEncoding( Q3TextStream::Latin1 );
   ts << text;
@@ -158,3 +158,3 @@ Incidence *ICalFormat::fromString( const QString &text )
   Incidence *ical = 0;
-  QPtrList<Event> elist = cal.events();
+  Q3PtrList<Event> elist = cal.events();
   if ( elist.count() > 0 ) {
@@ -162,3 +162,3 @@ Incidence *ICalFormat::fromString( const QString &text )
   } else {
-    QPtrList<Todo> tlist = cal.todos();
+    Q3PtrList<Todo> tlist = cal.todos();
     if ( tlist.count() > 0 ) {
@@ -166,3 +166,3 @@ Incidence *ICalFormat::fromString( const QString &text )
     } else {
-      QPtrList<Journal> jlist = cal.journals();
+      Q3PtrList<Journal> jlist = cal.journals();
       if ( jlist.count() > 0 ) {
@@ -174,3 +174,3 @@ Incidence *ICalFormat::fromString( const QString &text )
 }
-#include <qapp.h>
+#include <qapplication.h>
 
@@ -186,4 +186,4 @@ QString ICalFormat::toString( Calendar *cal )
   // todos 
-  QPtrList<Todo> todoList = cal->rawTodos();
-  QPtrListIterator<Todo> qlt(todoList);
+  Q3PtrList<Todo> todoList = cal->rawTodos();
+  Q3PtrListIterator<Todo> qlt(todoList);
   for (; qlt.current(); ++qlt) {
@@ -198,3 +198,3 @@ QString ICalFormat::toString( Calendar *cal )
   // events
-  QPtrList<Event> events = cal->rawEvents();
+  Q3PtrList<Event> events = cal->rawEvents();
   Event *ev;
@@ -209,3 +209,3 @@ QString ICalFormat::toString( Calendar *cal )
   // journals
-  QPtrList<Journal> journals = cal->journals();
+  Q3PtrList<Journal> journals = cal->journals();
   Journal *j;