implemented the exportclasses for opie, qtopia and sharp as part of kaddressbook and not as additional libraries.

5 files changed, 77 insertions, 8 deletions

diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro
index 77fce1b..0da5842 100644
--- a/kaddressbook/kaddressbook.pro
+++ b/kaddressbook/kaddressbook.pro
@@ -6,7 +6,7 @@ DESTDIR= ../bin
 include( ../variables.pri )
 
 
-INCLUDEPATH += . ./details  ./features ./kcmconfigs  ./xxport ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../kabc  ../ interfaces 
+INCLUDEPATH += . ./details  ./features ./kcmconfigs  ./xxport ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc  ../ interfaces 
 DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION
 
 unix : {
@@ -97,6 +97,9 @@ xxport/vcard_xxport.h \
 xxport/kde2_xxport.h \
 xxport/csv_xxport.h \
 xxport/csvimportdialog.h \
+xxport/opie_xxport.h \
+xxport/qtopia_xxport.h \
+xxport/sharpdtm_xxport.h \
 #details/look_details.h \
 #mainwindoiw.h \
 # alarmclient.h \
@@ -160,6 +163,9 @@ xxport/vcard_xxport.cpp \
 xxport/kde2_xxport.cpp \
 xxport/csv_xxport.cpp \
 xxport/csvimportdialog.cpp \
+xxport/opie_xxport.cpp \
+xxport/qtopia_xxport.cpp \
+xxport/sharpdtm_xxport.cpp \
 #details/look_details.cpp \
 #mainwindow.cpp \
 # calendarview.cpp \
diff --git a/kaddressbook/kaddressbookE.pro b/kaddressbook/kaddressbookE.pro
index dc4a2f2..95e6641 100644
--- a/kaddressbook/kaddressbookE.pro
+++ b/kaddressbook/kaddressbookE.pro
@@ -10,7 +10,7 @@ DESTDIR=$(QPEDIR)/bin
 #LFLAGS += -Wl,-export-dynamic
 
 
-INCLUDEPATH += . ./details ./features ./kcmconfigs ./xxport ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../kabc ../qtcompat ../ interfaces $(QPEDIR)/include
+INCLUDEPATH += . ./details ./features ./kcmconfigs ./xxport ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../qtcompat ../ interfaces $(QPEDIR)/include
 DEFINES += KAB_EMBEDDED KAB_NOSPLITTER
 #DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOKABC KORG_NOARCHIVE KORG_NOMAIL
 #DEFINES += KORG_NOPRINTER  KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
@@ -87,6 +87,9 @@ xxport/vcard_xxport.h \
 xxport/kde2_xxport.h \
 xxport/csv_xxport.h \
 xxport/csvimportdialog.h \
+xxport/opie_xxport.h \
+xxport/qtopia_xxport.h \
+xxport/sharpdtm_xxport.h \
 #details/look_details.h \
 #mainwindoiw.h \
 # alarmclient.h \
@@ -150,6 +153,9 @@ xxport/vcard_xxport.cpp \
 xxport/kde2_xxport.cpp \
 xxport/csv_xxport.cpp \
 xxport/csvimportdialog.cpp \
+xxport/opie_xxport.cpp \
+xxport/qtopia_xxport.cpp \
+xxport/sharpdtm_xxport.cpp \
 #details/look_details.cpp \
 #mainwindow.cpp \
 # calendarview.cpp \
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index 2962951..a6797c9 100644
--- a/kaddressbook/xxportmanager.cpp
+++ b/kaddressbook/xxportmanager.cpp
@@ -43,9 +43,12 @@ $Id$
 #else //KAB_EMBEDDED
 extern "C"
 {
-  void* init_kaddrbk_csv_xxport();
-  void* init_kaddrbk_kde2_xxport();
-  void* init_kaddrbk_vcard_xxport();
+  void* init_microkaddrbk_csv_xxport();
+  void* init_microkaddrbk_kde2_xxport();
+  void* init_microkaddrbk_vcard_xxport();
+  void* init_microkaddrbk_opie_xxport();
+  void* init_microkaddrbk_qtopia_xxport();
+  void* init_microkaddrbk_sharpdtm_xxport();
 }
 #endif //KAB_EMBEDDED
 
@@ -192,9 +195,9 @@ void XXPortManager::loadPlugins()
 
 #else //KAB_EMBEDDED
   QList<XXPortFactory> factorylist;
-  factorylist.append(static_cast<XXPortFactory*>(init_kaddrbk_csv_xxport()));
-  factorylist.append(static_cast<XXPortFactory*>(init_kaddrbk_kde2_xxport()));
-  factorylist.append(static_cast<XXPortFactory*>(init_kaddrbk_vcard_xxport()));
+  factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_csv_xxport()));
+  factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_kde2_xxport()));
+  factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_vcard_xxport()));
 
   //add the opie import library dynamically
   KLibFactory *factory = KLibLoader::self()->factory( "microkaddrbk_opie_xxport" );
diff --git a/kaddressbook/xxportobject.cpp b/kaddressbook/xxportobject.cpp
index 42ab0fb..bb985a6 100644
--- a/kaddressbook/xxportobject.cpp
+++ b/kaddressbook/xxportobject.cpp
@@ -147,6 +147,27 @@ void XXPortObject::slotImportActivated( const QString &data )
   emit importActivated( identifier(), ( data == "<empty>" ? QString::null : data ) );
 }
 
+/********************************************************************
+ *
+ *******************************************************************/
+
+
+XXPortResourceObject::XXPortResourceObject( KABC::AddressBook *ab, QWidget *parent,
+                            const char *name )
+  : XXPortObject( ab, parent, name ), mResource(0)
+{
+}
+
+XXPortResourceObject::~XXPortResourceObject()
+{
+}
+
+bool XXPortResourceObject::isAvailable()
+{
+  return (mResource != 0);
+}
+
+
 #ifndef KAB_EMBEDDED
 #include "xxportobject.moc"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/xxportobject.h b/kaddressbook/xxportobject.h
index fddc219..d547855 100644
--- a/kaddressbook/xxportobject.h
+++ b/kaddressbook/xxportobject.h
@@ -35,10 +35,14 @@ $Id$
 
 #include <kabc/addressbook.h>
 #include <kabc/addresseelist.h>
+#include <kabc/resource.h>
 #include <kxmlguiclient.h>
 #include <klibloader.h>
 
 
+
+
+
 class XXPortObject : public QObject, virtual public KXMLGUIClient
 {
   Q_OBJECT
@@ -59,6 +63,13 @@ class XXPortObject : public QObject, virtual public KXMLGUIClient
      */
     virtual bool requiresSorting() const { return false; }
 
+    /**
+      Returns true if the XXPortObject can be used.
+      One case it can not be used is for example if a needed lib could not be loaded.
+     */
+        virtual bool isAvailable() const { return true; };
+
+
   public slots:
     /**
       Reimplement this method for exporting the contacts.
@@ -120,6 +131,28 @@ class XXPortObject : public QObject, virtual public KXMLGUIClient
     XXPortObjectPrivate *d;
 };
 
+
+
+class XXPortResourceObject : public XXPortObject
+{
+  Q_OBJECT
+
+  public:
+    XXPortResourceObject( KABC::AddressBook *ab, QWidget *parent, const char *name = 0 );
+    ~XXPortResourceObject();
+
+    /**
+      Returns true if the XXPortObject can be used.
+      One case it can not be used is for example if a needed lib could not be loaded.
+     */
+    virtual bool isAvailable();
+  protected:
+    KABC::Resource* mResource;
+};
+
+
+
+
 class XXPortFactory : public KLibFactory
 {
   public: