5 files changed, 78 insertions, 9 deletions

diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro
index 77fce1b..0da5842 100644
--- a/kaddressbook/kaddressbook.pro
+++ b/kaddressbook/kaddressbook.pro
@@ -1,21 +1,21 @@
         TEMPLATE= app
         CONFIG  = qt warn_on 
         TARGET  = kapi
 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 : {
 LIBS += ../bin/libmicrokdepim.so
 LIBS += ../bin/libmicrokde.so
 LIBS += ../bin/libmicrokabc.so
 LIBS += ../bin/libmicrokcal.so
 LIBS += -lldap
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
@@ -88,24 +88,27 @@ details/look_html.h \
 views/kaddressbookiconview.h \
 views/kaddressbooktableview.h \
 views/kaddressbookcardview.h \
 views/configuretableviewdialog.h \
 views/configurecardviewdialog.h \
 views/cardview.h \
 views/colorlistbox.h \
 views/contactlistview.h \
 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 \
 # calendarview.h \
 # customlistviewitem.h \
 # datenavigator.h
 
 SOURCES = \
 addresseeeditordialog.cpp \
 addresseeeditorwidget.cpp \
 addresseditwidget.cpp \
 addresseeconfig.cpp \
@@ -151,24 +154,27 @@ details/look_html.cpp \
 views/kaddressbookiconview.cpp \
 views/kaddressbooktableview.cpp \
 views/kaddressbookcardview.cpp \
 views/configuretableviewdialog.cpp \
 views/configurecardviewdialog.cpp \
 views/cardview.cpp \
 views/contactlistview.cpp \
 views/colorlistbox.cpp \
 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 \
 # timespanview.cpp
 
 
 
 win32: {
 HEADERS += ../outport/msoutl9.h \
  kaimportoldialog.h 
 
 SOURCES += ../outport/msoutl9.cpp \
diff --git a/kaddressbook/kaddressbookE.pro b/kaddressbook/kaddressbookE.pro
index dc4a2f2..95e6641 100644
--- a/kaddressbook/kaddressbookE.pro
+++ b/kaddressbook/kaddressbookE.pro
@@ -1,25 +1,25 @@
         TEMPLATE= app
         CONFIG  += qt warn_on 
 
 
         TARGET  = kapi
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 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
 #DEFINES += KORG_NOLVALTERNATION
 LIBS += -lmicrokdepim
 #LIBS += -lmicrokcal
 LIBS += -lmicrokde
 LIBS += -lmicrokcal
 LIBS += -lmicroqtcompat
 LIBS += -lmicrokabc
 LIBS += -lqpe
 LIBS += -ljpeg
@@ -78,24 +78,27 @@ details/look_html.h \
 views/kaddressbookiconview.h \
 views/kaddressbooktableview.h \
 views/kaddressbookcardview.h \
 views/configuretableviewdialog.h \
 views/configurecardviewdialog.h \
 views/cardview.h \
 views/colorlistbox.h \
 views/contactlistview.h \
 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 \
 # calendarview.h \
 # customlistviewitem.h \
 # datenavigator.h
 
 SOURCES = \
 addresseeeditordialog.cpp \
 addresseeeditorwidget.cpp \
 addresseditwidget.cpp \
 addresseeconfig.cpp \
@@ -141,17 +144,20 @@ details/look_html.cpp \
 views/kaddressbookiconview.cpp \
 views/kaddressbooktableview.cpp \
 views/kaddressbookcardview.cpp \
 views/configuretableviewdialog.cpp \
 views/configurecardviewdialog.cpp \
 views/cardview.cpp \
 views/contactlistview.cpp \
 views/colorlistbox.cpp \
 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 \
 # timespanview.cpp
 
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index 2962951..a6797c9 100644
--- a/kaddressbook/xxportmanager.cpp
+++ b/kaddressbook/xxportmanager.cpp
@@ -34,27 +34,30 @@ $Id$
 #include <kabc/addressbook.h>
 #include <kabc/resource.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
 #ifndef KAB_EMBEDDED
 #include <ktrader.h>
 #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
 
 #include <libkdepim/addresseeview.h>
 
 #include "kabcore.h"
 #include "undocmds.h"
 #include "xxportselectdialog.h"
 
 #include "xxportmanager.h"
 
 KURL XXPortManager::importURL = KURL();
@@ -183,27 +186,27 @@ void XXPortManager::loadPlugins()
       continue;
     }
 
     XXPortFactory *xxportFactory = static_cast<XXPortFactory*>( factory );
 
     if ( !xxportFactory ) {
       kdDebug(5720) << "XXPortManager::loadExtensions(): Cast failed" << endl;
       continue;
     }
 
 #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" );
   if ( factory ) {
     XXPortFactory *xxportFactory = static_cast<XXPortFactory*>( factory );
     factorylist.append(xxportFactory);
   }
 
   //add the qtopia import library dynamically
   factory = KLibLoader::self()->factory( "microkaddrbk_qtopia_xxport" );
   if ( factory ) {
     XXPortFactory *xxportFactory = static_cast<XXPortFactory*>( factory );
diff --git a/kaddressbook/xxportobject.cpp b/kaddressbook/xxportobject.cpp
index 42ab0fb..bb985a6 100644
--- a/kaddressbook/xxportobject.cpp
+++ b/kaddressbook/xxportobject.cpp
@@ -138,15 +138,36 @@ QWidget *XXPortObject::parentWidget() const
 }
 
 void XXPortObject::slotExportActivated( const QString &data )
 {
   emit exportActivated( identifier(), ( data == "<empty>" ? QString::null : data ) );
 }
 
 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
@@ -26,48 +26,59 @@ Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #ifndef XXPORTOBJECT_H
 #define XXPORTOBJECT_H
 
 #include <qobject.h>
 
 #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
 
   public:
     XXPortObject( KABC::AddressBook *ab, QWidget *parent, const char *name = 0 );
     ~XXPortObject();
 
     /**
       Returns the unique identifier of this xxport modul, it should
       be the lowercase name of the import/export format e.g. 'vcard'
      */
     virtual QString identifier() const = 0;
 
     /**
       Reimplement this method if the XXPortManager shall
       pass a sorted list to @ref exportContacts().
      */
     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.
      */
     virtual bool exportContacts( const KABC::AddresseeList &list, const QString& identifier );
 
     /**
       Reimplement this method for importing the contacts.
      */
     virtual KABC::AddresseeList importContacts( const QString& identifier ) const;
 
   signals:
@@ -98,37 +109,59 @@ class XXPortObject : public QObject, virtual public KXMLGUIClient
 
     /**
       Returns a pointer to the address book object.
      */
     KABC::AddressBook *addressBook() const;
 
     /**
       Returns a pointer to the parent widget. It can be used as parent for
       message boxes.
      */
     QWidget *parentWidget() const;
 
-  
+
   private slots:
     void slotImportActivated( const QString& );
     void slotExportActivated( const QString& );
 
   private:
     KABC::AddressBook *mAddressBook;
     QWidget *mParentWidget;
 
     class XXPortObjectPrivate;
     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:
     virtual XXPortObject *xxportObject( KABC::AddressBook *ab, QWidget *parent,
                                         const char *name = 0 ) = 0;
 
   protected:
     virtual QObject* createObject( QObject*, const char*, const char*,
                                    const QStringList & )
     {
       return 0;
     }