author | zautrix <zautrix> | 2004-10-22 10:09:10 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-22 10:09:10 (UTC) |
commit | 0af0436b73d0e55d4254aad66fb41efc06d329d1 (patch) (unidiff) | |
tree | 397737fa9743c8769d109aab8c6174aea5df1cdb | |
parent | a97485bb2ff1b4f274d9cf0fba9e2f122297deed (diff) | |
download | kdepimpi-0af0436b73d0e55d4254aad66fb41efc06d329d1.zip kdepimpi-0af0436b73d0e55d4254aad66fb41efc06d329d1.tar.gz kdepimpi-0af0436b73d0e55d4254aad66fb41efc06d329d1.tar.bz2 |
removed debug output
-rw-r--r-- | kabc/vcard/VCardEntity.cpp | 4 | ||||
-rw-r--r-- | kaddressbook/kabprefs.cpp | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/kabc/vcard/VCardEntity.cpp b/kabc/vcard/VCardEntity.cpp index 2a9e275..81debf4 100644 --- a/kabc/vcard/VCardEntity.cpp +++ b/kabc/vcard/VCardEntity.cpp | |||
@@ -1,48 +1,49 @@ | |||
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 | #include <qdatetime.h>; | ||
25 | 26 | ||
26 | #include <VCardDefines.h> | 27 | #include <VCardDefines.h> |
27 | #include <VCardVCardEntity.h> | 28 | #include <VCardVCardEntity.h> |
28 | 29 | ||
29 | using namespace VCARD; | 30 | using namespace VCARD; |
30 | 31 | ||
31 | VCardEntity::VCardEntity() | 32 | VCardEntity::VCardEntity() |
32 | :Entity() | 33 | :Entity() |
33 | { | 34 | { |
34 | cardList_.setAutoDelete( TRUE ); | 35 | cardList_.setAutoDelete( TRUE ); |
35 | } | 36 | } |
36 | 37 | ||
37 | VCardEntity::VCardEntity(const VCardEntity & x) | 38 | VCardEntity::VCardEntity(const VCardEntity & x) |
38 | :Entity(x) | 39 | :Entity(x) |
39 | { | 40 | { |
40 | cardList_.setAutoDelete( TRUE ); | 41 | cardList_.setAutoDelete( TRUE ); |
41 | } | 42 | } |
42 | 43 | ||
43 | VCardEntity::VCardEntity(const QCString & s) | 44 | VCardEntity::VCardEntity(const QCString & s) |
44 | :Entity(s) | 45 | :Entity(s) |
45 | { | 46 | { |
46 | cardList_.setAutoDelete( TRUE ); | 47 | cardList_.setAutoDelete( TRUE ); |
47 | } | 48 | } |
48 | 49 | ||
@@ -52,49 +53,48 @@ VCardEntity::operator = (VCardEntity & x) | |||
52 | if (*this == x) return *this; | 53 | if (*this == x) return *this; |
53 | 54 | ||
54 | Entity::operator = (x); | 55 | Entity::operator = (x); |
55 | return *this; | 56 | return *this; |
56 | } | 57 | } |
57 | 58 | ||
58 | VCardEntity & | 59 | VCardEntity & |
59 | VCardEntity::operator = (const QCString & s) | 60 | VCardEntity::operator = (const QCString & s) |
60 | { | 61 | { |
61 | Entity::operator = (s); | 62 | Entity::operator = (s); |
62 | return *this; | 63 | return *this; |
63 | } | 64 | } |
64 | 65 | ||
65 | bool | 66 | bool |
66 | VCardEntity::operator == (VCardEntity & x) | 67 | VCardEntity::operator == (VCardEntity & x) |
67 | { | 68 | { |
68 | x.parse(); | 69 | x.parse(); |
69 | return false; | 70 | return false; |
70 | } | 71 | } |
71 | 72 | ||
72 | VCardEntity::~VCardEntity() | 73 | VCardEntity::~VCardEntity() |
73 | { | 74 | { |
74 | } | 75 | } |
75 | 76 | ||
76 | #include <qdatetime.h>; | ||
77 | void | 77 | void |
78 | VCardEntity::_parse() | 78 | VCardEntity::_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(); |
@@ -119,49 +119,49 @@ VCardEntity::_parse() | |||
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 | if ( i+add < len && (strRep_.at(i+add) == '\r' || strRep_.at(i+add) == '\n' )) |
128 | break; | 128 | break; |
129 | } | 129 | } |
130 | ++i; | 130 | ++i; |
131 | } | 131 | } |
132 | if ( i <= len ) { | 132 | if ( i <= len ) { |
133 | ++num; | 133 | ++num; |
134 | char* dat = strRep_.data()+start; | 134 | char* dat = strRep_.data()+start; |
135 | VCard * v = new VCard( QCString ( dat,i-start ) ); | 135 | VCard * v = new VCard( QCString ( dat,i-start ) ); |
136 | start = i; | 136 | start = i; |
137 | cardList_.append(v); | 137 | cardList_.append(v); |
138 | v->parse(); | 138 | v->parse(); |
139 | } | 139 | } |
140 | i+= 11; | 140 | i+= 11; |
141 | } | 141 | } |
142 | #endif | 142 | #endif |
143 | qDebug("***time %d found %d", tim.elapsed(), num); | 143 | //qDebug("***time %d found %d", tim.elapsed(), num); |
144 | } | 144 | } |
145 | 145 | ||
146 | void | 146 | void |
147 | VCardEntity::_assemble() | 147 | VCardEntity::_assemble() |
148 | { | 148 | { |
149 | VCardListIterator it(cardList_); | 149 | VCardListIterator it(cardList_); |
150 | 150 | ||
151 | for (; it.current(); ++it) | 151 | for (; it.current(); ++it) |
152 | strRep_ += it.current()->asString() + "\r\n"; // One CRLF for luck. | 152 | strRep_ += it.current()->asString() + "\r\n"; // One CRLF for luck. |
153 | } | 153 | } |
154 | 154 | ||
155 | VCardList & | 155 | VCardList & |
156 | VCardEntity::cardList() | 156 | VCardEntity::cardList() |
157 | { | 157 | { |
158 | parse(); | 158 | parse(); |
159 | return cardList_; | 159 | return cardList_; |
160 | } | 160 | } |
161 | 161 | ||
162 | void | 162 | void |
163 | VCardEntity::setCardList(const VCardList & l) | 163 | VCardEntity::setCardList(const VCardList & l) |
164 | { | 164 | { |
165 | parse(); | 165 | parse(); |
166 | //UScardList_ = l; | 166 | //UScardList_ = l; |
167 | VCardListIterator it(l); | 167 | VCardListIterator it(l); |
diff --git a/kaddressbook/kabprefs.cpp b/kaddressbook/kabprefs.cpp index 4b3ee47..79fff47 100644 --- a/kaddressbook/kabprefs.cpp +++ b/kaddressbook/kabprefs.cpp | |||
@@ -165,45 +165,44 @@ void KABPrefs::usrReadConfig() | |||
165 | QString end = "{ \"\",\"\" }"; | 165 | QString end = "{ \"\",\"\" }"; |
166 | while ( (line != end) && (br > 1) ) { | 166 | while ( (line != end) && (br > 1) ) { |
167 | //qDebug("%d *%s* ", br, line.latin1()); | 167 | //qDebug("%d *%s* ", br, line.latin1()); |
168 | se = line.find("\"")+1; | 168 | se = line.find("\"")+1; |
169 | et = line.findRev("\"",-1); | 169 | et = line.findRev("\"",-1); |
170 | ee = line.find("\",\""); | 170 | ee = line.find("\",\""); |
171 | st = ee+3; | 171 | st = ee+3; |
172 | we = line.mid( se, ee-se ); | 172 | we = line.mid( se, ee-se ); |
173 | wt = line.mid( st, et-st ); | 173 | wt = line.mid( st, et-st ); |
174 | //qDebug("*%s* *%s* ", we.latin1(), wt.latin1()); | 174 | //qDebug("*%s* *%s* ", we.latin1(), wt.latin1()); |
175 | mLocaleDict->insert( we, new QString (wt) ); | 175 | mLocaleDict->insert( we, new QString (wt) ); |
176 | nbr = text.find ( "}", br ); | 176 | nbr = text.find ( "}", br ); |
177 | line = text.mid( br, nbr - br ); | 177 | line = text.mid( br, nbr - br ); |
178 | br = nbr+1; | 178 | br = nbr+1; |
179 | } | 179 | } |
180 | //qDebug("end *%s* ", end.latin1()); | 180 | //qDebug("end *%s* ", end.latin1()); |
181 | 181 | ||
182 | setLocaleDict( mLocaleDict ); | 182 | setLocaleDict( mLocaleDict ); |
183 | } else { | 183 | } else { |
184 | qDebug("KO: Cannot find translation file %s",fileName.latin1() ); | 184 | qDebug("KO: Cannot find translation file %s",fileName.latin1() ); |
185 | } | 185 | } |
186 | 186 | ||
187 | 187 | ||
188 | } | 188 | } |
189 | qDebug("KABPrefs::usrReadConfig********************** "); | ||
190 | KPimPrefs::usrReadConfig(); | 189 | KPimPrefs::usrReadConfig(); |
191 | } | 190 | } |
192 | 191 | ||
193 | 192 | ||
194 | /*US | 193 | /*US |
195 | void KABPrefs::usrSetDefaults() | 194 | void KABPrefs::usrSetDefaults() |
196 | { | 195 | { |
197 | KPimPrefs::usrSetDefaults(); | 196 | KPimPrefs::usrSetDefaults(); |
198 | } | 197 | } |
199 | 198 | ||
200 | void KABPrefs::usrReadConfig() | 199 | void KABPrefs::usrReadConfig() |
201 | { | 200 | { |
202 | KPimPrefs::usrReadConfig(); | 201 | KPimPrefs::usrReadConfig(); |
203 | } | 202 | } |
204 | 203 | ||
205 | void KABPrefs::usrWriteConfig() | 204 | void KABPrefs::usrWriteConfig() |
206 | { | 205 | { |
207 | KPimPrefs::usrWriteConfig(); | 206 | KPimPrefs::usrWriteConfig(); |
208 | } | 207 | } |
209 | */ | 208 | */ |