KDE/kdepim

SVN commit 803324 by tokoe:

Extended the seralizer to support format versions


 M  +6 -2      akonadi/plugins/akonadi_serializer_addressee.cpp  
 M  +2 -2      akonadi/plugins/akonadi_serializer_addressee.h  
 M  +6 -2      akonadi/plugins/akonadi_serializer_bookmark.cpp  
 M  +2 -2      akonadi/plugins/akonadi_serializer_bookmark.h  
 M  +6 -2      akonadi/plugins/akonadi_serializer_kcal.cpp  
 M  +2 -2      akonadi/plugins/akonadi_serializer_kcal.h  
 M  +6 -2      akonadi/plugins/akonadi_serializer_mail.cpp  
 M  +2 -2      akonadi/plugins/akonadi_serializer_mail.h  
 M  +3 -2      akonadi/plugins/tests/mailserializertest.cpp  
 M  +6 -2      kmobiletools/kmobiletools/libkmobiletools/akonadi/akonadi_serializer_sms.cpp  
 M  +2 -2      kmobiletools/kmobiletools/libkmobiletools/akonadi/akonadi_serializer_sms.h  


--- trunk/KDE/kdepim/akonadi/plugins/akonadi_serializer_addressee.cpp #803323:803324
@@ -29,8 +29,10 @@
 
 using namespace Akonadi;
 
-bool SerializerPluginAddressee::deserialize( Item& item, const QByteArray& label, QIODevice& data )
+bool SerializerPluginAddressee::deserialize( Item& item, const QByteArray& label, QIODevice& data, int version )
 {
+    Q_UNUSED( version );
+
     if ( label != Item::FullPayload )
       return false;
 
@@ -43,8 +45,10 @@
     return true;
 }
 
-void SerializerPluginAddressee::serialize( const Item& item, const QByteArray& label, QIODevice& data )
+void SerializerPluginAddressee::serialize( const Item& item, const QByteArray& label, QIODevice& data, int &version )
 {
+    Q_UNUSED( version );
+
     if ( label != Item::FullPayload || !item.hasPayload<KABC::Addressee>() )
       return;
     const KABC::Addressee a = item.payload<KABC::Addressee>();
--- trunk/KDE/kdepim/akonadi/plugins/akonadi_serializer_addressee.h #803323:803324
@@ -33,8 +33,8 @@
     Q_INTERFACES( Akonadi::ItemSerializerPlugin )
 
 public:
-    bool deserialize( Item& item, const QByteArray& label, QIODevice& data );
-    void serialize( const Item& item, const QByteArray& label, QIODevice& data );
+    bool deserialize( Item& item, const QByteArray& label, QIODevice& data, int version );
+    void serialize( const Item& item, const QByteArray& label, QIODevice& data, int &version );
 private:
     KABC::VCardConverter m_converter;
 };
--- trunk/KDE/kdepim/akonadi/plugins/akonadi_serializer_bookmark.cpp #803323:803324
@@ -29,8 +29,10 @@
 
 using namespace Akonadi;
 
-bool SerializerPluginBookmark::deserialize( Item& item, const QByteArray& label, QIODevice& data )
+bool SerializerPluginBookmark::deserialize( Item& item, const QByteArray& label, QIODevice& data, int version )
 {
+  Q_UNUSED( version );
+
   if ( label != Item::FullPayload )
     return false;
 
@@ -44,8 +46,10 @@
   return true;
 }
 
-void SerializerPluginBookmark::serialize( const Item& item, const QByteArray& label, QIODevice& data )
+void SerializerPluginBookmark::serialize( const Item& item, const QByteArray& label, QIODevice& data, int &version )
 {
+  Q_UNUSED( version );
+
   if ( label != Item::FullPayload )
     return;
 
--- trunk/KDE/kdepim/akonadi/plugins/akonadi_serializer_bookmark.h #803323:803324
@@ -37,8 +37,8 @@
     Q_INTERFACES( Akonadi::ItemSerializerPlugin )
 
 public:
-  bool deserialize( Item& item, const QByteArray& label, QIODevice& data );
-  void serialize( const Item& item, const QByteArray& label, QIODevice& data );
+  bool deserialize( Item& item, const QByteArray& label, QIODevice& data, int version );
+  void serialize( const Item& item, const QByteArray& label, QIODevice& data, int &version );
 };
 
 }
--- trunk/KDE/kdepim/akonadi/plugins/akonadi_serializer_kcal.cpp #803323:803324
@@ -29,8 +29,10 @@
 
 using namespace Akonadi;
 
-bool SerializerPluginKCal::deserialize(Item & item, const QByteArray & label, QIODevice & data)
+bool SerializerPluginKCal::deserialize(Item & item, const QByteArray & label, QIODevice & data, int version)
 {
+  Q_UNUSED( version );
+
   if ( label != Item::FullPayload )
     return false;
 
@@ -45,8 +47,10 @@
   return true;
 }
 
