phone fixes

1 files changed, 28 insertions, 30 deletions

diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp
index 6d0da5c..178a63e 100644
--- a/libkcal/phoneformat.cpp
+++ b/libkcal/phoneformat.cpp
@@ -129,46 +129,46 @@ ulong PhoneFormat::getCsumTodo( Todo* todo )
     if ( todo->isCompleted() )
         completedString = "yes";
     attList << completedString; 
     int prio = todo->priority();
     if( prio == 2 ) prio = 1;
     if (prio == 4 ) prio = 5 ;
     attList << QString::number( prio ); 
     QString alarmString = "na";
     Alarm *alarm;
     if (  todo->alarms().count() > 0 ) {
         alarm = todo->alarms().first();
         if ( alarm->enabled() ) {
-            alarmString = QString::number(alarm->startOffset().asSeconds()  );
+            alarmString = QString::number(alarm->offset() );
         }
     }
     attList << alarmString;
     attList << todo->categoriesStr();
     attList << todo->secrecyStr(); 
     return PhoneFormat::getCsum(attList );  
 
 }
 ulong PhoneFormat::getCsumEvent( Event* event )
 {
     QStringList  attList;
     attList << PhoneParser::dtToString ( event->dtStart() );
     attList << PhoneParser::dtToString ( event->dtEnd() );
     attList <<  event->summary();
     attList <<  event->location();
     QString alarmString = "na";
     Alarm *alarm;
     if (  event->alarms().count() > 0 ) {
         alarm = event->alarms().first();
         if ( alarm->enabled() ) {
-            alarmString = QString::number( alarm->startOffset().asSeconds() );
+            alarmString = QString::number( alarm->offset() );
         }
     }
     attList <<  alarmString;
     Recurrence* rec = event->recurrence();
     QStringList  list;
     bool writeEndDate = false;
     switch ( rec->doesRecur() )
         {
         case Recurrence::rDaily: // 0
             list.append( "0" );
             list.append( QString::number( rec->frequency() ));//12
             list.append( "0" );
@@ -268,49 +268,48 @@ ulong PhoneFormat::getCsum( const QStringList &  attList)
             for ( k = 0; k < j; ++k ) {
                 int mul = k +1;
                 add = s[k].unicode ();
                 if ( k < 16 )
                     mul = mul * mul;
                 int ii = i+1;
                 add = add * mul *ii*ii*ii;
                 cSum += add;
             }
         }
             
     }
