performance optimization during vCard loading

2 files changed, 12 insertions, 9 deletions

diff --git a/kabc/vcardformatimpl.cpp b/kabc/vcardformatimpl.cpp
index 3fcaf94..bd9a57b 100644
--- a/kabc/vcardformatimpl.cpp
+++ b/kabc/vcardformatimpl.cpp
@@ -53,8 +53,9 @@ bool VCardFormatImpl::load( Addressee &addressee, QFile *file )
   VCardListIterator it( e.cardList() );
 
   if ( it.current() ) {
-    VCard v(*it.current());
-    loadAddressee( addressee, v );
+//US    VCard v(*it.current());
+//US    loadAddressee( addressee, v );
+    loadAddressee( addressee, it.current() );
     return true;
   }
 
@@ -73,9 +74,10 @@ bool VCardFormatImpl::loadAll( AddressBook *addressBook, Resource *resource, QFi
   VCardListIterator it( e.cardList() );
 
   for (; it.current(); ++it) {
-    VCard v(*it.current());
+//US    VCard v(*it.current());
     Addressee addressee;
-    loadAddressee( addressee, v );
+//US    loadAddressee( addressee, v );
+    loadAddressee( addressee, it.current() );
     addressee.setResource( resource );
     addressBook->insertAddressee( addressee );
   }
@@ -122,9 +124,9 @@ void VCardFormatImpl::saveAll( AddressBook *ab, Resource *resource, QFile *file
   file->writeBlock( (const char*)vcardData, vcardData.length() );
 }
 
-bool VCardFormatImpl::loadAddressee( Addressee& addressee, VCard &v )
+bool VCardFormatImpl::loadAddressee( Addressee& addressee, VCard *v )
 {
-  QPtrList<ContentLine> contentLines = v.contentLineList();
+  QPtrList<ContentLine> contentLines = v->contentLineList();
   ContentLine *cl;
 
   for( cl = contentLines.first(); cl; cl = contentLines.next() ) {
@@ -1001,8 +1003,9 @@ bool VCardFormatImpl::readFromString( const QString &vcard, Addressee &addressee
   VCardListIterator it( e.cardList() );
 
   if ( it.current() ) {
-    VCard v(*it.current());
-    loadAddressee( addressee, v );
+//US    VCard v(*it.current());
+//US    loadAddressee( addressee, v );
+    loadAddressee( addressee, it.current() );
     return true;
   }
 
diff --git a/kabc/vcardformatimpl.h b/kabc/vcardformatimpl.h
index 2dd68d9..fa3d55f 100644
--- a/kabc/vcardformatimpl.h
+++ b/kabc/vcardformatimpl.h
@@ -58,7 +58,7 @@ class VCardFormatImpl
     bool writeToString( const Addressee &addressee, QString &vcard );
 
   protected:
-    bool loadAddressee( Addressee &, VCARD::VCard & );
+    bool loadAddressee( Addressee &, VCARD::VCard * );
     void saveAddressee( const Addressee &, VCARD::VCard *, bool intern );
 
     void addTextValue (VCARD::VCard *, VCARD::EntityType, const QString & );