-void SerializerPluginKCal::serialize(const Item & item, const QByteArray & label, QIODevice & data)
+void SerializerPluginKCal::serialize(const Item & item, const QByteArray & label, QIODevice & data, int &version)
 {
+  Q_UNUSED( version );
+
   if ( label != Item::FullPayload || !item.hasPayload<IncidencePtr>() )
     return;
   IncidencePtr i = item.payload<IncidencePtr>();
--- trunk/KDE/kdepim/akonadi/plugins/akonadi_serializer_kcal.h #803323:803324
@@ -33,8 +33,8 @@
     Q_INTERFACES( Akonadi::ItemSerializerPlugin )
 
   public:
-    bool deserialize( Item& item, const QByteArray& label, QIODevice& data );
-    void serialize( const Item& item, const QByteArray& label, QIODevice& data );
+    bool deserialize( Item& item, const QByteArray& label, QIODevice& data, int version );
+    void serialize( const Item& item, const QByteArray& label, QIODevice& data, int &version );
   private:
     KCal::ICalFormat mFormat;
 
--- trunk/KDE/kdepim/akonadi/plugins/akonadi_serializer_mail.cpp #803323:803324
@@ -51,8 +51,10 @@
 }
 
 
-bool SerializerPluginMail::deserialize( Item& item, const QByteArray& label, QIODevice& data )
+bool SerializerPluginMail::deserialize( Item& item, const QByteArray& label, QIODevice& data, int version )
 {
+    Q_UNUSED( version );
+
     if ( label != MessagePart::Body && label != MessagePart::Envelope && label != MessagePart::Header )
       return false;
 
@@ -151,8 +153,10 @@
   return buildImapList( addrList );
 }
 
-void SerializerPluginMail::serialize( const Item& item, const QByteArray& label, QIODevice& data )
+void SerializerPluginMail::serialize( const Item& item, const QByteArray& label, QIODevice& data, int &version )
 {
+  Q_UNUSED( version );
+
   boost::shared_ptr<Message> m = item.payload< boost::shared_ptr<Message> >();
   m->assemble();
   if ( label == MessagePart::Body ) {
--- trunk/KDE/kdepim/akonadi/plugins/akonadi_serializer_mail.h #803323:803324
@@ -33,8 +33,8 @@
     Q_INTERFACES( Akonadi::ItemSerializerPlugin )
 
 public:
-    bool deserialize( Item& item, const QByteArray& label, QIODevice& data );
-    void serialize( const Item& item, const QByteArray& label, QIODevice& data );
+    bool deserialize( Item& item, const QByteArray& label, QIODevice& data, int version );
+    void serialize( const Item& item, const QByteArray& label, QIODevice& data, int &version );
     QSet<QByteArray> parts( const Item &item ) const;
 };
 
--- trunk/KDE/kdepim/akonadi/plugins/tests/mailserializertest.cpp #803323:803324
@@ -43,7 +43,7 @@
   buffer.setData( env );
   buffer.open( QIODevice::ReadOnly );
   buffer.seek( 0 );
-  serializer->deserialize( i, MessagePart::Envelope, buffer );
+  serializer->deserialize( i, MessagePart::Envelope, buffer, 0 );
   QVERIFY( i.hasPayload<MessagePtr>() );
 
   MessagePtr msg = i.payload<MessagePtr>();
@@ -76,7 +76,8 @@
   buffer.setBuffer( &env );
   buffer.open( QIODevice::ReadWrite );
   buffer.seek( 0 );
-  serializer->serialize( i, MessagePart::Envelope, buffer );
+  int version = 0;
+  serializer->serialize( i, MessagePart::Envelope, buffer, version );
   QCOMPARE( env, expEnv );
 
   delete serializer;
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/libkmobiletools/akonadi/akonadi_serializer_sms.cpp #803323:803324
@@ -51,8 +51,10 @@
 }
 
 
-bool SerializerPluginSMS::deserialize( Item& item, const QByteArray& label, QIODevice& data )
+bool SerializerPluginSMS::deserialize( Item& item, const QByteArray& label, QIODevice& data, int version )
 {
+    Q_UNUSED( version );
+
     kDebug() <<"()" << label;
     if ( label != "SMS" ) {
       return false;
@@ -112,8 +114,10 @@
 }
 
 
-void SerializerPluginSMS::serialize( const Item& item, const QByteArray& label, QIODevice& data )
+void SerializerPluginSMS::serialize( const Item& item, const QByteArray& label, QIODevice& data, int &version )
 {
+    Q_UNUSED( version );
+
     kDebug() <<"()" << label;
     if ( label != "SMS" )
       return;
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/libkmobiletools/akonadi/akonadi_serializer_sms.h #803323:803324
@@ -29,8 +29,8 @@
 class SerializerPluginSMS : public ItemSerializerPlugin
 {
 public:
-    bool deserialize( Item& item, const QByteArray& label, QIODevice& data );
-    void serialize( const Item& item, const QByteArray& label, QIODevice& data );
+    bool deserialize( Item& item, const QByteArray& label, QIODevice& data, int version );
+    void serialize( const Item& item, const QByteArray& label, QIODevice& data, int &version );
 };
 
 
_______________________________________________
kmobiletools mailing list
kmobiletools@...
https://mail.kde.org/mailman/listinfo/kmobiletools