summaryrefslogtreecommitdiffabout
path: root/kabc
authorzautrix <zautrix>2004-10-22 02:36:36 (UTC)
committer zautrix <zautrix>2004-10-22 02:36:36 (UTC)
commitd93d3e94f78543c912528ca043a6d78bc82b12b2 (patch) (unidiff)
tree0af6581ee739a3da67c849892585fe5fff751f0d /kabc
parentc17118a0b2da49ec633e21cdcd51798c0c38644a (diff)
downloadkdepimpi-d93d3e94f78543c912528ca043a6d78bc82b12b2.zip
kdepimpi-d93d3e94f78543c912528ca043a6d78bc82b12b2.tar.gz
kdepimpi-d93d3e94f78543c912528ca043a6d78bc82b12b2.tar.bz2
bugfix
Diffstat (limited to 'kabc') (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/vcard/VCardEntity.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/kabc/vcard/VCardEntity.cpp b/kabc/vcard/VCardEntity.cpp
index b676cc7..2a9e275 100644
--- a/kabc/vcard/VCardEntity.cpp
+++ b/kabc/vcard/VCardEntity.cpp
@@ -1,174 +1,175 @@
1/* 1/*
2 libvcard - vCard parsing library for vCard version 3.0 2 libvcard - vCard parsing library for vCard version 3.0
3 3
4 Copyright (C) 1998 Rik Hemsley rik@kde.org 4 Copyright (C) 1998 Rik Hemsley rik@kde.org
5 5
6 Permission is hereby granted, free of charge, to any person obtaining a copy 6 Permission is hereby granted, free of charge, to any person obtaining a copy
7 of this software and associated documentation files (the "Software"), to 7 of this software and associated documentation files (the "Software"), to
8 deal in the Software without restriction, including without limitation the 8 deal in the Software without restriction, including without limitation the
9 rights to use, copy, modify, merge, publish, distribute, sublicense, and/or 9 rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
10 sell copies of the Software, and to permit persons to whom the Software is 10 sell copies of the Software, and to permit persons to whom the Software is
11 furnished to do so, subject to the following conditions: 11 furnished to do so, subject to the following conditions:
12 12
13 The above copyright notice and this permission notice shall be included in 13 The above copyright notice and this permission notice shall be included in
14 all copies or substantial portions of the Software. 14 all copies or substantial portions of the Software.
15 15
16 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 16 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 17 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 18 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19 AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 19 AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
20 ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 20 ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
21 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 21 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22*/ 22*/
23 23
24#include <qregexp.h> 24#include <qregexp.h>
25 25
26#include <VCardDefines.h> 26#include <VCardDefines.h>
27#include <VCardVCardEntity.h> 27#include <VCardVCardEntity.h>
28 28
29using namespace VCARD; 29using namespace VCARD;
30 30
31VCardEntity::VCardEntity() 31VCardEntity::VCardEntity()
32 :Entity() 32 :Entity()
33{ 33{
34 cardList_.setAutoDelete( TRUE ); 34 cardList_.setAutoDelete( TRUE );
35} 35}
36 36
37VCardEntity::VCardEntity(const VCardEntity & x) 37VCardEntity::VCardEntity(const VCardEntity & x)
38 :Entity(x) 38 :Entity(x)
39{ 39{
40 cardList_.setAutoDelete( TRUE ); 40 cardList_.setAutoDelete( TRUE );
41} 41}
42 42
43VCardEntity::VCardEntity(const QCString & s) 43VCardEntity::VCardEntity(const QCString & s)
44 :Entity(s) 44 :Entity(s)
45{ 45{
46 cardList_.setAutoDelete( TRUE ); 46 cardList_.setAutoDelete( TRUE );
47} 47}
48 48
49 VCardEntity & 49 VCardEntity &
50VCardEntity::operator = (VCardEntity & x) 50VCardEntity::operator = (VCardEntity & x)
51{ 51{
52 if (*this == x) return *this; 52 if (*this == x) return *this;
53 53
54 Entity::operator = (x); 54 Entity::operator = (x);
55 return *this; 55 return *this;
56} 56}
57 57
58 VCardEntity & 58 VCardEntity &
59VCardEntity::operator = (const QCString & s) 59VCardEntity::operator = (const QCString & s)
60{ 60{
61 Entity::operator = (s); 61 Entity::operator = (s);
62 return *this; 62 return *this;
63} 63}
64 64
65 bool 65 bool
66VCardEntity::operator == (VCardEntity & x) 66VCardEntity::operator == (VCardEntity & x)
67{ 67{
68 x.parse(); 68 x.parse();
69 return false; 69 return false;
70} 70}
71 71
72VCardEntity::~VCardEntity() 72VCardEntity::~VCardEntity()
73{ 73{
74} 74}
75 75
76#include <qdatetime.h>; 76#include <qdatetime.h>;
77 void 77 void
78VCardEntity::_parse() 78VCardEntity::_parse()
79{ 79{
80#if 0 80#if 0
81 QTime tim; 81 QTime tim;
82 tim.start(); 82 tim.start();
83 int num = 0; 83 int num = 0;
84 // old code 84 // old code
85 vDebug("parse"); 85 vDebug("parse");
86 QCString s(strRep_); 86 QCString s(strRep_);
87 87
88 int i = s.find(QRegExp("BEGIN:VCARD", false)); 88 int i = s.find(QRegExp("BEGIN:VCARD", false));
89 89
90 while (i != -1) { 90 while (i != -1) {
91 91
92 i = s.find(QRegExp("BEGIN:VCARD", false), 11); 92 i = s.find(QRegExp("BEGIN:VCARD", false), 11);
93 93
94 QCString cardStr(s.left(i)); 94 QCString cardStr(s.left(i));
95 95
96 VCard * v = new VCard(cardStr); 96 VCard * v = new VCard(cardStr);
97 97
98 cardList_.append(v); 98 cardList_.append(v);
99 99
100 v->parse(); 100 v->parse();
101 101
102 s.remove(0, i); 102 s.remove(0, i);
103 } 103 }
104 104
105#else 105#else
106 // this code is up to 17 (!) times faster 106 // this code is up to 17 (!) times faster
107 int start = 0; 107 int start = 0;
108 QTime tim; 108 QTime tim;
109 tim.start(); 109 tim.start();
110 int i = 11; 110 int i = 11;
111 int len = strRep_.length(); 111 int len = strRep_.length();
112 int num = 0; 112 int num = 0;
113 while (i < len ) { 113 while (i < len ) {
114 while( i < len ) { 114 while( i < len ) {
115 int add = 1; 115 int add = 1;
116 if ( strRep_.at(i) == 'B' ) { 116 if ( strRep_.at(i) == 'B' ) {
117 if ( i+add < len && strRep_.at(i+add++) == 'E') 117 if ( i+add < len && strRep_.at(i+add++) == 'E')
118 if ( i+add < len && strRep_.at(i+add++) == 'G') 118 if ( i+add < len && strRep_.at(i+add++) == 'G')
119 if ( i+add < len && strRep_.at(i+add++) == 'I') 119 if ( i+add < len && strRep_.at(i+add++) == 'I')
120 if ( i+add < len && strRep_.at(i+add++) == 'N') 120 if ( i+add < len && strRep_.at(i+add++) == 'N')
121 if ( i+add < len && strRep_.at(i+add++) == ':') 121 if ( i+add < len && strRep_.at(i+add++) == ':')
122 if ( i+add < len && strRep_.at(i+add++) == 'V') 122 if ( i+add < len && strRep_.at(i+add++) == 'V')
123 if ( i+add < len && strRep_.at(i+add++) == 'C') 123 if ( i+add < len && strRep_.at(i+add++) == 'C')
124 if ( i+add < len && strRep_.at(i+add++) == 'A') 124 if ( i+add < len && strRep_.at(i+add++) == 'A')
125 if ( i+add < len && strRep_.at(i+add++) == 'R') 125 if ( i+add < len && strRep_.at(i+add++) == 'R')
126 if ( i+add < len && strRep_.at(i+add++) == 'D') 126 if ( i+add < len && strRep_.at(i+add++) == 'D')
127 if ( i+add < len && (strRep_.at(i+add) == '\r' || strRep_.at(i+add) == '\n' ))
127 break; 128 break;
128 } 129 }
129 ++i; 130 ++i;
130 } 131 }
131 if ( i <= len ) { 132 if ( i <= len ) {
132 ++num; 133 ++num;
133 char* dat = strRep_.data()+start; 134 char* dat = strRep_.data()+start;
134 VCard * v = new VCard( QCString ( dat,i-start ) ); 135 VCard * v = new VCard( QCString ( dat,i-start ) );
135 start = i; 136 start = i;
136 cardList_.append(v); 137 cardList_.append(v);
137 v->parse(); 138 v->parse();
138 } 139 }
139 i+= 11; 140 i+= 11;
140 } 141 }
141#endif 142#endif
142 //qDebug("***time %d found %d", tim.elapsed(), num); 143 qDebug("***time %d found %d", tim.elapsed(), num);
143} 144}
144 145
145 void 146 void
146VCardEntity::_assemble() 147VCardEntity::_assemble()
147{ 148{
148 VCardListIterator it(cardList_); 149 VCardListIterator it(cardList_);
149 150
150 for (; it.current(); ++it) 151 for (; it.current(); ++it)
151 strRep_ += it.current()->asString() + "\r\n"; // One CRLF for luck. 152 strRep_ += it.current()->asString() + "\r\n"; // One CRLF for luck.
152} 153}
153 154
154 VCardList & 155 VCardList &
155VCardEntity::cardList() 156VCardEntity::cardList()
156{ 157{
157 parse(); 158 parse();
158 return cardList_; 159 return cardList_;
159} 160}
160 161
161 void 162 void
162VCardEntity::setCardList(const VCardList & l) 163VCardEntity::setCardList(const VCardList & l)
163{ 164{
164 parse(); 165 parse();
165 //UScardList_ = l; 166 //UScardList_ = l;
166 VCardListIterator it(l); 167 VCardListIterator it(l);
167 168
168 for (; it.current(); ++it) { 169 for (; it.current(); ++it) {
169 VCard* v = new VCard(*it.current()); 170 VCard* v = new VCard(*it.current());
170 cardList_.append(v); 171 cardList_.append(v);
171 } 172 }
172 173
173} 174}
174 175