author | ulf69 <ulf69> | 2004-07-15 15:15:52 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-07-15 15:15:52 (UTC) |
commit | ec8315212b05c128c8d5650cf5daff2b1d6b84dd (patch) (unidiff) | |
tree | ae4ffd799c19caa18c1b0964783f915395769a24 /kabc | |
parent | 59f727076930aada485db6531d4084f2bfe0b928 (diff) | |
download | kdepimpi-ec8315212b05c128c8d5650cf5daff2b1d6b84dd.zip kdepimpi-ec8315212b05c128c8d5650cf5daff2b1d6b84dd.tar.gz kdepimpi-ec8315212b05c128c8d5650cf5daff2b1d6b84dd.tar.bz2 |
resolved crash during import of opie and qtopia addressbooks
-rw-r--r-- | kabc/converter/qtopia/qtopiaconverter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kabc/converter/qtopia/qtopiaconverter.cpp b/kabc/converter/qtopia/qtopiaconverter.cpp index f451b8b..498e89e 100644 --- a/kabc/converter/qtopia/qtopiaconverter.cpp +++ b/kabc/converter/qtopia/qtopiaconverter.cpp | |||
@@ -177,65 +177,65 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a | |||
177 | businessmobile.setNumber( contact.businessMobile() ); | 177 | businessmobile.setNumber( contact.businessMobile() ); |
178 | addr.insertPhoneNumber( businessmobile ); | 178 | addr.insertPhoneNumber( businessmobile ); |
179 | } | 179 | } |
180 | 180 | ||
181 | if (!contact.businessPager().isEmpty()) | 181 | if (!contact.businessPager().isEmpty()) |
182 | { | 182 | { |
183 | PhoneNumber businesspager; | 183 | PhoneNumber businesspager; |
184 | businesspager.setType( PhoneNumber::Work | PhoneNumber::Pager ); | 184 | businesspager.setType( PhoneNumber::Work | PhoneNumber::Pager ); |
185 | businesspager.setNumber( contact.businessPager() ); | 185 | businesspager.setNumber( contact.businessPager() ); |
186 | addr.insertPhoneNumber( businesspager ); | 186 | addr.insertPhoneNumber( businesspager ); |
187 | } | 187 | } |
188 | 188 | ||
189 | addr.setRole( contact.jobTitle() ); //? | 189 | addr.setRole( contact.jobTitle() ); //? |
190 | addr.setOrganization( contact.company() ); | 190 | addr.setOrganization( contact.company() ); |
191 | addr.insertCustom( "KADDRESSBOOK", "X-Profession", contact.profession() ); | 191 | addr.insertCustom( "KADDRESSBOOK", "X-Profession", contact.profession() ); |
192 | addr.insertCustom( "KADDRESSBOOK", "X-AssistantsName", contact.assistant() ); | 192 | addr.insertCustom( "KADDRESSBOOK", "X-AssistantsName", contact.assistant() ); |
193 | addr.insertCustom( "KADDRESSBOOK", "X-Department", contact.department() ); | 193 | addr.insertCustom( "KADDRESSBOOK", "X-Department", contact.department() ); |
194 | addr.insertCustom( "KADDRESSBOOK", "X-ManagersName", contact.manager() ); | 194 | addr.insertCustom( "KADDRESSBOOK", "X-ManagersName", contact.manager() ); |
195 | addr.insertCustom( "KADDRESSBOOK", "X-Office", contact.office() ); | 195 | addr.insertCustom( "KADDRESSBOOK", "X-Office", contact.office() ); |
196 | 196 | ||
197 | //personal | 197 | //personal |
198 | addr.insertCustom( "KADDRESSBOOK", "X-SpousesName", contact.spouse() ); | 198 | addr.insertCustom( "KADDRESSBOOK", "X-SpousesName", contact.spouse() ); |
199 | // qtopia uses this categorization: | 199 | // qtopia uses this categorization: |
200 | // enum GenderType { UnspecifiedGender=0, Male, Female }; | 200 | // enum GenderType { UnspecifiedGender=0, Male, Female }; |
201 | if (contact.gender() == PimContact::Male) | 201 | if (contact.gender() == PimContact::Male) |
202 | addr.insertCustom( "KADDRESSBOOK", "X-Gender", "male"); | 202 | addr.insertCustom( "KADDRESSBOOK", "X-Gender", "male"); |
203 | else if (contact.gender() == PimContact::Female) | 203 | else if (contact.gender() == PimContact::Female) |
204 | addr.insertCustom( "KADDRESSBOOK", "X-Gender", "female"); | 204 | addr.insertCustom( "KADDRESSBOOK", "X-Gender", "female"); |
205 | 205 | ||
206 | if (contact.anniversary().isValid()) { | 206 | if (contact.anniversary().isValid()) { |
207 | QString dt = KGlobal::locale()->formatDate(contact.anniversary(), true, KLocale::ISODate); | 207 | QString dt = KGlobal::locale()->formatDate(contact.anniversary(), true, KLocale::ISODate); |
208 | //US | 208 | //US |
209 | qDebug("OpieConverter::qtopiaToAddressee found:%s", dt.latin1()); | 209 | // qDebug("QtopiaConverter::qtopiaToAddressee found:%s", dt.latin1()); |
210 | addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt); | 210 | addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt); |
211 | } | 211 | } |
212 | 212 | ||
213 | addr.insertCustom( "KADDRESSBOOK", "X-Children", contact.children() ); | 213 | addr.insertCustom( "KADDRESSBOOK", "X-Children", contact.children() ); |
214 | if (contact.birthday().isValid()) | 214 | if (contact.birthday().isValid()) |
215 | addr.setBirthday( contact.birthday() ); | 215 | addr.setBirthday( contact.birthday() ); |
216 | 216 | ||
217 | addr.setNickName( contact.nickname() ); | 217 | addr.setNickName( contact.nickname() ); |
218 | 218 | ||
219 | // others | 219 | // others |
220 | //US I put opies BusinessWebPage into Ka/Pi's notes block, because no other native field is available. | 220 | //US I put opies BusinessWebPage into Ka/Pi's notes block, because no other native field is available. |
221 | QString notes = contact.notes(); | 221 | QString notes = contact.notes(); |
222 | notes += "\nBusinessWebPage: " + contact.businessWebpage() + "\n"; | 222 | notes += "\nBusinessWebPage: " + contact.businessWebpage() + "\n"; |
223 | 223 | ||
224 | addr.setNote( contact.notes() ); | 224 | addr.setNote( contact.notes() ); |
225 | 225 | ||
226 | 226 | ||
227 | 227 | ||
228 | //US QString groups() const { return find( Qtopia::Groups ); } | 228 | //US QString groups() const { return find( Qtopia::Groups ); } |
229 | //US QStringList groupList() const; | 229 | //US QStringList groupList() const; |
230 | 230 | ||
231 | QArray<int> catArray = contact.categories(); | 231 | QArray<int> catArray = contact.categories(); |
232 | QString cat; | 232 | QString cat; |
233 | 233 | ||
234 | for ( unsigned int i=0; i < catArray.size(); i++ ) { | 234 | for ( unsigned int i=0; i < catArray.size(); i++ ) { |
235 | cat = catDB->label("contact", catArray[i]); | 235 | cat = catDB->label("contact", catArray[i]); |
236 | if ( !cat.isEmpty() ) | 236 | if ( !cat.isEmpty() ) |
237 | addr.insertCategory( cat ); | 237 | addr.insertCategory( cat ); |
238 | } | 238 | } |
239 | 239 | ||
240 | return true; | 240 | return true; |
241 | } | 241 | } |