1 files changed, 6 insertions, 8 deletions

diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp
index 7281003..ed5807f 100644
--- a/kaddressbook/xxport/csv_xxport.cpp
+++ b/kaddressbook/xxport/csv_xxport.cpp
@@ -21,25 +21,25 @@
     without including the source code for Qt in the source distribution.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <qfile.h>
 #include <qregexp.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qtextcodec.h>
 
 #include <kfiledialog.h>
 #ifndef KAB_EMBEDDED
 #include <kio/netaccess.h>
 #endif //KAB_EMBEDDED
 
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
 #include <kurl.h>
 
@@ -95,45 +95,45 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const QString&
       QString txt = i18n( "<qt>Unable to open file <b>%1</b>.%2.</qt>" );
       KMessageBox::error( parentWidget(), txt.arg( url.url() )
                           .arg( strerror( tmpFile.status() ) ) );
       return false;
     }
 
     doExport( tmpFile.file(), list );
     tmpFile.close();
 
     return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
   } else {
     QFile file( url.path() );
-    if ( !file.open( IO_WriteOnly ) ) {
+    if ( !file.open( QIODevice::WriteOnly ) ) {
       QString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" );
       KMessageBox::error( parentWidget(), txt.arg( url.path() ) );
       return false;
     }
 
     doExport( &file, list );
     file.close();
 
     return true;
   }
 
 #else //KAB_EMBEDDED
 
   QString fileName = KFileDialog::getSaveFileName( "addressbook.csv", i18n("Save file"), parentWidget() );
 
   if ( fileName.isEmpty() )
       return false;
 
   QFile file( fileName );
-  if ( !file.open( IO_WriteOnly ) ) {
+  if ( !file.open( QIODevice::WriteOnly ) ) {
     QString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" );
     KMessageBox::error( parentWidget(), txt.arg( fileName ) );
     return false;
   }
 
   doExport( &file, list );
   file.close();
 
   return true;
 
 
 #endif //KAB_EMBEDDED
@@ -142,25 +142,25 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const QString&
 
 KABC::AddresseeList CSVXXPort::importContacts( const QString& ) const
 {
   CSVImportDialog dlg( addressBook(), parentWidget() );
   if ( dlg.exec() )
     return dlg.contacts();
   else
     return KABC::AddresseeList();
 }
 
 void CSVXXPort::doExport( QFile *fp, const KABC::AddresseeList &list )
 {
-  QTextStream t( fp );
+  Q3TextStream t( fp );
   t.setCodec( QTextCodec::codecForName("utf8") );
 
   KABC::AddresseeList::ConstIterator iter;
   KABC::Field::List fields = addressBook()->fields();
   KABC::Field::List::Iterator fieldIter;
   bool first = true;
 
   // First output the column headings
   for ( fieldIter = fields.begin(); fieldIter != fields.end(); ++fieldIter ) {
     if ( !first )
       t << ",";
 
@@ -178,17 +178,15 @@ void CSVXXPort::doExport( QFile *fp, const KABC::AddresseeList &list )
     for ( fieldIter = fields.begin(); fieldIter != fields.end(); ++fieldIter ) {
       if ( !first )
         t << ",";
 
       t << "\"" << (*fieldIter)->value( addr ) << "\"";
       first = false;
     }
 
     t << "\n";
   }
 }
 
-#ifndef KAB_EMBEDDED
-#include "csv_xxport.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_csv_xxport.cpp"
 #endif //KAB_EMBEDDED
-
-