-rw-r--r-- | libkcal/incidencebase.cpp | 96 |
1 files changed, 20 insertions, 76 deletions
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp index 5d8785b..15c4fa8 100644 --- a/libkcal/incidencebase.cpp +++ b/libkcal/incidencebase.cpp | |||
@@ -23,2 +23,3 @@ | |||
23 | #include <kdebug.h> | 23 | #include <kdebug.h> |
24 | #include <kidmanager.h> | ||
24 | 25 | ||
@@ -39,4 +40,3 @@ IncidenceBase::IncidenceBase() : | |||
39 | mHasDuration = false; | 40 | mHasDuration = false; |
40 | mPilotId = 0; | 41 | mPilotId = 0; |
41 | mZaurusUid = 0; | ||
42 | mExternalId = ":"; | 42 | mExternalId = ":"; |
@@ -63,3 +63,2 @@ IncidenceBase::IncidenceBase(const IncidenceBase &i) : | |||
63 | mPilotId = i.mPilotId; | 63 | mPilotId = i.mPilotId; |
64 | mZaurusUid = i.mZaurusUid; | ||
65 | mTempSyncStat = i.mTempSyncStat; | 64 | mTempSyncStat = i.mTempSyncStat; |
@@ -343,12 +342,2 @@ int IncidenceBase::pilotId() const | |||
343 | 342 | ||
344 | int IncidenceBase::zaurusUid() const | ||
345 | { | ||
346 | return mZaurusUid; | ||
347 | } | ||
348 | void IncidenceBase::setZaurusUid( int id ) | ||
349 | { | ||
350 | if (mReadOnly) return; | ||
351 | mZaurusUid = id; | ||
352 | } | ||
353 | |||
354 | int IncidenceBase::tempSyncStat() const | 343 | int IncidenceBase::tempSyncStat() const |
@@ -363,33 +352,14 @@ void IncidenceBase::setTempSyncStat( int id ) | |||
363 | 352 | ||
364 | void IncidenceBase::setID( const QString & prof , int id ) | 353 | void IncidenceBase::removeID(const QString &prof) |
365 | { | 354 | { |
366 | int num = mExternalId.find( ":"+prof+";" ); | 355 | mExternalId = KIdManager::removeId ( mExternalId, prof); |
367 | if ( num >= 0 ) { | 356 | |
368 | int len = prof.length()+2; | 357 | } |
369 | int end = mExternalId.find( ";", num+len ); | 358 | void IncidenceBase::setID( const QString & prof , const QString & id ) |
370 | if ( end > 0 ) { | 359 | { |
371 | mExternalId = mExternalId.left( num+len ) +QString::number( id)+mExternalId.mid( end ); | 360 | mExternalId = KIdManager::setId ( mExternalId, prof, id ); |
372 | } else | 361 | } |
373 | qDebug("Error in IncidenceBase::setID "); | 362 | QString IncidenceBase::getID( const QString & prof) |
374 | } else { | 363 | { |
375 | mExternalId += prof+";"+QString::number( id) +";0:"; | 364 | return KIdManager::getId ( mExternalId, prof ); |
376 | } | ||
377 | qDebug("setID*%s*%d*%s* ", prof.latin1(), id,mExternalId.latin1() ); | ||
378 | } | ||
379 | int IncidenceBase::getID( const QString & prof) | ||
380 | { | ||
381 | int ret = -1; | ||
382 | int num = mExternalId.find(":"+ prof+";" ); | ||
383 | if ( num >= 0 ) { | ||
384 | int len = prof.length()+2; | ||
385 | int end = mExternalId.find( ";", num+len ); | ||
386 | if ( end > 0 ) { | ||
387 | bool ok; | ||
388 | ret = mExternalId.mid ( num + len,end-len-num).toInt( &ok ); | ||
389 | if (!ok) | ||
390 | ret = -1; | ||
391 | } | ||
392 | } | ||
393 | qDebug("getID*%s*%d*%s* ", prof.latin1(), ret,mExternalId.latin1() ); | ||
394 | return ret; | ||
395 | } | 365 | } |
@@ -398,35 +368,9 @@ int IncidenceBase::getID( const QString & prof) | |||
398 | // format name;III;JJJ: III >= 0, may be -1. JJJ always >= 0 | 368 | // format name;III;JJJ: III >= 0, may be -1. JJJ always >= 0 |
399 | void IncidenceBase::setCsum( const QString & prof , int id ) | 369 | void IncidenceBase::setCsum( const QString & prof , const QString & id ) |
400 | { | 370 | { |
401 | int num = mExternalId.find( ":"+prof+";"); | 371 | mExternalId = KIdManager::setCsum ( mExternalId, prof, id ); |
402 | if ( num >= 0 ) { | 372 | } |
403 | int len = prof.length()+2; | 373 | QString IncidenceBase::getCsum( const QString & prof) |
404 | num = mExternalId.find( ";", num+len ); | 374 | { |
405 | int end = mExternalId.find( ":", num+1 ); | 375 | return KIdManager::getCsum ( mExternalId, prof ); |
406 | if ( end > 0 ) { | ||
407 | mExternalId = mExternalId.left( num ) +QString::number(id)+mExternalId.mid( end ); | ||
408 | } else | ||
409 | qDebug("Error in IncidenceBase::setCsum "); | ||
410 | } else { | ||
411 | mExternalId += prof+";-1;"+QString::number( id) +":"; | ||
412 | } | ||
413 | qDebug("setCsum*%s*%d*%s* ", prof.latin1(), id,mExternalId.latin1() ); | ||
414 | } | ||
415 | int IncidenceBase::getCsum( const QString & prof) | ||
416 | { | ||
417 | int ret = -1; | ||
418 | int num = mExternalId.find( ":"+prof+";" ); | ||
419 | if ( num >= 0 ) { | ||
420 | int len = prof.length()+2; | ||
421 | num = mExternalId.find( ";", num+len ); | ||
422 | int end = mExternalId.find( ":", num+1 ); | ||
423 | if ( end > 0 ) { | ||
424 | bool ok; | ||
425 | ret = mExternalId.mid ( num ,end-num).toInt( &ok ); | ||
426 | if (!ok) | ||
427 | ret = -1; | ||
428 | } | ||
429 | } | ||
430 | qDebug("getCsum*%s*%d*%s* ", prof.latin1(), ret,mExternalId.latin1() ); | ||
431 | return ret; | ||
432 | } | 376 | } |