fixxxx

3 files changed, 59 insertions, 23 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 27d37c4..ea49c2c 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,200 +1,233 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 ********** VERSION 2.1.13 ************
 
 Fixed a problem in KA/Pi search.
 Fixed some minor problems in KO/Pi.
-Added calendar selection possibility to the todo view popup and to the event/todo editor.
-
+Added calendar selection possibility to the todo view popup and to the event/todo/journal editor.
+
+Fixed memory usage problems in KA/Pi:
+When loading data KA/Pi did load the file data twice.
+Example:
+  A 600k file did consume 1200k memory during loading process.
+  This is fixed, it does now consume only  600k during loading process.
+When saving data KA/Pi did consume a lot of memory for the data parsing during the save process.
+This is fixed.
+Example:
+  Before saving a 600k file KA/Pi did consume 21.7 Meg of Ram.
+  When saving  KA/Pi did consume 28.6 Meg of Ram. That causes a crash on the Zaurus because there was no memeory left in the system.
+  Now  KA/Pi is consuming on saving the same data 22.0 Meg of Ram during the save process. 
+Note: The memory usage of KA/Pi after the data is loaded/saved has not changed.
+
+Fixed memory usage problems in KO/Pi:
+When KO/Pi did save the data to file, it did not release the used buffers after saving.
+The used buffer was released after saving the next time, but there was new buffer space allocated again on that save operation.
+This is fixed.
+Example:
+  When saving a 400k file KO/Pi do now use 400k less memory now.
+
+Optimized memory usage in KO/Pi Agenda view:
+KO/Pi is storing some paint information in extra buffers for faster repainting of the agenda view.
+These buffers were not made smaller (i.e. downsized)  because of performance reasons.
+The handling of these buffers are now much smarter:
+Two (of six) buffers are removed completely.
+The remaing four buffers are now downsized after not using the agenda view for 45 seconds.
+Such that the memory usage of KO/Pi is smaller now in general ( because 2 buffers are removed) and is much smaller when not using the agenda view. That is very important when using fastload for KO/Pi.
+
+Worst case example ( for a maximum size agenda content):
+  When resizing the agenda content to a large scale, KO/Pi did use 17Meg of mem ( and did not use less memory until it was stopped). Now KO/Pi is using on the same operation only 14.3 Meg of mem and after 45 seconds not using the agenda view it uses only 9.4 Meg of mem.
+
+Summary:
+Many memory wasting problems of KA/Pi and KO/Pi fixed such that it is better to use on the Zaurus.
 
 ********** VERSION 2.1.12 ************
 
 KO/Pi:
 Many small usability fixes, e.g. rearranged the popup menus such that they are better to use on the Zaurus.
 Fixed a problem with the month view when file was saved but KO/Pi was not the active window.
 Fixed some problems in the resource config dialog (e.g. added a warning if you set all calendars to read-only).
 Fixed some other small problems.
 
 ********** VERSION 2.1.11 ************
 
 KO/Pi:
 Because we can have many calendars now in KO/Pi we can have more than one journal entry per day.
 Added features to handle (and add ) more than one journal entry per day.
 Added option for a journal title.
 
 Added info about the calendar, the item belongs to, to the event/todo/journal viewer. 
 Fixed a problem of the alarm of completed recurring todos.
 Added to the event/todo editor to set quickly the category of an item.
 
 
 Fixed some problems when calling KO/Pi or KA/Pi from the alarm applet.
 
 Added KA/Pi multi sync to the multi sync called from the alarm applet.
  
 ********** VERSION 2.1.10 ************
 
 KO/Pi:
 Importing Birthdays will now create another file resource "Birthdays" and import the birthday data from KA/Pi into that file.
 When a multidayevent is selected in monthview all occurences of this event in the monthview are now hightlighted.
 Fixed a bug in searching for a small timerange, i.e. one day.
 
 KA/Pi:
 Fixed two problems in csv export.
 Fixed problems when calling the contact selection dialog from KO/Pi or OM/Pi.
 
 ********** VERSION 2.1.9 ************
 
 KO/Pi:
 Fixed some problems of the new search options in the search dialog.
 Fixed some problems in the new resource config options.
 Changed the recurrence edit of events and todos such that the recurrence edit page now is notified about a change of the start date on the first page.
 Fixed a problem creating new events in the agenda view if at the day/time is already an agenda item shown:
 Now you can click on the bottom/top of an allday agenda item or on the left/right side of an agenda item to get the "new todo/new event" popup.
 
 Fixed a problem in recurrence range in syncing with DTM.
 
 KA/Pi:
 Made it posiible to show in the contact overview the details of all data available for that contact( e.g. office, spouse, children, nickname ...)
 
 PwM/Pi:
 Added "sec" to the timeout config settings to make it clear the timeout values are seconds.
 
 ********** VERSION 2.1.8 ************
 
 KO/Pi:
 Added info about the completion state of a todo in the ListView/Searchdialog.
 If in TodoView is selected "do not show compledted todos" then completed todos are not shown in the ListView as well.
 Fixed some updating problems when changing the filter.
 
 KA/Pi:
 In the addressee selection dialog now the formatted name is shown, if not empty.
 Added a column "category" to the addressee selection dialog to make it possible to sort addressees after category.
 Now in the addressee selection dialog a selected contact is remove with a single click from the selected list.
 
 Fixed in the file selector on the Zaurus the problem that symbolic links to files/dirs were ignored.
 Fixed the sorting for size in the file selector on the Z.
 
 Changed the color selection dialog on the Zaurus to a more user friendly version.
 
 ********** VERSION 2.1.7 ************
 
 KO/Pi:
 Fixed several problems in the new Resource handling.
 Added more options to the search dialog. 
 Fixed a problem in the Month view.  
 Added more options to the dialog when setting a todo to stopped.     
 
 Fixed two small problems in KO/Pi Alarm applet.
 
 ********** VERSION 2.1.6 ************
 
 This release is for testing only.
 
 KO/Pi:
 Added to the list view (the list view is used in search dialog as well) the possibility to print it.
 Added to the list view the possibility to hide entries, if you do not want to print all entries of the list view.
 Added to the list view the possibility to add all subtodos of selected todos to an export/beam.
 Added to the search dialog the possibility to make an additive search such that you can get a better list for export/printout.
 Added to the search dialog the possibility to hide the checkboxes such that there is more space for the list view on the Zaurus.
 Fixed a problem in the AlarmTimer Applet: Now utf8 messages are displayed properly.
 
 Added support for multiple calendar files in KO/Pi. Only local ical (*.ics) files are supported as calendars.
 In the sync profile config it is still missing to specify a particular calendar to sync with this profile. That setting will be added later.
 Now on every sync the set of calendars is synced which are enabled in the resource view. 
 
 A calendar is enabled in the resource view if the "eye" column is checked. 
 You can set a calendar to be the default for new items( "+" column ).
 You can tell KO/Pi to ignore all alarm of a calendar ( "bell" column ) and you can set it readonly.
 To find out how to add a new calendar and how to remove a calendar is left as an exercise to the reader ...
 
 
 ********** VERSION 2.1.5 ************
 
 This is the new stable version.
 Bugfix:
 Fixed a problem with agenda popup on the desktop in KO/Pi.
 Fixed a crash when reloading file, e.g. after a passive pi-sync synchronization.
 Added config option to not display completed todos in agenda view.
 Addressee view is now using the formatted name, if defined.
 That makes it possible to display "lastname, firstname" in that view now.
 To set the formatted name for all contacts, please use menu:
 Edit->Change->Set formatted name.
 Fixed the bug in KA/Pi that is was not possible to add images to a contact on Windows.
 
 ********** VERSION 2.1.4 ************
 
 Fixed two more bugs in the KA/Pi CSV import dialog:
 Made it possible to read multi-line fields and import it to the "Note" field.
 Fixed a problem in mapping custom fields, whatever a custem field is...
 
 ********** VERSION 2.1.3 ************
 
 Changed the menu structure of the alarm applet:
 Moved "Simulate" to " Play Beeps" submenu and re-added "Todo List".
 
 Fixed several problems in the KA/Pi CSV import dialog:
 Added "Category", made codec configureable and made it possible to map many fields to the "Note" field.
 
 
 ********** VERSION 2.1.2 ************
 
 Fixed a problem closing the alarm dialog on Zaurus with "OK" button.
 
 Fixed a problem when importing data from Outlook with mutiple categories set.
 
 Changed display of days in datenavigator:
 Birthdays are now blue, not dark green.
 When todo view is shown, no birtdays are shown and days with due todos are shown blue.
 When journal view is shown, only holidays are shown and days with journals are blue. 
 
 Added Backup options to global config:
 You can create now x-daily backups for KO/Pi, KA/Pi (for file resources only, file resource is the standard type) and PwM/Pi ( all files you will open ). 
 It is recommended to use another HDD/Memory card for the backup directory. If (very useful on the Zaurus) the specified backup directory does not exist you are asked if you want to try again to create a backup. That makes it possible to insert your memory card in the Zaurus and then trying again.
 The backup is created when the application wants to save for the first time on a backup-day. You can specify the amount of backups and the day interval of backups.
 
 ********** VERSION 2.1.1 ************
 
 Stable release 2.1.1!
 
 KO/Pi:
 Fixed one problem in the layout of the edit dialogs on the Zaurus with 640x480 display.
 
 ********** VERSION 2.1.0 ************
 
 Stable release 2.1.0!
 
 Summary of changes/fixes compared to version 2.0.6:
 
 Many bugs of version 2.0.6 fixed.
 Most of them were small bugs, but some of them were important.
 It is recommended to use version 2.1.0 and not version 2.0.6.
 
 Important changes:
 
 Added recurring todos to KO/Pi.
 
 Added global application font settings (for all KDE-Pim/Pi apps) to the general settings.
 
 Made Passwordmanager PwM/Pi more userfriendly: Rearranged some toolbar icons, optimized setting of focus, fixed layout problems and more.
 
 Datenavigator can now display many months. Very useful on the desktop.
 
 KO/Pi alarm applet changed: Made buttons in alarm dialog much bigger and other usebility enhancements.
 
 Made alarm sound working on Linux desktop.
 
 Made KO/Pi and KA/Pi running from a memory stick. Please read storage HowTo for details.
 
 Added timetracking feature in KO/Pi todo view. Please read timetraker HowTo for details.
 
 Many other usebility enhancements.
 Special thanks to Ben for his suggestions!
 
 You can find the complete changelog 
 from version 1.7.7 to  2.1.0 
 in the source package or on 
 
 http://www.pi-sync.net/html/changelog.html
 
 
 
