author | ulf69 <ulf69> | 2004-08-20 00:36:50 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-08-20 00:36:50 (UTC) |
commit | d39b363278224b969d4c2945d32968c980b5d842 (patch) (unidiff) | |
tree | 418087aff444216ddb08fcd94fa7fdbfa6d46947 | |
parent | f4149cef5f3be19d64c9c53130a62de0ec28ee44 (diff) | |
download | kdepimpi-d39b363278224b969d4c2945d32968c980b5d842.zip kdepimpi-d39b363278224b969d4c2945d32968c980b5d842.tar.gz kdepimpi-d39b363278224b969d4c2945d32968c980b5d842.tar.bz2 |
performance optimization during vCard loading
-rw-r--r-- | kabc/vcardformatimpl.cpp | 51 | ||||
-rw-r--r-- | kabc/vcardformatimpl.h | 4 |
2 files changed, 29 insertions, 26 deletions
diff --git a/kabc/vcardformatimpl.cpp b/kabc/vcardformatimpl.cpp index 3fcaf94..bd9a57b 100644 --- a/kabc/vcardformatimpl.cpp +++ b/kabc/vcardformatimpl.cpp | |||
@@ -50,14 +50,15 @@ bool VCardFormatImpl::load( Addressee &addressee, QFile *file ) | |||
50 | 50 | ||
51 | VCardEntity e( data ); | 51 | VCardEntity e( data ); |
52 | 52 | ||
53 | VCardListIterator it( e.cardList() ); | 53 | VCardListIterator it( e.cardList() ); |
54 | 54 | ||
55 | if ( it.current() ) { | 55 | if ( it.current() ) { |
56 | VCard v(*it.current()); | 56 | //US VCard v(*it.current()); |
57 | loadAddressee( addressee, v ); | 57 | //US loadAddressee( addressee, v ); |
58 | loadAddressee( addressee, it.current() ); | ||
58 | return true; | 59 | return true; |
59 | } | 60 | } |
60 | 61 | ||
61 | return false; | 62 | return false; |
62 | } | 63 | } |
63 | 64 | ||
@@ -70,15 +71,16 @@ bool VCardFormatImpl::loadAll( AddressBook *addressBook, Resource *resource, QFi | |||
70 | 71 | ||
71 | VCardEntity e( data ); | 72 | VCardEntity e( data ); |
72 | 73 | ||
73 | VCardListIterator it( e.cardList() ); | 74 | VCardListIterator it( e.cardList() ); |
74 | 75 | ||
75 | for (; it.current(); ++it) { | 76 | for (; it.current(); ++it) { |
76 | VCard v(*it.current()); | 77 | //US VCard v(*it.current()); |
77 | Addressee addressee; | 78 | Addressee addressee; |
78 | loadAddressee( addressee, v ); | 79 | //US loadAddressee( addressee, v ); |
80 | loadAddressee( addressee, it.current() ); | ||
79 | addressee.setResource( resource ); | 81 | addressee.setResource( resource ); |
80 | addressBook->insertAddressee( addressee ); | 82 | addressBook->insertAddressee( addressee ); |
81 | } | 83 | } |
82 | 84 | ||
83 | return true; | 85 | return true; |
84 | } | 86 | } |
@@ -119,15 +121,15 @@ void VCardFormatImpl::saveAll( AddressBook *ab, Resource *resource, QFile *file | |||
119 | vcards.setCardList( vcardlist ); | 121 | vcards.setCardList( vcardlist ); |
120 | 122 | ||
121 | QCString vcardData = vcards.asString(); | 123 | QCString vcardData = vcards.asString(); |
122 | file->writeBlock( (const char*)vcardData, vcardData.length() ); | 124 | file->writeBlock( (const char*)vcardData, vcardData.length() ); |
123 | } | 125 | } |
124 | 126 | ||
125 | bool VCardFormatImpl::loadAddressee( Addressee& addressee, VCard &v ) | 127 | bool VCardFormatImpl::loadAddressee( Addressee& addressee, VCard *v ) |
126 | { | 128 | { |
127 | QPtrList<ContentLine> contentLines = v.contentLineList(); | 129 | QPtrList<ContentLine> contentLines = v->contentLineList(); |
128 | ContentLine *cl; | 130 | ContentLine *cl; |
129 | 131 | ||
130 | for( cl = contentLines.first(); cl; cl = contentLines.next() ) { | 132 | for( cl = contentLines.first(); cl; cl = contentLines.next() ) { |
131 | QCString n = cl->name(); | 133 | QCString n = cl->name(); |
132 | if ( n.left( 2 ) == "X-" ) { | 134 | if ( n.left( 2 ) == "X-" ) { |
133 | n = n.mid( 2 ); | 135 | n = n.mid( 2 ); |
@@ -781,25 +783,25 @@ void VCardFormatImpl::addAgentValue( VCARD::VCard *vcard, const Agent &agent ) | |||
781 | ParamList params; | 783 | ParamList params; |
782 | if ( agent.isIntern() ) { | 784 | if ( agent.isIntern() ) { |
783 | QString vstr; | 785 | QString vstr; |
784 | Addressee *addr = agent.addressee(); | 786 | Addressee *addr = agent.addressee(); |
785 | if ( addr ) { | 787 | if ( addr ) { |
786 | writeToString( (*addr), vstr ); | 788 | writeToString( (*addr), vstr ); |
787 | 789 | ||
788 | qDebug("VCardFormatImpl::addAgentValue please verify if replace is correct"); | 790 | qDebug("VCardFormatImpl::addAgentValue please verify if replace is correct"); |
789 | /*US | 791 | /*US |
790 | vstr.replace( ":", "\\:" ); | 792 | vstr.replace( ":", "\\:" ); |
791 | vstr.replace( ",", "\\," ); | 793 | vstr.replace( ",", "\\," ); |
792 | vstr.replace( ";", "\\;" ); | 794 | vstr.replace( ";", "\\;" ); |
793 | vstr.replace( "\r\n", "\\n" ); | 795 | vstr.replace( "\r\n", "\\n" ); |
794 | */ | 796 | */ |
795 | vstr.replace( QRegExp(":"), "\\:" ); | 797 | vstr.replace( QRegExp(":"), "\\:" ); |
796 | vstr.replace( QRegExp(","), "\\," ); | 798 | vstr.replace( QRegExp(","), "\\," ); |
797 | vstr.replace( QRegExp(";"), "\\;" ); | 799 | vstr.replace( QRegExp(";"), "\\;" ); |
798 | vstr.replace( QRegExp("\r\n"), "\\n" ); | 800 | vstr.replace( QRegExp("\r\n"), "\\n" ); |
799 | 801 | ||
800 | cl.setValue( new TextValue( vstr.utf8() ) ); | 802 | cl.setValue( new TextValue( vstr.utf8() ) ); |
801 | } else | 803 | } else |
802 | return; | 804 | return; |
803 | } else { | 805 | } else { |
804 | cl.setValue( new TextValue( agent.url().utf8() ) ); | 806 | cl.setValue( new TextValue( agent.url().utf8() ) ); |
805 | params.append( new Param( "VALUE", "uri" ) ); | 807 | params.append( new Param( "VALUE", "uri" ) ); |
@@ -822,23 +824,23 @@ Agent VCardFormatImpl::readAgentValue( VCARD::ContentLine *cl ) | |||
822 | isIntern = false; | 824 | isIntern = false; |
823 | } | 825 | } |
824 | 826 | ||
825 | if ( isIntern ) { | 827 | if ( isIntern ) { |
826 | QString vstr = QString::fromUtf8( v->asString() ); | 828 | QString vstr = QString::fromUtf8( v->asString() ); |
827 | qDebug("VCardFormatImpl::addAgentValue please verify if replace is correct"); | 829 | qDebug("VCardFormatImpl::addAgentValue please verify if replace is correct"); |
828 | /*US | 830 | /*US |
829 | vstr.replace( "\\n", "\r\n" ); | 831 | vstr.replace( "\\n", "\r\n" ); |
830 | vstr.replace( "\\:", ":" ); | 832 | vstr.replace( "\\:", ":" ); |
831 | vstr.replace( "\\,", "," ); | 833 | vstr.replace( "\\,", "," ); |
832 | vstr.replace( "\\;", ";" ); | 834 | vstr.replace( "\\;", ";" ); |
833 | */ | 835 | */ |
834 | vstr.replace( QRegExp("\\n"), "\r\n" ); | 836 | vstr.replace( QRegExp("\\n"), "\r\n" ); |
835 | vstr.replace( QRegExp("\\:"), ":" ); | 837 | vstr.replace( QRegExp("\\:"), ":" ); |
836 | vstr.replace( QRegExp("\\,"), "," ); | 838 | vstr.replace( QRegExp("\\,"), "," ); |
837 | vstr.replace( QRegExp("\\;"), ";" ); | 839 | vstr.replace( QRegExp("\\;"), ";" ); |
838 | 840 | ||
839 | Addressee *addr = new Addressee; | 841 | Addressee *addr = new Addressee; |
840 | readFromString( vstr, *addr ); | 842 | readFromString( vstr, *addr ); |
841 | agent.setAddressee( addr ); | 843 | agent.setAddressee( addr ); |
842 | } else { | 844 | } else { |
843 | agent.setUrl( QString::fromUtf8( v->asString() ) ); | 845 | agent.setUrl( QString::fromUtf8( v->asString() ) ); |
844 | } | 846 | } |
@@ -863,13 +865,13 @@ void VCardFormatImpl::addPictureValue( VCARD::VCard *vcard, VCARD::EntityType ty | |||
863 | if ( intern ) { // only for vCard export we really write the data inline | 865 | if ( intern ) { // only for vCard export we really write the data inline |
864 | QByteArray data; | 866 | QByteArray data; |
865 | QDataStream s( data, IO_WriteOnly ); | 867 | QDataStream s( data, IO_WriteOnly ); |
866 | s.setVersion( 4 ); // to produce valid png files | 868 | s.setVersion( 4 ); // to produce valid png files |
867 | s << img; | 869 | s << img; |
868 | cl.setValue( new TextValue( KCodecs::base64Encode( data ) ) ); | 870 | cl.setValue( new TextValue( KCodecs::base64Encode( data ) ) ); |
869 | 871 | ||
870 | } else { // save picture in cache | 872 | } else { // save picture in cache |
871 | QString dir; | 873 | QString dir; |
872 | if ( type == EntityPhoto ) | 874 | if ( type == EntityPhoto ) |
873 | dir = "photos"; | 875 | dir = "photos"; |
874 | if ( type == EntityLogo ) | 876 | if ( type == EntityLogo ) |
875 | dir = "logos"; | 877 | dir = "logos"; |
@@ -878,13 +880,13 @@ void VCardFormatImpl::addPictureValue( VCARD::VCard *vcard, VCARD::EntityType ty | |||
878 | cl.setValue( new TextValue( "<dummy>" ) ); | 880 | cl.setValue( new TextValue( "<dummy>" ) ); |
879 | } | 881 | } |
880 | params.append( new Param( "ENCODING", "b" ) ); | 882 | params.append( new Param( "ENCODING", "b" ) ); |
881 | if ( !pic.type().isEmpty() ) | 883 | if ( !pic.type().isEmpty() ) |
882 | params.append( new Param( "TYPE", pic.type().utf8() ) ); | 884 | params.append( new Param( "TYPE", pic.type().utf8() ) ); |
883 | } else { | 885 | } else { |
884 | 886 | ||
885 | cl.setValue( new TextValue( pic.url().utf8() ) ); | 887 | cl.setValue( new TextValue( pic.url().utf8() ) ); |
886 | params.append( new Param( "VALUE", "uri" ) ); | 888 | params.append( new Param( "VALUE", "uri" ) ); |
887 | } | 889 | } |
888 | 890 | ||
889 | cl.setParamList( params ); | 891 | cl.setParamList( params ); |
890 | vcard->add( cl ); | 892 | vcard->add( cl ); |
@@ -998,14 +1000,15 @@ Sound VCardFormatImpl::readSoundValue( VCARD::ContentLine *cl, const Addressee & | |||
998 | bool VCardFormatImpl::readFromString( const QString &vcard, Addressee &addressee ) | 1000 | bool VCardFormatImpl::readFromString( const QString &vcard, Addressee &addressee ) |
999 | { | 1001 | { |
1000 | VCardEntity e( vcard.utf8() ); | 1002 | VCardEntity e( vcard.utf8() ); |
1001 | VCardListIterator it( e.cardList() ); | 1003 | VCardListIterator it( e.cardList() ); |
1002 | 1004 | ||
1003 | if ( it.current() ) { | 1005 | if ( it.current() ) { |
1004 | VCard v(*it.current()); | 1006 | //US VCard v(*it.current()); |
1005 | loadAddressee( addressee, v ); | 1007 | //US loadAddressee( addressee, v ); |
1008 | loadAddressee( addressee, it.current() ); | ||
1006 | return true; | 1009 | return true; |
1007 | } | 1010 | } |
1008 | 1011 | ||
1009 | return false; | 1012 | return false; |
1010 | } | 1013 | } |
1011 | 1014 | ||
diff --git a/kabc/vcardformatimpl.h b/kabc/vcardformatimpl.h index 2dd68d9..fa3d55f 100644 --- a/kabc/vcardformatimpl.h +++ b/kabc/vcardformatimpl.h | |||
@@ -39,13 +39,13 @@ $Id$ | |||
39 | namespace KABC { | 39 | namespace KABC { |
40 | 40 | ||
41 | class AddressBook; | 41 | class AddressBook; |
42 | 42 | ||
43 | /** | 43 | /** |
44 | @short Implementation of vCard backend for address book. | 44 | @short Implementation of vCard backend for address book. |
45 | 45 | ||
46 | This class implements reading and writing of address book information using | 46 | This class implements reading and writing of address book information using |
47 | the vCard format. It requires the vCard lib from kdepim. | 47 | the vCard format. It requires the vCard lib from kdepim. |
48 | */ | 48 | */ |
49 | class VCardFormatImpl | 49 | class VCardFormatImpl |
50 | { | 50 | { |
51 | public: | 51 | public: |
@@ -55,13 +55,13 @@ class VCardFormatImpl | |||
55 | void saveAll( AddressBook *, Resource *, QFile *file ); | 55 | void saveAll( AddressBook *, Resource *, QFile *file ); |
56 | 56 | ||
57 | bool readFromString( const QString &vcard, Addressee &addr ); | 57 | bool readFromString( const QString &vcard, Addressee &addr ); |
58 | bool writeToString( const Addressee &addressee, QString &vcard ); | 58 | bool writeToString( const Addressee &addressee, QString &vcard ); |
59 | 59 | ||
60 | protected: | 60 | protected: |
61 | bool loadAddressee( Addressee &, VCARD::VCard & ); | 61 | bool loadAddressee( Addressee &, VCARD::VCard * ); |
62 | void saveAddressee( const Addressee &, VCARD::VCard *, bool intern ); | 62 | void saveAddressee( const Addressee &, VCARD::VCard *, bool intern ); |
63 | 63 | ||
64 | void addTextValue (VCARD::VCard *, VCARD::EntityType, const QString & ); | 64 | void addTextValue (VCARD::VCard *, VCARD::EntityType, const QString & ); |
65 | QString readTextValue( VCARD::ContentLine * ); | 65 | QString readTextValue( VCARD::ContentLine * ); |
66 | 66 | ||
67 | void addDateValue( VCARD::VCard *, VCARD::EntityType, const QDate & ); | 67 | void addDateValue( VCARD::VCard *, VCARD::EntityType, const QDate & ); |