[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/kpilot/conduits/vcalconduit
From:       Adriaan de Groot <groot () kde ! org>
Date:       2004-07-04 1:36:48
Message-ID: 20040704013648.CDBA599AA () office ! kde ! org
[Download RAW message or body]

CVS commit by adridg: 

style fixes; verbosity++


  M +23 -12    vcal-conduitbase.cc   1.70


--- kdepim/kpilot/conduits/vcalconduit/vcal-conduitbase.cc  #1.69:1.70
@@ -167,4 +167,5 @@ there are two special cases: a full and 
                 // TODO: Clear the palm and backup database??? Or just add the new items ignore
                 // the Palm->PC side and leave the existing items on the palm?
+                emit logMessage(i18n("Copying records to Pilot ..."));
                 QTimer::singleShot(0, this, SLOT(slotPCRecToPalm()));
                 break;
@@ -173,4 +174,5 @@ there are two special cases: a full and 
                 //       or just add the palm items and leave the PC ones there????
         default:
+                emit logMessage(i18n("Copying records to PC ..."));
                 QTimer::singleShot(0, this, SLOT(slotPalmRecToPC()));
         }
@@ -218,5 +220,6 @@ error:
         switch(config()->calendarType())
         {
-                case VCalConduitSettings::eCalendarLocal:{
+                case VCalConduitSettings::eCalendarLocal:
+                {
 #ifdef DEBUG
                         DEBUGCONDUIT << fname
@@ -302,5 +305,6 @@ error:
                         }
                         addSyncLogEntry(i18n("Syncing with file \"%1\"").arg(config()->calendarFile()));
-                        break;}
+                        break;
+                }
 
                 case VCalConduitSettings::eCalendarResource:
@@ -338,10 +342,15 @@ error:
         }
         fP = newVCalPrivate(fCalendar);
-        if (!fP) return false;
+        if (!fP)
+        {
+                return false;
+        }
         fP->updateIncidences();
         if (fP->count()<1)
+        {
                 fFirstSync=true;
+        }
 
-        return (fCalendar && fP);
+        return true;
 }
 
@@ -368,4 +377,5 @@ void VCalConduitBase::slotPalmRecToPC()
                 if (getSyncDirection()==SyncAction::eCopyHHToPC)
                 {
+                        emit logMessage(i18n("Cleaning up ..."));
                         QTimer::singleShot(0, this, SLOT(cleanup()));
                         return;
@@ -373,4 +383,5 @@ void VCalConduitBase::slotPalmRecToPC()
                 else
                 {
+                        emit logMessage(i18n("Copying records to Pilot ..."));
                         QTimer::singleShot(0 ,this,SLOT(slotPCRecToPalm()));
                         return;


[prev in list] [next in list] [prev in thread] [next in thread]