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

List:       kde-commits
Subject:    KDE/kdepim/akonadi/plugins
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2008-04-21 17:45:50
Message-ID: 1208799950.647584.15740.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 799505 by tokoe:

Replaced^Ported the KPIM::PluginLoader by a QPluginLoader based version


 M  +5 -5      akonadi_serializer_addressee.cpp  
 M  +6 -1      akonadi_serializer_addressee.h  
 M  +4 -5      akonadi_serializer_bookmark.cpp  
 M  +10 -3     akonadi_serializer_bookmark.h  
 M  +4 -6      akonadi_serializer_kcal.cpp  
 M  +6 -1      akonadi_serializer_kcal.h  
 M  +5 -5      akonadi_serializer_mail.cpp  
 M  +6 -1      akonadi_serializer_mail.h  
 M  +1 -0      tests/CMakeLists.txt  


--- trunk/KDE/kdepim/akonadi/plugins/akonadi_serializer_addressee.cpp #799504:799505
@@ -17,6 +17,8 @@
     02110-1301, USA.
 */
 
+#include <QtCore/qplugin.h>
+
 #include "akonadi_serializer_addressee.h"
 
 #include <kabc/addressee.h>
@@ -49,8 +51,6 @@
     data.write( m_converter.createVCard( a ) );
 }
 
-extern "C"
-KDE_EXPORT Akonadi::ItemSerializerPlugin *
-akonadi_serializer_addressee_create_item_serializer_plugin() {
-  return new SerializerPluginAddressee();
-}
+Q_EXPORT_PLUGIN2( akonadi_serializer_addressee, Akonadi::SerializerPluginAddressee )
+
+#include "akonadi_serializer_addressee.moc"
--- trunk/KDE/kdepim/akonadi/plugins/akonadi_serializer_addressee.h #799504:799505
@@ -20,13 +20,18 @@
 #ifndef __AKONADI_SERIALIZER_ADDRESSEE_H__
 #define __AKONADI_SERIALIZER_ADDRESSEE_H__
 
+#include <QtCore/QObject>
+
 #include <akonadi/itemserializerplugin.h>
 #include <kabc/vcardconverter.h>
 
 namespace Akonadi {
 
-class SerializerPluginAddressee : public ItemSerializerPlugin
+class SerializerPluginAddressee : public QObject, public ItemSerializerPlugin
 {
+    Q_OBJECT
+    Q_INTERFACES( Akonadi::ItemSerializerPlugin )
+
 public:
     bool deserialize( Item& item, const QByteArray& label, QIODevice& data );
     void serialize( const Item& item, const QByteArray& label, QIODevice& data );
--- trunk/KDE/kdepim/akonadi/plugins/akonadi_serializer_bookmark.cpp #799504:799505
@@ -19,6 +19,7 @@
 
 #include "akonadi_serializer_bookmark.h"
 
+#include <QtCore/qplugin.h>
 #include <QDebug>
 #include <QMimeData>
 #include <kbookmark.h>
@@ -62,8 +63,6 @@
 
 }
 
-extern "C"
-KDE_EXPORT Akonadi::ItemSerializerPlugin *
-akonadi_serializer_bookmark_create_item_serializer_plugin() {
-  return new SerializerPluginBookmark();
-}
+Q_EXPORT_PLUGIN2( akonadi_serializer_bookmark, SerializerPluginBookmark );
+
+#include "akonadi_serializer_bookmark.moc"
--- trunk/KDE/kdepim/akonadi/plugins/akonadi_serializer_bookmark.h #799504:799505
@@ -20,20 +20,27 @@
 #ifndef __AKONADI_SERIALIZER_BOOKMARK_H__
 #define __AKONADI_SERIALIZER_BOOKMARK_H__
 
+#include <QtCore/QObject>
+
 #include <akonadi/itemserializerplugin.h>
 
 class QIODevice;
 class QString;
 
-class Akonadi::Item;
+namespace Akonadi {
 
-using namespace Akonadi;
+class Item;
 
-class SerializerPluginBookmark : public ItemSerializerPlugin
+class SerializerPluginBookmark : public QObject, public ItemSerializerPlugin
 {
+    Q_OBJECT
+    Q_INTERFACES( Akonadi::ItemSerializerPlugin )
+
 public:
   bool deserialize( Item& item, const QByteArray& label, QIODevice& data );
   void serialize( const Item& item, const QByteArray& label, QIODevice& data );
 };
 
+}
+
 #endif
--- trunk/KDE/kdepim/akonadi/plugins/akonadi_serializer_kcal.cpp #799504:799505
@@ -19,6 +19,8 @@
 
 #include "akonadi_serializer_kcal.h"
 
+#include <QtCore/qplugin.h>
+
 #include <akonadi/item.h>
 #include <kdebug.h>
 #include <boost/shared_ptr.hpp>
@@ -54,10 +56,6 @@
   data.write( "\nEND:VCALENDAR" );
 }
 
