fixx

1 files changed, 3 insertions, 1 deletions

diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp
index 81148d9..7281003 100644
--- a/kaddressbook/xxport/csv_xxport.cpp
+++ b/kaddressbook/xxport/csv_xxport.cpp
@@ -1,81 +1,82 @@
 /*
     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 <qregexp.h>
 #include <qtextstream.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>
 
 #include "csvimportdialog.h"
 
 #include "csv_xxport.h"
 
 
 #ifndef KAB_EMBEDDED
 
 class CSVXXPortFactory : public XXPortFactory
 {
   public:
     XXPortObject *xxportObject( KABC::AddressBook *ab, QWidget *parent, const char *name )
     {
       return new CSVXXPort( ab, parent, name );
     }
 };
 
 #endif //KAB_EMBEDDED
 
 
 extern "C"
 {
 #ifndef KAB_EMBEDDED
   void *init_libkaddrbk_csv_xxport()
 #else //KAB_EMBEDDED
   void *init_microkaddrbk_csv_xxport()
 #endif //KAB_EMBEDDED
   {
     return ( new CSVXXPortFactory() );
   }
 }
 
 
 CSVXXPort::CSVXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name )
   : XXPortObject( ab, parent, name )
 {
   createImportAction( i18n( "Import CSV List..." ) );
   createExportAction( i18n( "Export CSV List..." ) );
@@ -106,87 +107,88 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const QString&
     if ( !file.open( IO_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 ) ) {
     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
 
 }
 
 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 );
+  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 << ",";
 
     t << "\"" << (*fieldIter)->label() << "\"";
     first = false;
   }
   t << "\n";
 
   // Then all the addressee objects
   KABC::Addressee addr;
   for ( iter = list.begin(); iter != list.end(); ++iter ) {
     addr = *iter;
     first = true;
 
     for ( fieldIter = fields.begin(); fieldIter != fields.end(); ++fieldIter ) {
       if ( !first )
         t << ",";
 
-      t << "\"" << (*fieldIter)->value( addr ).replace( QRegExp("\n"), "\\n" ) << "\"";
+      t << "\"" << (*fieldIter)->value( addr ) << "\"";
       first = false;
     }
 
     t << "\n";
   }
 }
 
 #ifndef KAB_EMBEDDED
 #include "csv_xxport.moc"
 #endif //KAB_EMBEDDED