diff --git a/kabc/vcardformatimpl.cpp b/kabc/vcardformatimpl.cpp
index b9fe6ff..ec5ed80 100644
--- a/kabc/vcardformatimpl.cpp
+++ b/kabc/vcardformatimpl.cpp
@@ -1,519 +1,511 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library 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
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <qfile.h>
 #include <qregexp.h>
+#include <qapplication.h>
 
 #include <kdebug.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
 #include <ktempfile.h>
 
 #include <VCard.h>
 
 #include "addressbook.h"
 #include "vcardformatimpl.h"
 
 using namespace KABC;
 using namespace VCARD;
 
 int VCardFormatImpl::debug = -1;
 
 VCardFormatImpl::VCardFormatImpl()
 {
   debug = (getenv("KABC_DEBUG") != 0);
 }
 
 bool VCardFormatImpl::load( Addressee &addressee, QFile *file )
 {
   kdDebug(5700) << "VCardFormat::load()" << endl;
 
   QByteArray fdata = file->readAll();
   QCString data(fdata.data(), fdata.size()+1);
 
   VCardEntity e( data );
 
   VCardListIterator it( e.cardList() );
 
   if ( it.current() ) {
 //US    VCard v(*it.current());
 //US    loadAddressee( addressee, v );
     loadAddressee( addressee, it.current() );
     return true;
   }
 
   return false;
 }
 
