1 files changed, 11 insertions, 9 deletions

diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index 9a8fa68..64b9071 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -1,272 +1,274 @@
 /*
   This file is part of KAddressbook.
   Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
   As a special exception, permission is given to link this program
   with any edition of Qt, and distribute the resulting executable,
   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 <qtextstream.h>
+#include <q3textstream.h>
 #include <qfileinfo.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include <kabc/vcardconverter.h>
 #include <kabc/vcardparser/vcardtool.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>
 
 #include "xxportmanager.h"
 
 #include "vcard_xxport.h"
 
 #ifndef KAB_EMBEDDED
 
 class VCardXXPortFactory : public XXPortFactory
 {
 public:
     XXPortObject *xxportObject( KABC::AddressBook *ab, QWidget *parent, const char *name )
     {
         return new VCardXXPort( ab, parent, name );
     }
 };
 #endif //KAB_EMBEDDED
 
 
 extern "C"
 {
 #ifndef KAB_EMBEDDED
     void *init_libkaddrbk_vcard_xxport()
 #else //KAB_EMBEDDED
         void *init_microkaddrbk_vcard_xxport()
 #endif //KAB_EMBEDDED
     {
         return ( new VCardXXPortFactory() );
     }
 }
 
 
 VCardXXPort::VCardXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name )
     : XXPortObject( ab, parent, name )
 {
     createImportAction( i18n( "Import vCard..." ) );
     //US KABC::VCardConverter does not support the export of 2.1 addressbooks.
     //US createExportAction( i18n( "Export vCard 2.1..." ), "v21" );
     createExportAction( i18n( "Export vCard 3.0..." ), "v30" );
 }
 
 bool VCardXXPort::exportContacts( const KABC::AddresseeList &list, const QString &data )
 {
     QString name;
 
     if ( list.count() == 1 )
         name = list[ 0 ].givenName() + "_" + list[ 0 ].familyName() + ".vcf";
     else
         name = "addressbook.vcf";
 
 #ifndef KAB_EMBEDDED
     QString fileName = KFileDialog::getSaveFileName( name );
 #else //KAB_EMBEDDED
     QString fileName = KFileDialog::getSaveFileName( name, i18n("Save file"), parentWidget() );
 #endif //KAB_EMBEDDED
 
     if ( fileName.isEmpty() )
         return false;
 
     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( parentWidget(), text.arg( fileName ) );
         return false;
     }
 
-    QTextStream t( &outFile );
-    t.setEncoding( QTextStream::UnicodeUTF8 );
+    Q3TextStream t( &outFile );
+    t.setEncoding( Q3TextStream::UnicodeUTF8 );
 
     KABC::Addressee::List::ConstIterator it;
     for ( it = list.begin(); it != list.end(); ++it ) {
         KABC::VCardConverter converter;
         QString vcard;
 
         KABC::VCardConverter::Version version;
         if ( data == "v21" )
             version = KABC::VCardConverter::v2_1;
         else
             version = KABC::VCardConverter::v3_0;
 
         converter.addresseeToVCard( *it, vcard, version );
         t << vcard << "\r\n\r\n";
     }
 
     outFile.close();
 
     return true;
 }
 
 KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
 {
     QString fileName;
     KABC::AddresseeList addrList;
     KURL url;
 
 #ifndef KAB_EMBEDDED
     if ( !XXPortManager::importData.isEmpty() )
         addrList = parseVCard( XXPortManager::importData );
     else {
         if ( XXPortManager::importURL.isEmpty() )
             {
                 url = KFileDialog::getLoadFileName( QString::null, i18n("Select vCard to Import"), parentWidget() );
             }
         else
             url = XXPortManager::importURL;
         if ( url.isEmpty() )
             return addrList;
         QString caption( i18n( "vCard Import Failed" ) );
         if ( KIO::NetAccess::download( url, fileName ) ) {
             QFile file( fileName );
 
-            file.open( IO_ReadOnly );
+            file.open( QIODevice::ReadOnly );
             QByteArray rawData = file.readAll();
             file.close();
 
             QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 );
             addrList = parseVCard( data );
 
             if ( !url.isLocalFile() )
                 KIO::NetAccess::removeTempFile( fileName );
 
         } else {
             QString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" );
             KMessageBox::error( parentWidget(), text.arg( url.url() ), caption );
         }
 
     }
 
 
 #else //KAB_EMBEDDED
 
 
     if ( !XXPortManager::importData.isEmpty() )
         addrList = parseVCard( XXPortManager::importData );
     else {
         if ( XXPortManager::importURL.isEmpty() )
             {
                 fileName = KFileDialog::getOpenFileName( QString::null, i18n("Select vCard to Import"), parentWidget() );
 
                 if ( fileName.isEmpty() )
                     return addrList;
                 QFileInfo fi ( fileName );
                 if ( !fi.isFile() )
                     return addrList;
             }
         else
             {
                 //US      url = XXPortManager::importURL;
                 qDebug("VCardXXPort::importContacts  Urls at the moment not supported");
                 if ( url.isEmpty() )
                     return addrList;
 
             }
         QFile file( fileName );
-        if ( file.open( IO_ReadOnly ) ) {
-            QCString rawData ( file.readAll().data(),file.size()+1);
+        if ( file.open( QIODevice::ReadOnly ) ) {
+            Q3CString rawData ( file.readAll().data(),file.size()+1);
             file.close();
             int start = 0;
 #ifndef DESKTOP_VERSION            
             while ( start < rawData.size()-2 ) {
                 if ( rawData.at( start ) == '\r' ) 
                     if ( rawData.at( start+1 ) == '\n' )
                         if ( rawData.at( start+2 ) == ' ' ) {
                             rawData.remove(start,3);
                             --start;
                         }
                 ++start;
             }
 #endif
             int ret = KMessageBox::warningYesNoCancel( 0, i18n("Select import format!\nDefault and standard is Utf8.\nLatin1 may be the right\nfor some West Europian languages."), i18n("Import Format"), i18n("Utf8"), i18n("Latin1") );
             if (  ret == KMessageBox::Cancel )
                 return addrList;
             if ( ret == KMessageBox::Yes )
                 addrList = parseVCard( QString::fromUtf8( rawData.data() ) );
             else
                 addrList = parseVCard( QString::fromLatin1( rawData.data() ) );
         }
 
     }
 #endif //KAB_EMBEDDED
 
     return addrList;
 }
 
 KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const
 {
 
     KABC::VCardTool tool;
     KABC::AddresseeList addrList;
     addrList = tool.parseVCards( data );
     // LR : I switched to the code, which is in current cvs HEAD
     /*
       uint numVCards = data.contains( "BEGIN:VCARD", false );
       QStringList dataList = QStringList::split( "\r\n\r\n", data );
 
       for ( uint i = 0; i < numVCards && i < dataList.count(); ++i ) {
       KABC::Addressee addr;
       bool ok = false;
 
       if ( dataList[ i ].contains( "VERSION:3.0" ) )
       ok = converter.vCardToAddressee( dataList[ i ], addr, KABC::VCardConverter::v3_0 );
       else if ( dataList[ i ].contains( "VERSION:2.1" ) )
       ok = converter.vCardToAddressee( dataList[ i ], addr, KABC::VCardConverter::v2_1 );
       else {
       KMessageBox::sorry( parentWidget(), i18n( "Not supported vCard version." ) );
       continue;
       }
 
       if ( !addr.isEmpty() && ok )
       addrList.append( addr );
       else {
       QString text = i18n( "The selected file does not include a valid vCard. "
       "Please check the file and try again." );
       KMessageBox::sorry( parentWidget(), text );
       }
       }
     */
     if ( addrList.isEmpty()  ) {
         QString text = i18n( "The selected file does not\ninclude a valid vCard.\nPlease check the file and try again.\n" );
         KMessageBox::sorry( parentWidget(), text );
     }
     return addrList;
 }
 
 
-#ifndef KAB_EMBEDDED
-#include "vcard_xxport.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_vcard_xxport.cpp"
 #endif //KAB_EMBEDDED