-extern "C"
-KDE_EXPORT Akonadi::ItemSerializerPlugin *
-akonadi_serializer_kcal_create_item_serializer_plugin() {
-  return new SerializerPluginKCal();
-}
+Q_EXPORT_PLUGIN2( akonadi_serializer_kcal, SerializerPluginKCal );
 
-
+#include "akonadi_serializer_kcal.moc"
--- trunk/KDE/kdepim/akonadi/plugins/akonadi_serializer_kcal.h #799504:799505
@@ -20,13 +20,18 @@
 #ifndef AKONADI_SERIALIZER_KCAL_H
 #define AKONADI_SERIALIZER_KCAL_H
 
+#include <QtCore/QObject>
+
 #include <akonadi/itemserializerplugin.h>
 #include <kcal/icalformat.h>
 
 namespace Akonadi {
 
-class SerializerPluginKCal : public ItemSerializerPlugin
+class SerializerPluginKCal : public QObject, public ItemSerializerPlugin
 {
+    Q_OBJECT
+    Q_INTERFACES( Akonadi::ItemSerializerPlugin )
+
   public:
     bool deserialize( Item& item, const QByteArray& label, QIODevice& data );
     void serialize( const Item& item, const QByteArray& label, QIODevice& data );
--- trunk/KDE/kdepim/akonadi/plugins/akonadi_serializer_mail.cpp #799504:799505
@@ -19,6 +19,8 @@
 
 #include "akonadi_serializer_mail.h"
 
+#include <QtCore/qplugin.h>
+
 #include <kdebug.h>
 #include <kmime/kmime_message.h>
 #include <boost/shared_ptr.hpp>
@@ -188,8 +190,6 @@
   return set;
 }
 
-extern "C"
-KDE_EXPORT Akonadi::ItemSerializerPlugin *
-akonadi_serializer_mail_create_item_serializer_plugin() {
-  return new SerializerPluginMail();
-}
+Q_EXPORT_PLUGIN2( akonadi_serializer_mail, SerializerPluginMail );
+
+#include "akonadi_serializer_mail.moc"
--- trunk/KDE/kdepim/akonadi/plugins/akonadi_serializer_mail.h #799504:799505
@@ -21,12 +21,17 @@
 #ifndef __AKONADI_SERIALIZER_MAIL_H__
 #define __AKONADI_SERIALIZER_MAIL_H__
 
+#include <QtCore/QObject>
+
 #include <akonadi/itemserializerplugin.h>
 
 namespace Akonadi {
 
-class SerializerPluginMail : public ItemSerializerPlugin
+class SerializerPluginMail : public QObject, public ItemSerializerPlugin
 {
+    Q_OBJECT
+    Q_INTERFACES( Akonadi::ItemSerializerPlugin )
+
 public:
     bool deserialize( Item& item, const QByteArray& label, QIODevice& data );
     void serialize( const Item& item, const QByteArray& label, QIODevice& data );
--- trunk/KDE/kdepim/akonadi/plugins/tests/CMakeLists.txt #799504:799505
@@ -3,6 +3,7 @@
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/../
+    ${CMAKE_CURRENT_BINARY_DIR}/../
     ${CMAKE_CURRENT_SOURCE_DIR}
         ${Boost_INCLUDE_DIR}
 )
[prev in list] [next in list] [prev in thread] [next in thread]