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

List:       kde-commits
Subject:    kdepim/kresources/opengroupware
From:       Till Adam <adam () kde ! org>
Date:       2004-11-01 0:50:22
Message-ID: 20041101005022.C56A116BF3 () office ! kde ! org
[Download RAW message or body]

CVS commit by tilladam: 

Delete properly for all folders.


  M +9 -8      kcal_resourceopengroupware.cpp   1.21
  M +2 -1      kcal_resourceopengroupware.h   1.10


--- kdepim/kresources/opengroupware/kcal_resourceopengroupware.cpp  #1.20:1.21
@@ -164,4 +164,5 @@ bool OpenGroupware::doLoad()
 
   mIncidencesForDownload.clear();
+  mCurrentlyOnServer.clear();
 
   mProgress = KPIM::ProgressManager::instance()->createProgressItem(
@@ -184,4 +185,7 @@ void OpenGroupware::listIncidences()
       mProgress->updateProgress();
     }
+
+    /* Delete incidences no longer present on the server */
+    deleteIncidencesGoneFromServer();
     downloadNextIncidence();
   } else {
@@ -221,5 +225,4 @@ void OpenGroupware::slotListJobResult( K
   } else {
     QDomDocument doc = mListEventsJob->response();
-    QStringList currentlyOnServer;
 
     //kdDebug(7000) << " Doc: " << doc.toString() << endl;
@@ -243,5 +246,5 @@ void OpenGroupware::slotListJobResult( K
       const QString &newFingerprint = e.text();
 
-      currentlyOnServer << location;
+      mCurrentlyOnServer << location;
       /* if not locally present, download */
       const QString &localId = idMapper().localId( location );
@@ -275,6 +278,4 @@ void OpenGroupware::slotListJobResult( K
       }
     }
-    /* Delete incidences no longer present on the server */
-    deleteIncidencesGoneFromServer( currentlyOnServer );
   }
   mListEventsJob = 0;
@@ -283,9 +284,9 @@ void OpenGroupware::slotListJobResult( K
 }
 
-void OpenGroupware::deleteIncidencesGoneFromServer( const QStringList &serverlist )
+void OpenGroupware::deleteIncidencesGoneFromServer()
 {
   QMap<QString, QString> remoteIds( idMapper().remoteIdMap() );
-  QStringList::ConstIterator it = serverlist.begin();
-  while ( it != serverlist.end() ) {
+  QStringList::ConstIterator it = mCurrentlyOnServer.begin();
+  while ( it != mCurrentlyOnServer.end() ) {
     remoteIds.remove( (*it) );
     ++it;

--- kdepim/kresources/opengroupware/kcal_resourceopengroupware.h  #1.9:1.10
@@ -80,5 +80,5 @@ class OpenGroupware : public ResourceCac
 
     void listIncidences();
-    void deleteIncidencesGoneFromServer( const QStringList &serverlist );
+    void deleteIncidencesGoneFromServer();
 
   protected slots:
@@ -108,4 +108,5 @@ class OpenGroupware : public ResourceCac
 
     QStringList mFoldersForDownload;
+    QStringList mCurrentlyOnServer;
 
     QStringList mIncidencesForDownload;


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