| -rw-r--r-- | korganizer/calendarview.cpp | 43 |
1 files changed, 17 insertions, 26 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 9160e1d..cbe2a10 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -910,4 +910,10 @@ void CalendarView::checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* t } +void CalendarView::checkExternalId( Incidence * inc ) +{ + QPtrList<Event> lastSync = mCalendar->getExternLastSyncEvents() ; + checkExternSyncEvent( lastSync, inc ); + +} bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int mode ) { @@ -1027,5 +1033,5 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int if ( inR->type() == "Todo" ) pref = "t"; - if ( des.find(pref+QString::number( inR->zaurusId() ) +"," ) >= 0 && mode != 5) { // delete it + if ( des.find(pref+QString::number( inR->getID(mCurrentSyncDevice) ) +"," ) >= 0 && mode != 5) { // delete it inR->setTempSyncStat( SYNC_TEMPSTATE_DELETE ); //remote->deleteIncidence( inR ); @@ -1077,10 +1083,10 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int if ( ! inR ) { if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { - if ( inL->zaurusId() >= 0 && mode != 4 ) { + if ( inL->getID(mCurrentSyncDevice) >= 0 && mode != 4 ) { local->deleteIncidence( inL ); ++deletedEventL; } else { if ( ! KOPrefs::instance()->mWriteBackExistingOnly ) { - inL->setZaurusId( -1 ); + inL->setID(mCurrentSyncDevice, -1 ); ++addedEventR; inL->setLastModified( modifiedCalendar ); @@ -1201,5 +1207,5 @@ void CalendarView::syncSharp() loc = mCalendar->incidence(inc->uid() ); if ( loc ) { - loc->setZaurusId( inc->zaurusId() ); + loc->setID(mCurrentSyncDevice, inc->getID(mCurrentSyncDevice) ); loc->setZaurusUid( inc->zaurusUid() ); } @@ -1830,20 +1836,5 @@ void CalendarView::changeTodoDisplay(Todo *which, int action) changeIncidenceDisplay((Incidence *)which, action); } -void CalendarView::checkZaurusId( int id, bool todo ) -{ - if ( id >= 0 ) { - Incidence* lse = mCalendar->event( "last-syncEvent-Sharp-DTM"); - if ( lse ) { - QString des = lse->description(); - QString pref = "e"; - if ( todo ) - pref = "t"; - des += pref+ QString::number ( id ) + ","; - lse->setReadOnly( false ); - lse->setDescription( des ); - lse->setReadOnly( true ); - } - } -} + void CalendarView::changeIncidenceDisplay(Incidence *which, int action) { @@ -2577,5 +2568,5 @@ void CalendarView::deleteTodo(Todo *todo) i18n("Delete To-Do")); } else { - checkZaurusId( todo->zaurusId(), true ); + checkExternalId( todo ); calendar()->deleteTodo(todo); changeTodoDisplay( todo,KOGlobals::EVENTDELETED ); @@ -2589,5 +2580,5 @@ void CalendarView::deleteTodo(Todo *todo) i18n("Delete To-Do")); } else { - checkZaurusId( todo->zaurusId(), true ); + checkExternalId( todo ); mCalendar->deleteTodo(todo); changeTodoDisplay( todo,KOGlobals::EVENTDELETED ); @@ -2651,5 +2642,5 @@ void CalendarView::deleteEvent(Event *anEvent) schedule(Scheduler::Cancel,anEvent); - checkZaurusId( anEvent->zaurusId()); + checkExternalId( anEvent); mCalendar->deleteEvent(anEvent); changeEventDisplay(anEvent,KOGlobals::EVENTDELETED); @@ -2685,5 +2676,5 @@ void CalendarView::deleteEvent(Event *anEvent) if (anEvent->organizer()==KOPrefs::instance()->email() && anEvent->attendeeCount()>0) schedule(Scheduler::Cancel,anEvent); - checkZaurusId( anEvent->zaurusId()); + checkExternalId( anEvent); mCalendar->deleteEvent(anEvent); changeEventDisplay(anEvent, KOGlobals::EVENTDELETED); @@ -2693,5 +2684,5 @@ void CalendarView::deleteEvent(Event *anEvent) if (anEvent->organizer()==KOPrefs::instance()->email() && anEvent->attendeeCount()>0) schedule(Scheduler::Cancel,anEvent); - checkZaurusId( anEvent->zaurusId()); + checkExternalId( anEvent); mCalendar->deleteEvent(anEvent); changeEventDisplay(anEvent, KOGlobals::EVENTDELETED); @@ -3447,5 +3438,5 @@ bool CalendarView::removeCompletedSubTodos( Todo* t ) if ( deleteTodo ) { if ( t->isCompleted() ) { - checkZaurusId( t->zaurusId(), true ); + checkExternalId( t ); mCalendar->deleteTodo( t ); changeTodoDisplay( t,KOGlobals::EVENTDELETED ); |