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

List:       kde-commits
Subject:    proko2: kdepim/kresources/kolab/shared
From:       Bo Thorsen <bo () sonofthor ! dk>
Date:       2004-06-29 13:44:16
Message-ID: 20040629134416.A2DE099BD () office ! kde ! org
[Download RAW message or body]

CVS commit by thorsen: 

Update the serial number on all writes


  M +8 -5      kmailconnection.cpp   1.1.2.13
  M +1 -1      kmailconnection.h   1.1.2.9
  M +1 -9      resourcekolabbase.cpp   1.1.2.7
  M +6 -8      resourcekolabbase.h   1.1.2.12


--- kdepim/kresources/kolab/shared/kmailconnection.cpp  #1.1.2.12:1.1.2.13
@@ -207,12 +207,15 @@ bool KMailConnection::kmailDeleteInciden
 
 bool KMailConnection::kmailUpdate( const QString& resource,
-                                   Q_UINT32 sernum,
+                                   Q_UINT32& sernum,
                                    const QStringList& attachments,
                                    const QStringList& deletedAttachments )
 {
-  return connectToKMail()
-    && mKMailIcalIfaceStub->update( resource, sernum, attachments,
-                                    deletedAttachments )
-    && mKMailIcalIfaceStub->ok();
+  if ( connectToKMail() ) {
+    sernum = mKMailIcalIfaceStub->update( resource, sernum, attachments,
+                                          deletedAttachments );
+
+    return sernum && mKMailIcalIfaceStub->ok();
+  } else
+    return false;
 }
 

--- kdepim/kresources/kolab/shared/kmailconnection.h  #1.1.2.8:1.1.2.9
@@ -79,5 +79,5 @@ public:
                            const QString& filename );
   bool kmailDeleteIncidence( const QString& resource, Q_UINT32 sernum );
-  bool kmailUpdate( const QString& resource, Q_UINT32 sernum,
+  bool kmailUpdate( const QString& resource, Q_UINT32& sernum,
                     const QStringList& attachments,
                     const QStringList& deletedAttachments );

--- kdepim/kresources/kolab/shared/resourcekolabbase.cpp  #1.1.2.6:1.1.2.7
@@ -77,12 +77,4 @@ bool ResourceKolabBase::kmailGetAttachme
 }
 
-bool ResourceKolabBase::kmailAddIncidence( const QString& resource,
-                                           const QString& xml,
-                                           const QStringList& attachments )
-{
-  return kmailUpdate( resource, 0, xml, attachments,
-                      QStringList() );
-}
-
 bool ResourceKolabBase::kmailDeleteIncidence( const QString& resource,
                                               Q_UINT32 sernum )
@@ -92,5 +84,5 @@ bool ResourceKolabBase::kmailDeleteIncid
 
 bool ResourceKolabBase::kmailUpdate( const QString& resource,
-                                     Q_UINT32 sernum,
+                                     Q_UINT32& sernum,
                                      const QString& xml,
                                      const QStringList& attachments,

--- kdepim/kresources/kolab/shared/resourcekolabbase.h  #1.1.2.11:1.1.2.12
@@ -37,9 +37,9 @@
 #include <qstring.h>
 #include <qmap.h>
+#include <qstringlist.h>
 
 #include "subresource.h"
 
 class QCString;
-class QStringList;
 class KURL;
 
@@ -117,15 +117,13 @@ protected:
                            const QString& filename ) const;
 
-  /// Add a new incidence. The list of attachments are URLs.
-  bool kmailAddIncidence( const QString& resource, const QString& xml,
-                          const QStringList& attachments );
-
   /// Delete an incidence.
   bool kmailDeleteIncidence( const QString& resource, Q_UINT32 sernum );
 
   /// Update an incidence. The list of attachments are URLs.
-  bool kmailUpdate( const QString& resource, Q_UINT32 sernum,
-                    const QString& xml, const QStringList& attachments,
-                    const QStringList& deletedAttachments );
+  /// The parameter sernum is updated with the right KMail serial number
+  bool kmailUpdate( const QString& resource, Q_UINT32& sernum,
+                    const QString& xml,
+                    const QStringList& attachments = QStringList(),
+                    const QStringList& deletedAttachments = QStringList() );
 
   /// Get the full path of the config file.


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