1 files changed, 15 insertions, 15 deletions

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index fe59fcb..c700897 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -34,14 +34,14 @@ $Id$
 #include <kapplication.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
 
 #include "errorhandler.h"
 */
-#include <qptrlist.h>
-#include <qtextstream.h>
+#include <q3ptrlist.h>
+#include <q3textstream.h>
 #include <qfile.h>
 #include <qregexp.h>
 
 #include <kglobal.h>
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -241,13 +241,13 @@ AddressBook::AddressBook( const QString &config, const QString &family )
 // the default family is "contact"
 void AddressBook::init(const QString &config, const QString &family )
 {
   blockLSEchange = false;
   d = new AddressBookData;
   QString fami = family;
-  if (config != 0) {
+  if (!config.isEmpty()) {
       if ( family == "syncContact" ) {
           qDebug("creating sync config ");
           fami = "contact";
           KConfig* con = new KConfig( locateLocal("config", "syncContactrc") );
           con->setGroup( "General" );
           con->writeEntry( "ResourceKeys", QString("sync") );
@@ -378,19 +378,19 @@ bool AddressBook::save( Ticket *ticket )
 }
 // exports all Addressees, which are syncable
 void  AddressBook::export2File( QString fileName, QString resourceName )
 {
   
   QFile outFile( fileName );
-  if ( !outFile.open( IO_WriteOnly ) ) {
+  if ( !outFile.open( QIODevice::WriteOnly ) ) {
     QString text = i18n( "<qt>Unable to open file <b>%1</b> for export.</qt>" );
     KMessageBox::error( 0, text.arg( fileName ) );
     return ;
   }
-  QTextStream t( &outFile );
-  t.setEncoding( QTextStream::UnicodeUTF8 );
+  Q3TextStream t( &outFile );
+  t.setEncoding( Q3TextStream::UnicodeUTF8 );
   Iterator it;
   KABC::VCardConverter::Version version;
   version = KABC::VCardConverter::v3_0;
   for ( it = begin(); it != end(); ++it ) { 
       if ( (*it).resource()  ) {
           bool include = (*it).resource()->includeInSync();
@@ -465,16 +465,16 @@ bool  AddressBook::export2PhoneFormat( QStringList uids ,QString fileName )
       vcard.replace ( QRegExp(";;") , "" );
       datastream += vcard;
      
   }
   
   QFile outFile(fileName);
-  if ( outFile.open(IO_WriteOnly) ) { 
+  if ( outFile.open(QIODevice::WriteOnly) ) { 
       datastream.replace ( QRegExp("VERSION:3.0") , "VERSION:2.1" );
-      QTextStream t( &outFile );  // use a text stream
-      t.setEncoding( QTextStream::UnicodeUTF8 );
+      Q3TextStream t( &outFile );  // use a text stream
+      t.setEncoding( Q3TextStream::UnicodeUTF8 );
       t <<datastream;
       t <<  "\r\n\r\n";
       outFile.close();
           
   } else {
       qDebug("Error open temp file ");
@@ -487,13 +487,13 @@ int  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool remo
 {
 
     if ( removeOld )
         setUntagged( true, resource );
     KABC::Addressee::List list;
     QFile file( fileName );
-    file.open( IO_ReadOnly );
+    file.open( QIODevice::ReadOnly );
     QByteArray rawData = file.readAll();
     file.close();
     QString data;
     if ( replaceLabel ) { 
         data = QString::fromLatin1( rawData.data(), rawData.size() + 1 ); 
         data.replace ( QRegExp("LABEL") , "ADR" );
@@ -631,13 +631,13 @@ void AddressBook::preparePhoneSync( QString currentSyncDevice, bool isPreSync )
 void AddressBook::findNewExtIds(  QString fileName, QString currentSyncDevice  )
 {
  
     setUntagged();
     KABC::Addressee::List list;
     QFile file( fileName );
-    file.open( IO_ReadOnly );
+    file.open( QIODevice::ReadOnly );
     QByteArray rawData = file.readAll();
     file.close();
     QString data;
 
     data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); 
     KABC::VCardTool tool;
@@ -1215,15 +1215,15 @@ bool AddressBook::addResource( Resource *resource )
   d->mManager->add( resource );
   return true;
 }
 void AddressBook::removeResources()
 {
     //remove all possible resources. This should cleanup the configfile.
-    QPtrList<KABC::Resource> mResources = resources();
+    Q3PtrList<KABC::Resource> mResources = resources();
     
-    QPtrListIterator<KABC::Resource> it(mResources);
+    Q3PtrListIterator<KABC::Resource> it(mResources);
     for ( ; it.current(); ++it ) {
         KABC::Resource *res = it.current();
         removeResource(res);
     }
 }
 
@@ -1237,15 +1237,15 @@ bool AddressBook::removeResource( Resource *resource )
   resource->setAddressBook( 0 );
 
   d->mManager->remove( resource );
   return true;
 }
 
-QPtrList<Resource> AddressBook::resources()
+Q3PtrList<Resource> AddressBook::resources()
 {
-  QPtrList<Resource> list;
+  Q3PtrList<Resource> list;
 
 //  qDebug("AddressBook::resources() 1");
 
   KRES::Manager<Resource>::ActiveIterator it;
   for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it )
     list.append( *it );