+
+#include <kmessagebox.h>
 bool VCardFormatImpl::loadAll( AddressBook *addressBook, Resource *resource, QFile *file )
 {
-  kdDebug(5700) << "VCardFormat::loadAll()" << endl;
-
-  QByteArray fdata = file->readAll();
-  QCString data(fdata.data(), fdata.size()+1);
-
+  
+    QCString data(file->readAll().data(), file->size()+1); 
   VCardEntity e( data );
 
   VCardListIterator it( e.cardList() );
 
   for (; it.current(); ++it) {
 //US    VCard v(*it.current());
     Addressee addressee;
 //US    loadAddressee( addressee, v );
     loadAddressee( addressee, it.current() );
     addressee.setResource( resource );
     addressBook->insertAddressee( addressee );
     if (debug == true)
       {
         printf("address %s loaded successfully\n", addressee.formattedName().latin1());
       } 
   }
-
   return true;
 }
 
 void VCardFormatImpl::save( const Addressee &addressee, QFile *file )
 {
   VCardEntity vcards;
   VCardList vcardlist;
   vcardlist.setAutoDelete( true );
 
   VCard *v = new VCard;
 
   saveAddressee( addressee, v, false );
 
   vcardlist.append( v );
   vcards.setCardList( vcardlist );
 
   QCString vcardData = vcards.asString();
   file->writeBlock( (const char*)vcardData, vcardData.length() );
 }
 
 void VCardFormatImpl::saveAll( AddressBook *ab, Resource *resource, QFile *file )
 {
-  VCardEntity vcards;
-  VCardList vcardlist;
-  vcardlist.setAutoDelete( true );
 
-  AddressBook::Iterator it;
+ AddressBook::Iterator it;
   for ( it = ab->begin(); it != ab->end(); ++it ) {
     if ( (*it).resource() == resource ) {
-      VCard *v = new VCard;
-      saveAddressee( (*it), v, true );
+        save((*it),file);
+        qApp->processEvents();
       (*it).setChanged( false );
-      vcardlist.append( v );
     }
   }
-
-  vcards.setCardList( vcardlist );
-
-  QCString vcardData = vcards.asString();
-  file->writeBlock( (const char*)vcardData, vcardData.length() );
+  // for memory usage status test only
+  // KMessageBox::information ( 0, "Stoppppp", QString("Stop ") );
 }
 
 bool VCardFormatImpl::loadAddressee( Addressee& addressee, VCard *v )
 {
   QPtrList<ContentLine> contentLines = v->contentLineList();
   ContentLine *cl;
 
   for( cl = contentLines.first(); cl; cl = contentLines.next() ) {
     QCString n = cl->name();
     if ( n.left( 2 ) == "X-" ) {
       n = n.mid( 2 );
       int posDash = n.find( "-" );
       addressee.insertCustom( QString::fromUtf8( n.left( posDash ) ),
                         QString::fromUtf8( n.mid( posDash + 1 ) ),
                         QString::fromUtf8( cl->value()->asString() ) );
         continue;
     }
 
     EntityType type = cl->entityType();
     switch( type ) {
 
       case EntityUID:
         addressee.setUid( readTextValue( cl ) );
         break;
 
       case EntityEmail:
         addressee.insertEmail( readTextValue( cl ) );
         break;
 
       case EntityName:
         addressee.setName( readTextValue( cl ) );
         break;
 
       case EntityFullName:
         addressee.setFormattedName( readTextValue( cl ) );
         break;
 
       case EntityURL:
         addressee.setUrl( KURL( readTextValue( cl ) ) );
         break;
 
       case EntityNickname:
         addressee.setNickName( readTextValue( cl ) );
         break;
 
       case EntityLabel:
         // not yet supported by kabc
         break;
 
       case EntityMailer:
         addressee.setMailer( readTextValue( cl ) );
         break;
 
       case EntityTitle:
         addressee.setTitle( readTextValue( cl ) );
         break;
 
       case EntityRole:
         addressee.setRole( readTextValue( cl ) );
         break;
 
       case EntityOrganisation:
         addressee.setOrganization( readTextValue( cl ) );
         break;
 
       case EntityNote:
         addressee.setNote( readTextValue( cl ) );
         break;
 
       case EntityProductID:
         addressee.setProductId( readTextValue( cl ) );
         break;
 
       case EntitySortString:
         addressee.setSortString( readTextValue( cl ) );
         break;
 
       case EntityN:
         readNValue( cl, addressee );
         break;
 
       case EntityAddress:
         addressee.insertAddress( readAddressValue( cl ) );
         break;
 
       case EntityTelephone:
         addressee.insertPhoneNumber( readTelephoneValue( cl ) );
         break;
 
       case EntityCategories:
         addressee.setCategories( QStringList::split( ",", readTextValue( cl ) ) );
         break;
 
       case EntityBirthday:
         addressee.setBirthday( readDateValue( cl ) );
         break;
 
       case EntityRevision:
         addressee.setRevision( readDateTimeValue( cl ) );
         break;
 
       case EntityGeo:
         addressee.setGeo( readGeoValue( cl ) );
         break;
 
       case EntityTimeZone:
         addressee.setTimeZone( readUTCValue( cl ) );
         break;
 
       case EntityVersion:
         break;
 
       case EntityClass:
         addressee.setSecrecy( readClassValue( cl ) );
         break;
 
       case EntityKey:
         addressee.insertKey( readKeyValue( cl ) );
         break;
 
       case EntityPhoto:
         addressee.setPhoto( readPictureValue( cl, EntityPhoto, addressee ) );
         break;
 
       case EntityLogo:
         addressee.setLogo( readPictureValue( cl, EntityLogo, addressee ) );
         break;
 
       case EntityAgent:
         addressee.setAgent( readAgentValue( cl ) );
         break;
 
       case EntitySound:
         addressee.setSound( readSoundValue( cl, addressee ) );
         break;
 
       default:
         kdDebug(5700) << "VCardFormat::load(): Unsupported entity: "
                     << int( type ) << ": " << cl->asString() << endl;
         qDebug("VCardFormat::load(): Unsupported entity: %i: %s ", int(type), (const char*)cl->asString());
         break;
     }
   }
 
   for( cl = contentLines.first(); cl; cl = contentLines.next() ) {
     EntityType type = cl->entityType();
     if ( type == EntityLabel ) {
       int type = readAddressParam( cl );
       Address address = addressee.address( type );
       if ( address.isEmpty() )
         address.setType( type );
 
       address.setLabel( QString::fromUtf8( cl->value()->asString() ) );
       addressee.insertAddress( address );
     }
   }
 
   return true;
 }
 
 void VCardFormatImpl::saveAddressee( const Addressee &addressee, VCard *v, bool intern )
 {
 //US   ContentLine cl;
 //US  QString value;
 
   addTextValue( v, EntityName, addressee.name() );
   addTextValue( v, EntityUID, addressee.uid() );
   addTextValue( v, EntityFullName, addressee.formattedName() );
 
   QStringList emails = addressee.emails();
   QStringList::ConstIterator it4;
   for( it4 = emails.begin(); it4 != emails.end(); ++it4 ) {
     addTextValue( v, EntityEmail, *it4 );
   }
 
   QStringList customs = addressee.customs();
   QStringList::ConstIterator it5;
   for( it5 = customs.begin(); it5 != customs.end(); ++it5 ) {
     addCustomValue( v, *it5 );
   }
 
   addTextValue( v, EntityURL, addressee.url().url() );
 
   addNValue( v, addressee );
 
   addTextValue( v, EntityNickname, addressee.nickName() );
   addTextValue( v, EntityMailer, addressee.mailer() );
   addTextValue( v, EntityTitle, addressee.title() );
   addTextValue( v, EntityRole, addressee.role() );
   addTextValue( v, EntityOrganisation, addressee.organization() );
   addTextValue( v, EntityNote, addressee.note() );
   addTextValue( v, EntityProductID, addressee.productId() );
   addTextValue( v, EntitySortString, addressee.sortString() );
 
   Address::List addresses = addressee.addresses();
   Address::List::ConstIterator it3;
   for( it3 = addresses.begin(); it3 != addresses.end(); ++it3 ) {
     addAddressValue( v, *it3 );
     addLabelValue( v, *it3 );
   }
 
   PhoneNumber::List phoneNumbers = addressee.phoneNumbers();
   PhoneNumber::List::ConstIterator it2;
   for( it2 = phoneNumbers.begin(); it2 != phoneNumbers.end(); ++it2 ) {
     addTelephoneValue( v, *it2 );
   }
 
   Key::List keys = addressee.keys();
   Key::List::ConstIterator it6;
   for( it6 = keys.begin(); it6 != keys.end(); ++it6 ) {
     addKeyValue( v, *it6 );
   }
 
   addTextValue( v, EntityCategories, addressee.categories().join(",") );
 
   addDateValue( v, EntityBirthday, addressee.birthday().date() );
   addDateTimeValue( v, EntityRevision, addressee.revision() );
   addGeoValue( v, addressee.geo() );
   addUTCValue( v, addressee.timeZone() );
 
   addClassValue( v, addressee.secrecy() );
 
   addPictureValue( v, EntityPhoto, addressee.photo(), addressee, intern );
   addPictureValue( v, EntityLogo, addressee.logo(), addressee, intern );
 
   addAgentValue( v, addressee.agent() );
 
   addSoundValue( v, addressee.sound(), addressee, intern );
 }
 
 void VCardFormatImpl::addCustomValue( VCard *v, const QString &txt )
 {
   if ( txt.isEmpty() ) return;
 
   ContentLine cl;
   cl.setName( "X-" + txt.left( txt.find( ":" ) ).utf8() );
   QString value = txt.mid( txt.find( ":" ) + 1 );
   if ( value.isEmpty() )
     return;
   cl.setValue( new TextValue( value.utf8() ) );
   v->add(cl);
 }
 
 void VCardFormatImpl::addTextValue( VCard *v, EntityType type, const QString &txt )
 {
   if ( txt.isEmpty() ) return;
 
   ContentLine cl;
   cl.setName( EntityTypeToParamName( type ) );
   cl.setValue( new TextValue( txt.utf8() ) );
   v->add(cl);
 }
 
 void VCardFormatImpl::addDateValue( VCard *vcard, EntityType type,
                                     const QDate &date )
 {
   if ( !date.isValid() ) return;
 
   ContentLine cl;
   cl.setName( EntityTypeToParamName( type ) );
 
   DateValue *v = new DateValue( date );
   cl.setValue( v );
   vcard->add(cl);
 }
 
 void VCardFormatImpl::addDateTimeValue( VCard *vcard, EntityType type,
                                     const QDateTime &dateTime )
 {
   if ( !dateTime.isValid() ) return;
 
   ContentLine cl;
   cl.setName( EntityTypeToParamName( type ) );
 
   DateValue *v = new DateValue( dateTime );
   cl.setValue( v );
   vcard->add(cl);
 }
 
 void VCardFormatImpl::addAddressValue( VCard *vcard, const Address &a )
 {
   if ( a.isEmpty() )
     return;
 
   ContentLine cl;
   cl.setName( EntityTypeToParamName( EntityAddress ) );
 
   AdrValue *v = new AdrValue;
   v->setPOBox( a.postOfficeBox().utf8() );
   v->setExtAddress( a.extended().utf8() );
   v->setStreet( a.street().utf8() );
   v->setLocality( a.locality().utf8() );
   v->setRegion( a.region().utf8() );
   v->setPostCode( a.postalCode().utf8() );
   v->setCountryName( a.country().utf8() );
   cl.setValue( v );
 
   addAddressParam( &cl, a.type() );
 
   vcard->add( cl );
 }
 
 void VCardFormatImpl::addLabelValue( VCard *vcard, const Address &a )
 {
   if ( a.label().isEmpty() ) return;
 
   ContentLine cl;
   cl.setName( EntityTypeToParamName( EntityLabel ) );
   cl.setValue( new TextValue( a.label().utf8() ) );
 
   addAddressParam( &cl, a.type() );
 
   vcard->add( cl );
 }
 
 void VCardFormatImpl::addAddressParam( ContentLine *cl, int type )
 {
   ParamList params;
   if ( type & Address::Dom ) params.append( new Param( "TYPE", "dom" ) );
   if ( type & Address::Intl ) params.append( new Param( "TYPE", "intl" ) );
   if ( type & Address::Parcel ) params.append( new Param( "TYPE", "parcel" ) );
   if ( type & Address::Postal ) params.append( new Param( "TYPE", "postal" ) );
   if ( type & Address::Work ) params.append( new Param( "TYPE", "work" ) );
   if ( type & Address::Home ) params.append( new Param( "TYPE", "home" ) );
   if ( type & Address::Pref ) params.append( new Param( "TYPE", "pref" ) );
   cl->setParamList( params );
 }
 
 void VCardFormatImpl::addGeoValue( VCard *vcard, const Geo &geo )
 {
   if ( !geo.isValid() ) return;
 
   ContentLine cl;
   cl.setName( EntityTypeToParamName( EntityGeo ) );
 
   GeoValue *v = new GeoValue;
   v->setLatitude( geo.latitude() );
   v->setLongitude( geo.longitude() );
 
   cl.setValue( v );
   vcard->add(cl);
 }
 
 void VCardFormatImpl::addUTCValue( VCard *vcard, const TimeZone &tz )
 {
   if ( !tz.isValid() ) return;
 
   ContentLine cl;
   cl.setName( EntityTypeToParamName( EntityTimeZone ) );
 
   UTCValue *v = new UTCValue;
 
   v->setPositive( tz.offset() >= 0 );
   v->setHour( (tz.offset() / 60) * ( tz.offset() >= 0 ? 1 : -1 ) );
   v->setMinute( (tz.offset() % 60) * ( tz.offset() >= 0 ? 1 : -1 ) );
 
   cl.setValue( v );
   vcard->add(cl);
 }
 
 void VCardFormatImpl::addClassValue( VCard *vcard, const Secrecy &secrecy )
 {
   ContentLine cl;
   cl.setName( EntityTypeToParamName( EntityClass ) );
 
   ClassValue *v = new ClassValue;
   switch ( secrecy.type() ) {
     case Secrecy::Public:
       v->setType( (int)ClassValue::Public );
       break;
     case Secrecy::Private:
       v->setType( (int)ClassValue::Private );
       break;
     case Secrecy::Confidential:
       v->setType( (int)ClassValue::Confidential );
       break;
   }
 
   cl.setValue( v );
   vcard->add(cl);
 }
 
 
 Address VCardFormatImpl::readAddressValue( ContentLine *cl )
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index c56be8b..91df96d 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -1,255 +1,266 @@
 /*
   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 <qfileinfo.h>
 
 #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 ) ) {
         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 );
 
     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 );
             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 ) ) {
-            QByteArray rawData = file.readAll();
+            QCString rawData ( file.readAll().data(),file.size()+1);
             file.close();
-            QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 );
-            addrList = parseVCard( data );
+            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
+            addrList = parseVCard( QString::fromUtf8( 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"
 #endif //KAB_EMBEDDED