initial public commit of qt4 portp1

1 files changed, 10 insertions, 10 deletions

diff --git a/kabc/formats/vcardformatplugin2.cpp b/kabc/formats/vcardformatplugin2.cpp
index 41b0c9a..fbebe92 100644
--- a/kabc/formats/vcardformatplugin2.cpp
+++ b/kabc/formats/vcardformatplugin2.cpp
@@ -10,9 +10,9 @@ $Id$
 #include "address.h"
 #include "addressee.h"
 #include "vcardparser/vcardtool.h"
 
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qfile.h>
 
 using namespace KABC;
 
@@ -36,10 +36,10 @@ bool VCardFormatPlugin2::load( Addressee &addressee, QFile *file )
 {
   qDebug("VCardFormatPlugin2::load");
   QString data;
 
-  QTextStream t( file );
-  t.setEncoding( QTextStream::UnicodeUTF8 );
+  Q3TextStream t( file );
+  t.setEncoding( Q3TextStream::UnicodeUTF8 );
   data = t.read();
 
   VCardTool tool;
   
@@ -57,10 +57,10 @@ bool VCardFormatPlugin2::loadAll( AddressBook *addressBook, Resource *resource,
 {
   qDebug("VCardFormatPlugin2::loadAll");
   QString data;
 
-  QTextStream t( file );
-  t.setEncoding( QTextStream::UnicodeUTF8 );
+  Q3TextStream t( file );
+  t.setEncoding( Q3TextStream::UnicodeUTF8 );
   data = t.read();
 
   VCardTool tool;
 
@@ -85,10 +85,10 @@ void VCardFormatPlugin2::save( const Addressee &addressee, QFile *file )
 
 
   vcardlist.append( addressee );
 
-  QTextStream t( file );
-  t.setEncoding( QTextStream::UnicodeUTF8 );
+  Q3TextStream t( file );
+  t.setEncoding( Q3TextStream::UnicodeUTF8 );
   t << tool.createVCards( vcardlist );
 }
 
 void VCardFormatPlugin2::saveAll( AddressBook *ab, Resource *resource, QFile *file )
@@ -104,18 +104,18 @@ void VCardFormatPlugin2::saveAll( AddressBook *ab, Resource *resource, QFile *fi
       vcardlist.append( *it );
     }
   }
   
-  QTextStream t( file );
-  t.setEncoding( QTextStream::UnicodeUTF8 );
+  Q3TextStream t( file );
+  t.setEncoding( Q3TextStream::UnicodeUTF8 );
   t << tool.createVCards( vcardlist );
 }
 
 bool VCardFormatPlugin2::checkFormat( QFile *file ) const
 {
   QString line;
 
-  file->readLine( line, 1024 );
+  char tmp[1024]; file->readLine( tmp, 1024 ); line = tmp;
   line = line.stripWhiteSpace();
   if ( line == "BEGIN:VCARD" )
     return true;
   else