made addressbook much faster

3 files changed, 63 insertions, 20 deletions

diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp
index 90be928..7a4336b 100644
--- a/kabc/addresseeview.cpp
+++ b/kabc/addresseeview.cpp
@@ -86,26 +86,23 @@ void AddresseeView::setSource(const QString& n)
     ExternalAppHandler::instance()->callBySIP(  n.mid(6) );
 
 }
-void AddresseeView::setAddressee( const KABC::Addressee& addr )
+void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
 {
-  ExternalAppHandler* eah = ExternalAppHandler::instance();
-  bool kemailAvail = eah->isEmailAppAvailable();
-
-
-
-  mAddressee = addr;
+  bool kemailAvail = ExternalAppHandler::instance()->isEmailAppAvailable();
+  // mAddressee = addr;
   // clear view
-  setText( QString::null );
-
-  if ( mAddressee.isEmpty() )
-    return;
+  //setText( QString::null );
 
+  if ( mAddressee.isEmpty() ) {
+      setText( QString::null);
+      return;
+  }
   QString name = ( mAddressee.assembledName().isEmpty() ?
                    mAddressee.formattedName() : mAddressee.assembledName() );
 
   QString dynamicPart;
 
-  dynamicPart += getPhoneNumbers( true );
+  dynamicPart += getPhoneNumbers( mAddressee.phoneNumbers(),true );
   QStringList emails = mAddressee.emails();
   QStringList::ConstIterator emailIt;
   QString type = i18n( "Email" );
@@ -136,7 +133,7 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr )
           .arg( i18n ("Birthday") )
           .arg( KGlobal::locale()->formatDate( mAddressee.birthday().date()  ,true) );
   }
-  dynamicPart += getPhoneNumbers( false );
+  dynamicPart += getPhoneNumbers( mAddressee.phoneNumbers(), false );
 
   for ( ; emailIt != emails.end(); ++emailIt ) {
     if ( kemailAvail ) {
@@ -308,7 +305,7 @@ mText = "<table width=\"100%\">\n";
 
 }
 
-QString AddresseeView::getPhoneNumbers( bool preferred )
+QString AddresseeView::getPhoneNumbers(  KABC::PhoneNumber::List phones ,bool preferred )
 {  
   ExternalAppHandler* eah = ExternalAppHandler::instance();
   bool kphoneAvail = eah->isPhoneAppAvailable();
@@ -317,7 +314,6 @@ QString AddresseeView::getPhoneNumbers( bool preferred )
   bool kpagerAvail = eah->isPagerAppAvailable();
   bool ksipAvail = eah->isSIPAppAvailable();
   QString dynamicPart;
-  KABC::PhoneNumber::List phones = mAddressee.phoneNumbers();
   KABC::PhoneNumber::List::ConstIterator phoneIt;
   QString extension;
   int phonetype;
@@ -377,10 +373,12 @@ QString AddresseeView::getPhoneNumbers( bool preferred )
   }
   return dynamicPart;
 }
+/*
 KABC::Addressee AddresseeView::addressee() const
 {
   return mAddressee;
 }
+*/
 void AddresseeView::addTag(const QString & tag,const QString & text)
 {
     if ( text.isEmpty() )
diff --git a/kabc/addresseeview.h b/kabc/addresseeview.h
index d8a13ee..3800512 100644
--- a/kabc/addresseeview.h
+++ b/kabc/addresseeview.h
@@ -46,15 +46,15 @@ class AddresseeView : public QTextBrowser
     /**
       Returns the current addressee object.
      */
-    KABC::Addressee addressee() const;
+    //KABC::Addressee addressee() const;
 
   private:
-    KABC::Addressee mAddressee;
+    //KABC::Addressee mAddressee;
     QString mText;
-    QString getPhoneNumbers( bool preferred );
+    QString getPhoneNumbers( KABC::PhoneNumber::List phones, bool preferred );
     void addTag(const QString & tag,const QString & text);
-    class AddresseeViewPrivate;
-    AddresseeViewPrivate *d;
+    //class AddresseeViewPrivate;
+    //AddresseeViewPrivate *d;
 };
 class AddresseeChooser : public KDialogBase
 {
diff --git a/kabc/vcard/VCardEntity.cpp b/kabc/vcard/VCardEntity.cpp
index 5fca3bc..b676cc7 100644
--- a/kabc/vcard/VCardEntity.cpp
+++ b/kabc/vcard/VCardEntity.cpp
@@ -73,9 +73,15 @@ VCardEntity::~VCardEntity()
 {
 }
 
+#include <qdatetime.h>;
 	void
 VCardEntity::_parse()
 {
+#if 0
+    QTime tim;
+    tim.start();
+    int num  = 0;
+    // old code 
 	vDebug("parse");
 	QCString s(strRep_);
 
@@ -95,6 +101,45 @@ VCardEntity::_parse()
 
 		s.remove(0, i);
 	}
+
+#else
+    // this code is up to 17 (!)  times faster
+    int start = 0;
+    QTime tim;
+    tim.start();
+    int i = 11;
+    int len = strRep_.length();
+    int num  = 0;
+	while (i < len ) {
+        while( i < len ) {
+            int add = 1;
+            if ( strRep_.at(i) == 'B' ) {
+                if ( i+add < len && strRep_.at(i+add++) == 'E')
+                if ( i+add < len && strRep_.at(i+add++) == 'G')
+                if ( i+add < len && strRep_.at(i+add++) == 'I')
+                if ( i+add < len && strRep_.at(i+add++) == 'N')
+                if ( i+add < len && strRep_.at(i+add++) == ':')
+                if ( i+add < len && strRep_.at(i+add++) == 'V')
+                if ( i+add < len && strRep_.at(i+add++) == 'C')
+                if ( i+add < len && strRep_.at(i+add++) == 'A')
+                if ( i+add < len && strRep_.at(i+add++) == 'R')
+                if ( i+add < len && strRep_.at(i+add++) == 'D')
+                    break;
+            }
+            ++i;
+        }
+        if ( i <= len ) {
+            ++num;
+            char* dat = strRep_.data()+start;
+            VCard * v = new VCard( QCString (  dat,i-start ) );
+            start = i;
+            cardList_.append(v);
+            v->parse();
+        }
+        i+= 11;
+	}
+#endif
+    //qDebug("***time %d found %d", tim.elapsed(), num);
 }
 
 	void