-    QString dump = attList.join(",");
-    qDebug("csum: %d %s", cSum,dump.latin1()); 
+    //QString dump = attList.join(",");
+    //qDebug("csum: %d %s", cSum,dump.latin1()); 
     
     return cSum;
 
 }
 //extern "C" GSM_Error GSM_InitConnection(GSM_StateMachine *s, int ReplyNum);
 #include <stdlib.h>
 #define DEBUGMODE false
 bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal)
 {
 
     QString fileName;
 #ifdef _WIN32_
     fileName = locateLocal("data", "korganizer") + "\\tempfile.vcs";
 #else
     fileName = "/tmp/kdepimtemp.vcs";
 #endif
     QString command ="./kammu --backup " + fileName + " -yes" ;
     int ret = system (  command.latin1() );
     if ( ret != 0 ) {
         qDebug("Error::command returned %d", ret); 
         return false;
     }
-    qDebug("Command returned %d", ret); 
     VCalFormat vfload;
     vfload.setLocalTime ( true ); 
     qDebug("loading file ..."); 
 
     if ( ! vfload.load( calendar, fileName ) )
         return false;
     QPtrList<Event> er = calendar->rawEvents();
     Event* ev = er.first();  
     qDebug("reading events... "); 
     while ( ev ) {
         QStringList cat = ev->categories();
         if ( cat.contains( "MeetingDEF" )) {
@@ -339,25 +338,25 @@ bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal)
         QPtrList<Todo> tr = calendar->rawTodos();
         Todo* ev = tr.first();  
         while ( ev ) {
 
             QStringList cat = ev->categories();
             if ( cat.contains( "MeetingDEF" )) {
                 ev->setCategories( QStringList() );
             }
             int id = ev->pilotId();
             Todo *event;
             event = existingCal->todo( mProfileName ,QString::number( id ) );
             if ( event ) {
-                qDebug("copy todo %s ", event->summary().latin1()); 
+                //qDebug("copy todo %s ", event->summary().latin1()); 
 
                 event = (Todo*)event->clone();
                 copyTodo( event,  ev );
                 calendar->deleteTodo( ev );
                 calendar->addTodo( event);
             }
             else
                 event = ev;
             uint cSum;
             cSum = PhoneFormat::getCsumTodo( event );
             event->setCsum( mProfileName, QString::number( cSum ));
             event->setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL );
@@ -371,33 +370,35 @@ void PhoneFormat::copyEvent( Event* to,  Event* from )
 {
     if ( from->dtStart().isValid() )
         to->setDtStart(  from->dtStart() );
     if ( from->dtEnd().isValid() )
         to->setDtEnd(  from->dtEnd() );
     if ( !from->location().isEmpty() )
         to->setLocation(  from->location() );
     if ( !from->description().isEmpty() )
         to->setDescription(  from->description() );
     if ( !from->summary().isEmpty() )
         to->setSummary(  from->summary() );
 
-    QPtrListIterator<Alarm> it( from->alarms() );
-    if ( it.current() )
+    if ( from->alarms().count() ) {
         to->clearAlarms();
-    const Alarm *a;
-    while( (a = it.current()) ) {
-        Alarm *b = new Alarm( *a );
-        b->setParent( to );
-        to->addAlarm( b );
-        ++it;
+        Alarm *a = from->alarms().first();
+        Alarm *b = to->newAlarm( );
+        b->setEnabled( a->enabled()  );
+        if ( a->hasStartOffset() ) {
+            b->setStartOffset( a->startOffset() );
+        }
+        if ( a->hasTime() )
+            b->setTime( a->time() );
+    
     }
     QStringList cat = to->categories();
     QStringList catFrom = from->categories();
     QString nCat;
     int iii;
     for ( iii = 0; iii < catFrom.count();++iii ) {
         nCat = catFrom[iii];
         if ( !nCat.isEmpty() )
             if ( !cat.contains( nCat )) {
                 cat << nCat;
             }
     }
@@ -411,34 +412,35 @@ void PhoneFormat::copyTodo( Todo* to,  Todo* from )
 {
     if ( from->dtStart().isValid() )
         to->setDtStart(  from->dtStart() );
     if ( from->dtDue().isValid() )
         to->setDtDue(  from->dtDue() );
     if ( !from->location().isEmpty() )
         to->setLocation(  from->location() );
     if ( !from->description().isEmpty() )
         to->setDescription(  from->description() );
     if ( !from->summary().isEmpty() )
         to->setSummary(  from->summary() );
 
-    QPtrListIterator<Alarm> it( from->alarms() );
-    if ( it.current() )
+    if ( from->alarms().count() ) {
         to->clearAlarms();
-    const Alarm *a;
-    while( (a = it.current()) ) {
-        Alarm *b = new Alarm( *a );
-        b->setParent( to );
-        to->addAlarm( b );
-        ++it;
+        Alarm *a = from->alarms().first();
+        Alarm *b = to->newAlarm( );
+        b->setEnabled( a->enabled()  );
+        if ( a->hasStartOffset() )
+            b->setStartOffset( a->startOffset() );
+        if ( a->hasTime() )
+            b->setTime( a->time() );
     }
+   
     QStringList cat = to->categories();
     QStringList catFrom = from->categories();
     QString nCat;
     int iii;
     for ( iii = 0; iii < catFrom.count();++iii ) {
         nCat = catFrom[iii];
         if ( !nCat.isEmpty() )
             if ( !cat.contains( nCat )) {
                 cat << nCat;
             }
     }
     to->setCategories( cat );
@@ -524,28 +526,25 @@ bool PhoneFormat::save( Calendar *calendar)
     if ( ! vfsave.save( calendar, fileName ) )
         return false;
     // 4 call kammu
     QString command ="./kammu --restore " + fileName ;
     int ret;
     while ( (ret = system (  command.latin1())) != 0 ) {
         qDebug("Error S::command returned %d. asking users", ret); 
         int retval = KMessageBox::warningContinueCancel(0,
                                                         i18n("Error accessing device!\nPlease turn on connection\nand retry!"),i18n("KO/Pi phone sync"),i18n("Retry"),i18n("Cancel"));
         if ( retval != KMessageBox::Continue )
             return false;
     }
-    if ( ret !=  0 ) {
-        qDebug("Error S::command returned %d", ret); 
-        return false;
-    }
+    
     // 5 reread data
     message = i18n(" Rereading all data ... ");
     status.setText ( message  );
     qApp->processEvents();
     CalendarLocal* calendarTemp = new CalendarLocal(); 
     calendarTemp->setTimeZoneId( calendar->timeZoneId());
     if ( ! load( calendarTemp,calendar) ){
         qDebug("error reloading calendar ");
         delete calendarTemp;
         return false;
     }
     // 6 compare data
@@ -570,59 +569,58 @@ bool PhoneFormat::save( Calendar *calendar)
             while ( ev1 ) {
                 if (  ev1->getCsum( mProfileName ) == cSum ) {
                     er1.remove( ev1 );
                     afterSave( ev );
                     ev->setID(mProfileName, ev1->getID(mProfileName) );
                     //qDebug("Event found  on phone for %s ", ev->summary().latin1());
 
                     break;
                 }
                 ev1 =  er1.next();
             } 
             if ( ! ev1 ) {
-                ev->removeID(mProfileName);
+                // ev->removeID(mProfileName);
                 qDebug("ERROR: No event found  on phone for %s ", ev->summary().latin1());
             }
             
         
         ev =  er.next();
     }
     //algo 6 compare todo
     tl = calendar->rawTodos(); 
     to = tl.first();
     procCount = 0;
     QPtrList<Todo> tl1 = calendarTemp->rawTodos(); 
     Todo* to1 ;
     message = i18n(" Comparing todo # ");
     while ( to  ) {
-        qDebug("todo2 %d ", procCount);
             status.setText ( message + QString::number ( ++procCount ) );
             qApp->processEvents();
             uint csum;
             csum = PhoneFormat::getCsumTodo( to );
             QString cSum = QString::number( csum );
             //to->setCsum( mProfileName,  cSum );
-            qDebug("Todo cSum %s ", cSum.latin1());
+            //qDebug("Todo cSum %s ", cSum.latin1());
             Todo* to1 = tl1.first(); 
             while ( to1 ) {
                 if (  to1->getCsum( mProfileName ) == cSum ) {
                     tl1.remove( to1 );
                     afterSave( to );
                     to->setID(mProfileName, to1->getID(mProfileName) );
                     break;
                 }
                 to1 =  tl1.next();
             }
             if ( ! to1 ) {
-                to->removeID(mProfileName);
+                //to->removeID(mProfileName);
                 qDebug("ERROR: No todo found on phone for %s ", to->summary().latin1());
             }
         
         to = tl.next();
     }
     delete calendarTemp;
     return true;
 
 
 
 }