Diffstat (limited to 'kabc/plugins/sharpdtm/resourcesharpdtm.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | kabc/plugins/sharpdtm/resourcesharpdtm.cpp | 57 |
1 files changed, 10 insertions, 47 deletions
diff --git a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp index bba5f9a..48d3985 100644 --- a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp +++ b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp | |||
@@ -131,3 +131,3 @@ bool ResourceSharpDTM::doOpen() | |||
131 | SlZDataBase::addressbookItems(), | 131 | SlZDataBase::addressbookItems(), |
132 | NULL, true); | 132 | NULL, false); |
133 | 133 | ||
@@ -141,3 +141,3 @@ bool ResourceSharpDTM::doOpen() | |||
141 | mConverter = new SharpDTMConverter(); | 141 | mConverter = new SharpDTMConverter(); |
142 | bool res = mConverter->init(); | 142 | bool res = mConverter->init(); |
143 | if ( !res ) | 143 | if ( !res ) |
@@ -226,9 +226,10 @@ bool ResourceSharpDTM::save( Ticket *ticket ) | |||
226 | KABC::Addressee addressee; | 226 | KABC::Addressee addressee; |
227 | qDebug("1NEW id is %d", id); | ||
228 | res = mConverter->sharpToAddressee( id, mAccess, addressee ); | 227 | res = mConverter->sharpToAddressee( id, mAccess, addressee ); |
229 | addressee.setUid((*it).uid() ); | 228 | addressee.setUid((*it).uid() ); |
230 | addressee.setTempSyncStat( SYNC_TEMPSTATE_NEW_CSUM ); | 229 | addressee.setTempSyncStat( SYNC_TEMPSTATE_NEW_ID ); |
231 | changedAddressees.append( addressee ); | ||
232 | res = mAccess->finishEditCard(&id); | 230 | res = mAccess->finishEditCard(&id); |
233 | qDebug("2NEW id is %d", id); | 231 | //qDebug("2NEW id is %d", id); |
232 | addressee.setExternalUID( QString::number( id ) ); | ||
233 | addressee.setOriginalExternalUID( QString::number( id ) ); | ||
234 | changedAddressees.append( addressee ); | ||
234 | 235 | ||
@@ -236,5 +237,3 @@ bool ResourceSharpDTM::save( Ticket *ticket ) | |||
236 | qDebug("Unable to append Contact: %s", addressee.formattedName().latin1()); | 237 | qDebug("Unable to append Contact: %s", addressee.formattedName().latin1()); |
237 | else { | 238 | |
238 | qDebug("added card success "); | ||
239 | } | ||
240 | } | 239 | } |
@@ -257,2 +256,3 @@ bool ResourceSharpDTM::save( Ticket *ticket ) | |||
257 | //changed | 256 | //changed |
257 | qDebug("changed ****"); | ||
258 | res = mAccess->startEditCard(id); | 258 | res = mAccess->startEditCard(id); |
@@ -271,5 +271,3 @@ bool ResourceSharpDTM::save( Ticket *ticket ) | |||
271 | qDebug("Unable to append Contact: %s", addressee.formattedName().latin1()); | 271 | qDebug("Unable to append Contact: %s", addressee.formattedName().latin1()); |
272 | else { | 272 | |
273 | qDebug("change card succes "); | ||
274 | } | ||
275 | } | 273 | } |
@@ -282,38 +280,3 @@ bool ResourceSharpDTM::save( Ticket *ticket ) | |||
282 | } | 280 | } |
283 | |||
284 | |||
285 | |||
286 | |||
287 | |||
288 | |||
289 | |||
290 | |||
291 | } | ||
292 | |||
293 | #if 0 | ||
294 | // old code | ||
295 | CardId id = 0;// 0 means new card | ||
296 | KABC::Addressee addressee = (*it); | ||
297 | |||
298 | res = mAccess->startEditCard(id); | ||
299 | if (res == true) | ||
300 | { | ||
301 | res = mConverter->addresseeToSharp( *it, mAccess, id ); | ||
302 | if (res == true) | ||
303 | { | ||
304 | res = mAccess->finishEditCard(&id); | ||
305 | if (res == false) | ||
306 | qDebug("Unable to append Contact: %s", addressee.formattedName().latin1()); | ||
307 | } | 281 | } |
308 | else | ||
309 | { | ||
310 | qDebug("Unable to convert Addressee: %s", addressee.formattedName().latin1()); | ||
311 | mAccess->cancelEditCard(); | ||
312 | } | ||
313 | } | ||
314 | else | ||
315 | { | ||
316 | qDebug("Unable to add new card. Addressee: %s", addressee.formattedName().latin1()); | ||
317 | } | ||
318 | #endif | ||
319 | 282 | ||