overhaul of the export/import interface to use dynamically loaded

resources as base for export and import

9 files changed, 962 insertions, 3 deletions

diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp
index d4d5475..81148d9 100644
--- a/kaddressbook/xxport/csv_xxport.cpp
+++ b/kaddressbook/xxport/csv_xxport.cpp
@@ -21,97 +21,97 @@
     without including the source code for Qt in the source distribution.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <qfile.h>
 #include <qregexp.h>
 #include <qtextstream.h>
 
 #include <kfiledialog.h>
 #ifndef KAB_EMBEDDED
 #include <kio/netaccess.h>
 #endif //KAB_EMBEDDED
 
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
 #include <kurl.h>
 
 #include "csvimportdialog.h"
 
 #include "csv_xxport.h"
 
 
 #ifndef KAB_EMBEDDED
 
 class CSVXXPortFactory : public XXPortFactory
 {
   public:
     XXPortObject *xxportObject( KABC::AddressBook *ab, QWidget *parent, const char *name )
     {
       return new CSVXXPort( ab, parent, name );
     }
 };
 
 #endif //KAB_EMBEDDED
 
 
 extern "C"
 {
 #ifndef KAB_EMBEDDED
   void *init_libkaddrbk_csv_xxport()
 #else //KAB_EMBEDDED
-  void *init_kaddrbk_csv_xxport()
+  void *init_microkaddrbk_csv_xxport()
 #endif //KAB_EMBEDDED
   {
     return ( new CSVXXPortFactory() );
   }
 }
 
 
 CSVXXPort::CSVXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name )
   : XXPortObject( ab, parent, name )
 {
   createImportAction( i18n( "Import CSV List..." ) );
   createExportAction( i18n( "Export CSV List..." ) );
 }
 
 bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const QString& )
 {
 #ifndef KAB_EMBEDDED
   KURL url = KFileDialog::getSaveURL( "addressbook.csv" );
   if ( url.isEmpty() )
       return true;
 
   if ( !url.isLocalFile() ) {
     KTempFile tmpFile;
     if ( tmpFile.status() != 0 ) {
       QString txt = i18n( "<qt>Unable to open file <b>%1</b>.%2.</qt>" );
       KMessageBox::error( parentWidget(), txt.arg( url.url() )
                           .arg( strerror( tmpFile.status() ) ) );
       return false;
     }
 
     doExport( tmpFile.file(), list );
     tmpFile.close();
 
     return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
   } else {
     QFile file( url.path() );
     if ( !file.open( IO_WriteOnly ) ) {
       QString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" );
       KMessageBox::error( parentWidget(), txt.arg( url.path() ) );
       return false;
     }
 
     doExport( &file, list );
     file.close();
 
     return true;
   }
 
diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp
index 3fdb36d..03efc1b 100644
--- a/kaddressbook/xxport/kde2_xxport.cpp
+++ b/kaddressbook/xxport/kde2_xxport.cpp
@@ -20,97 +20,97 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <qfile.h>
 
 #include <kdebug.h>
 #include <kfiledialog.h>
 #ifndef KAB_EMBEDDED
 #include <kio/netaccess.h>
 #endif //KAB_EMBEDDED
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <ktempfile.h>
 #include <kurl.h>
 
 #include "xxportmanager.h"
 
 #include "kde2_xxport.h"
 
 #ifndef KAB_EMBEDDED
 
 class KDE2XXPortFactory : public XXPortFactory
 {
   public:
     XXPortObject *xxportObject( KABC::AddressBook *ab, QWidget *parent, const char *name )
     {
       return new KDE2XXPort( ab, parent, name );
     }
 };
 
 #endif //KAB_EMBEDDED
 
 
 extern "C"
 {
 #ifndef KAB_EMBEDDED
   void *init_libkaddrbk_kde2_xxport()
 #else //KAB_EMBEDDED
-  void *init_kaddrbk_kde2_xxport()
+  void *init_microkaddrbk_kde2_xxport()
 #endif //KAB_EMBEDDED
   {
     return ( new KDE2XXPortFactory() );
   }
 }
 
 
 KDE2XXPort::KDE2XXPort( KABC::AddressBook *ab, QWidget *parent, const char *name )
   : XXPortObject( ab, parent, name )
 {
   createImportAction( i18n( "Import KDE 2 Addressbook..." ) );
 }
 
 KABC::AddresseeList KDE2XXPort::importContacts( const QString& ) const
 {
   QString fileName = locateLocal( "data", "kabc/std.vcf" );
   if ( !QFile::exists( fileName ) ) {
     KMessageBox::sorry( parentWidget(), i18n( "<qt>Couldn't find a KDE 2 address book <b>%1</b>.</qt>" ).arg( fileName ) );
     return KABC::AddresseeList();
   }
 
 #ifndef KAB_EMBEDDED
   int result = KMessageBox::questionYesNoCancel( parentWidget(),
       i18n( "Override previously imported entries?" ),
       i18n( "Import KDE 2 Addressbook" ) );
 #else //KAB_EMBEDDED
   int result = KMessageBox::warningYesNoCancel( parentWidget(),
       i18n( "Override previously imported entries?" ),
       i18n( "Import KDE 2 Addressbook" ) );
 #endif //KAB_EMBEDDED
 
   if ( !result ) return KABC::AddresseeList();
 
   KProcess proc;
 
   if ( result == KMessageBox::Yes ) {
     proc << "kab2kabc";
     proc << "--override";
   } else if ( result == KMessageBox::No )
     proc << "kab2kabc";
   else
     kdDebug(5720) << "KAddressBook::importKDE2(): Unknow return value." << endl;
 
   proc.start( KProcess::Block );
 
   addressBook()->load();
 
   return KABC::AddresseeList();
diff --git a/kaddressbook/xxport/opie_xxport.cpp b/kaddressbook/xxport/opie_xxport.cpp
new file mode 100644
index 0000000..192b803
--- a/dev/null
+++ b/kaddressbook/xxport/opie_xxport.cpp
@@ -0,0 +1,195 @@
+/*
+    This file is part of KAddressbook.
+    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+    As a special exception, permission is given to link this program
+    with any edition of Qt, and distribute the resulting executable,
+    without including the source code for Qt in the source distribution.
+*/
+
+/*
+Enhanced Version of the file for platform independent KDE tools.
+Copyright (c) 2004 Ulf Schenk
+
+$Id$
+*/
+
+#include <qdir.h>
+
+#include <kfiledialog.h>
+#include <kmessagebox.h>
+
+//US #include <opie/ocontactaccess.h>
+//US #include <opie/ocontactaccessbackend_xml.h>
+
+//US #include "stdaddressbook.h"
+#include "resource.h"
+#include "tmpaddressbook.h"
+
+/*US
+#include <qfile.h>
+#include <qtextstream.h>
+
+#include <kabc/vcardconverter.h>
+#ifndef KAB_EMBEDDED
+#include <kio/netaccess.h>
+#endif //KAB_EMBEDDED
+
+#include <klocale.h>
+#include <kmessagebox.h>
+#include <ktempfile.h>
+#include <kurl.h>
+*/
+
+#include <factory.h>
+
+
+#include "xxportmanager.h"
+
+#include "opie_xxport.h"
+
+/*US
+class OpieXXPortFactory : public XXPortFactory
+{
+  public:
+    XXPortObject *xxportObject( KABC::AddressBook *ab, QWidget *parent, const char *name )
+    {
+      return new OpieXXPort( ab, parent, name );
+    }
+};
+*/
+
+
+extern "C"
+{
+  void *init_microkaddrbk_opie_xxport()
+  {
+    return ( new OpieXXPortFactory() );
+  }
+}
+
+
+OpieXXPort::OpieXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name )
+  : XXPortResourceObject( ab, parent, name )
+{
+  defaultFileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
+
+  KRES::Factory* mFactory = KRES::Factory::self( "contact" );
+
+  if ( mFactory )
+  {
+    mResource = (KABC::Resource*)(mFactory->resource( "opie", 0, false ));
+
+    if ( mResource )
+    {
+      createImportAction( i18n( "Import Opie..." ) );
+      createExportAction( i18n( "Export Opie..." ) );
+    }
+  }
+}
+
+bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString &data )
+{
+  if (mResource == 0)
+    return false;
+
+  QString fileName = KFileDialog::getSaveFileName( defaultFileName, i18n("Save file"), parentWidget() );
+
+  if ( fileName.isEmpty() )
+    return false;
+
+  mResource->setFileName( fileName );
+
+
+  KABC::TmpAddressBook tmpAB;
+
+  tmpAB.addResource( mResource );
+
+  	qDebug("11111");
+
+  //Now check if the file has already entries, and ask the user if he wants to delete them first.
+  KABC::AddressBook::Iterator it2 = tmpAB.begin();
+  for ( it2 = tmpAB.begin(); it2 != tmpAB.end(); ++it2 ) {
+    KABC::Addressee addressee = (*it2);
+    qDebug("found %s", addressee.formattedName().latin1());
+  }
+
+  if (it2 != tmpAB.end())
+  {
+    QString text( i18n( "Do you want to remove<br>all existing entries from<br>%1<br>before exporting.?" ) );
+    if ( KMessageBox::questionYesNo( parentWidget(), text.arg( fileName ) ) == KMessageBox::Yes ) {
+      // Clean the database..
+      tmpAB.clear();
+    }
+  }
+  	qDebug("22222");
+
+//US debug
+  QPtrList<KABC::Resource> kabcResources = tmpAB.resources();
+  QPtrListIterator<KABC::Resource> resIt( kabcResources );
+  KABC::Resource *resource;
+  while ( ( resource = resIt.current() ) != 0 ) {
+    ++resIt;
+  	qDebug("tmpAB has resource: %s", resource->identifier().latin1());
+  }
+
+
+  KABC::Addressee::List::ConstIterator it;
+  for ( it = list.begin(); it != list.end(); ++it ) {
+    tmpAB.insertAddressee(*it);
+  }
+
+  bool res = false;
+  KABC::Ticket * ticket = tmpAB.requestSaveTicket(mResource);
+
+  if (ticket != 0)
+    res = tmpAB.save( ticket );
+
+  tmpAB.removeResource( mResource );
+
+  return res;
+}
+
+
+KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const
+{
+  if (mResource == 0)
+    return KABC::AddresseeList();
+
+  KABC::AddresseeList adrlst;
+
+  QString fileName = KFileDialog::getOpenFileName( defaultFileName, i18n("Load file"), parentWidget() );
+
+  if ( fileName.isEmpty() )
+    return KABC::AddresseeList();
+
+  mResource->setFileName( fileName );
+
+
+  KABC::TmpAddressBook tmpAB;
+
+  tmpAB.addResource( mResource );
+
+  bool res = tmpAB.load();
+
+  adrlst = tmpAB.allAddressees();
+
+  tmpAB.removeResource( mResource );
+
+  return adrlst;
+
+}
diff --git a/kaddressbook/xxport/opie_xxport.h b/kaddressbook/xxport/opie_xxport.h
new file mode 100644
index 0000000..106f38b
--- a/dev/null
+++ b/kaddressbook/xxport/opie_xxport.h
@@ -0,0 +1,68 @@
+/*
+    This file is part of KAddressbook.
+    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+    As a special exception, permission is given to link this program
+    with any edition of Qt, and distribute the resulting executable,
+    without including the source code for Qt in the source distribution.
+*/
+
+/*
+Enhanced Version of the file for platform independent KDE tools.
+Copyright (c) 2004 Ulf Schenk
+
+$Id$
+*/
+
+#ifndef OPIE_XXPORT_H
+#define OPIE_XXPORT_H
+
+#include <xxportobject.h>
+
+
+class KABC::Resource;
+
+class OpieXXPort : public XXPortResourceObject
+{
+  Q_OBJECT
+
+  public:
+    OpieXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name = 0 );
+
+    QString identifier() const { return "opie"; }
+
+  public slots:
+    bool exportContacts( const KABC::AddresseeList &list, const QString &data );
+    KABC::AddresseeList importContacts( const QString &data ) const;
+
+  private:
+    QString defaultFileName;
+
+};
+
+
+class OpieXXPortFactory : public XXPortFactory
+{
+  public:
+    XXPortObject *xxportObject( KABC::AddressBook *ab, QWidget *parent, const char *name )
+    {
+      return new OpieXXPort( ab, parent, name );
+    }
+};
+
+
+#endif
diff --git a/kaddressbook/xxport/qtopia_xxport.cpp b/kaddressbook/xxport/qtopia_xxport.cpp
new file mode 100644
index 0000000..8377cd5
--- a/dev/null
+++ b/kaddressbook/xxport/qtopia_xxport.cpp
@@ -0,0 +1,287 @@
+/*
+    This file is part of KAddressbook.
+    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+    As a special exception, permission is given to link this program
+    with any edition of Qt, and distribute the resulting executable,
+    without including the source code for Qt in the source distribution.
+*/
+
+/*
+Enhanced Version of the file for platform independent KDE tools.
+Copyright (c) 2004 Ulf Schenk
+
+$Id$
+*/
+
+#include <qdir.h>
+
+#include <kfiledialog.h>
+#include <kmessagebox.h>
+
+//US #include <qpe/pim/addressbookaccess.h>
+
+#include "addressbook.h"
+
+/*US
+#include <qfile.h>
+#include <qtextstream.h>
+
+#include <kabc/vcardconverter.h>
+#ifndef KAB_EMBEDDED
+#include <kio/netaccess.h>
+#endif //KAB_EMBEDDED
+
+#include <klocale.h>
+#include <kmessagebox.h>
+#include <ktempfile.h>
+#include <kurl.h>
+*/
+
+#include "xxportmanager.h"
+//US #include "qtopiaconverter.h"
+
+#include "qtopia_xxport.h"
+
+/*US
+class QtopiaXXPortFactory : public XXPortFactory
+{
+  public:
+    XXPortObject *xxportObject( KABC::AddressBook *ab, QWidget *parent, const char *name )
+    {
+      return new QtopiaXXPort( ab, parent, name );
+    }
+};
+*/
+
+extern "C"
+{
+  void *init_microkaddrbk_qtopia_xxport()
+  {
+    return ( new QtopiaXXPortFactory() );
+  }
+}
+
+
+
+QtopiaXXPort::QtopiaXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name )
+  : XXPortResourceObject( ab, parent, name )
+{
+  defaultFileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
+
+  KRES::Factory* mFactory = KRES::Factory::self( "contact" );
+
+  if ( mFactory )
+  {
+    mResource = (KABC::Resource*)(mFactory->resource( "qtopia", 0, false ));
+
+    if ( mResource )
+    {
+      createImportAction( i18n( "Import Qtopia..." ) );
+      createExportAction( i18n( "Export Qtopia..." ) );
+    }
+  }
+}
+
+bool QtopiaXXPort::exportContacts( const KABC::AddresseeList &list, const QString &data )
+{
+/*US
+  // we can not choose the filename. Therefore use the default to display
+  QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
+
+  AddressBookAccess* access = new AddressBookAccess();
+
+  if ( !access ) {
+    QString text( i18n( "Unable to access file '%1'." ).arg( fileName ) );
+    qDebug(text.latin1());
+    KMessageBox::error( parentWidget(), text );
+    addressBook()->error( text );
+    return false;
+  }
+
+  KABC::QtopiaConverter mConverter;
+
+  bool res = mConverter.init();
+  if (!res)
+  {
+    QString text( i18n( "Unable to initialize qtopia converter.<br>Most likely a problem with the category file." ) );
+    qDebug(text);
+    KMessageBox::error( parentWidget(), text );
+    delete access;
+    return false;
+  }
+
+  //Now check if the file has already entries, and ask the user if he wants to delete them first.
+  { //create a new scope
+    AddressBookIterator it(*access);
+    const PimContact* firstcontact = it.toFirst();
+    if (firstcontact)
+    {
+      QString text( i18n( "Do you want to remove<br>all existing entries from<br>%1<br>before exporting.?" ) );
+      if ( KMessageBox::questionYesNo( parentWidget(), text.arg( fileName ) ) == KMessageBox::Yes ) {
+        // Clean the database..
+
+        AddressBookIterator it2(*access);
+        for (it2.toFirst(); it2.current(); ++it2) {
+          access->removeContact(*it2.current());
+        }
+      }
+    }
+  }
+
+  KABC::Addressee::List::ConstIterator it;
+  for ( it = list.begin(); it != list.end(); ++it ) {
+    PimContact c;
+
+    res = mConverter.addresseeToQtopia( *it, c );
+    if (res == true)
+    {
+      access->addContact(c);
+    }
+  }
+
+  delete access;
+
+  return true;
+*/
+
+  if (mResource == 0)
+    return false;
+
+  QString fileName = defaultFileName;
+
+
+  mResource->setFileName( fileName );
+
+  //Now check if the file has already entries, and ask the user if he wants to delete them first.
+  if (mResource->count() > 0)
+  {
+    QString text( i18n( "Do you want to remove<br>all existing entries from<br>%1<br>before exporting.?" ) );
+    if ( KMessageBox::questionYesNo( parentWidget(), text.arg( fileName ) ) == KMessageBox::Yes ) {
+      // Clean the database.
+      mResource->clear();
+    }
+  }
+
+  KABC::AddressBook tmpAB;
+
+  tmpAB.addResource( mResource );
+
+//US debug
+  QPtrList<KABC::Resource> kabcResources = tmpAB.resources();
+  QPtrListIterator<KABC::Resource> resIt( kabcResources );
+  KABC::Resource *resource;
+  while ( ( resource = resIt.current() ) != 0 ) {
+    ++resIt;
+  	qDebug("tmpAB has resource: %s", resource->identifier().latin1());
+  }
+
+
+  KABC::Addressee::List::ConstIterator it;
+  for ( it = list.begin(); it != list.end(); ++it ) {
+    tmpAB.insertAddressee(*it);
+  }
+
+  KABC::Ticket * ticket = mResource->requestSaveTicket();
+  return tmpAB.save( ticket );
+
+
+
+}
+
+KABC::AddresseeList QtopiaXXPort::importContacts( const QString& ) const
+{
+/*US
+  KABC::AddresseeList adrlst;
+
+  QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
+
+  AddressBookAccess* access = new AddressBookAccess();
+
+  if ( !access ) {
+    QString text( i18n( "Unable to access file '%1'." ).arg( fileName ) );
+    qDebug(text.latin1());
+    addressBook()->error( text );
+    KMessageBox::error( parentWidget(), text );
+    return KABC::AddresseeList();
+  }
+
+  KABC::QtopiaConverter mConverter;
+
+  bool res = mConverter.init();
+  if (!res)
+  {
+    QString text( i18n( "Unable to initialize qtopia converter.<br>Most likely a problem with the category file." ) );
+    qDebug(text);
+    KMessageBox::error( parentWidget(), text );
+    delete access;
+    return KABC::AddresseeList();
+  }
+
+
+
+  { //create a new scope
+    AddressBookIterator it(*access);
+
+    for (it.toFirst(); it.current(); ++it) {
+      const PimContact*contact = it.current();
+
+      KABC::Addressee addressee;
+
+      res = mConverter.qtopiaToAddressee( (*contact), addressee );
+
+      if ( !addressee.isEmpty() && res )
+      {
+        adrlst.append( addressee );
+      }
+    }
+  }
+
+  delete access;
+//US the deletion of the access object deletes the backend object as well.
+
+  return adrlst;
+*/
+
+  if (mResource == 0)
+    return KABC::AddresseeList();
+
+  KABC::AddresseeList adrlst;
+
+  QString fileName = defaultFileName;
+
+  mResource->setFileName( fileName );
+
+
+  KABC::AddressBook tmpAB;
+
+  tmpAB.addResource( mResource );
+
+//US debug
+  QPtrList<KABC::Resource> kabcResources = tmpAB.resources();
+  QPtrListIterator<KABC::Resource> resIt( kabcResources );
+  KABC::Resource *resource;
+  while ( ( resource = resIt.current() ) != 0 ) {
+    ++resIt;
+  	qDebug("tmpAB has resource: %s", resource->identifier().latin1());
+  }
+
+  bool res = tmpAB.load();
+
+  return tmpAB.allAddressees();
+
+}
diff --git a/kaddressbook/xxport/qtopia_xxport.h b/kaddressbook/xxport/qtopia_xxport.h
new file mode 100644
index 0000000..c7c89de
--- a/dev/null
+++ b/kaddressbook/xxport/qtopia_xxport.h
@@ -0,0 +1,64 @@
+/*
+    This file is part of KAddressbook.
+    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+    As a special exception, permission is given to link this program
+    with any edition of Qt, and distribute the resulting executable,
+    without including the source code for Qt in the source distribution.
+*/
+
+/*
+Enhanced Version of the file for platform independent KDE tools.
+Copyright (c) 2004 Ulf Schenk
+
+$Id$
+*/
+
+#ifndef QTOPIA_XXPORT_H
+#define QTOPIA_XXPORT_H
+
+#include <xxportobject.h>
+
+class QtopiaXXPort : public XXPortResourceObject
+{
+  Q_OBJECT
+
+  public:
+    QtopiaXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name = 0 );
+
+    QString identifier() const { return "qtopia"; }
+
+  public slots:
+    bool exportContacts( const KABC::AddresseeList &list, const QString &data );
+    KABC::AddresseeList importContacts( const QString &data ) const;
+
+  private:
+    QString defaultFileName;
+
+};
+
+
+class QtopiaXXPortFactory : public XXPortFactory
+{
+  public:
+    XXPortObject *xxportObject( KABC::AddressBook *ab, QWidget *parent, const char *name )
+    {
+      return new QtopiaXXPort( ab, parent, name );
+    }
+};
+
+#endif
diff --git a/kaddressbook/xxport/sharpdtm_xxport.cpp b/kaddressbook/xxport/sharpdtm_xxport.cpp
new file mode 100644
index 0000000..8c2e07a
--- a/dev/null
+++ b/kaddressbook/xxport/sharpdtm_xxport.cpp
@@ -0,0 +1,284 @@
+/*
+    This file is part of KAddressbook.
+    Copyright (c) 2004 Ulf Schenk
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+    As a special exception, permission is given to link this program
+    with any edition of Qt, and distribute the resulting executable,
+    without including the source code for Qt in the source distribution.
+*/
+
+/*
+Enhanced Version of the file for platform independent KDE tools.
+Copyright (c) 2004 Ulf Schenk
+
+$Id$
+*/
+
+#include <qdir.h>
+
+#include <kfiledialog.h>
+#include <kmessagebox.h>
+
+//US #include <sl/slzdb.h>
+
+#include "addressbook.h"
+
+/*US
+#include <qfile.h>
+#include <qtextstream.h>
+
+#include <kabc/vcardconverter.h>
+#ifndef KAB_EMBEDDED
+#include <kio/netaccess.h>
+#endif //KAB_EMBEDDED
+
+#include <klocale.h>
+#include <kmessagebox.h>
+#include <ktempfile.h>
+#include <kurl.h>
+*/
+
+#include "xxportmanager.h"
+
+#include "sharpdtm_xxport.h"
+
+/*US
+class SharpDTMXXPortFactory : public XXPortFactory
+{
+  public:
+    XXPortObject *xxportObject( KABC::AddressBook *ab, QWidget *parent, const char *name )
+    {
+      return new SharpDTMXXPort( ab, parent, name );
+    }
+};
+*/
+
+extern "C"
+{
+  void *init_microkaddrbk_sharpdtm_xxport()
+  {
+    return ( new SharpDTMXXPortFactory() );
+  }
+}
+
+SharpDTMXXPort::SharpDTMXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name )
+  : XXPortResourceObject( ab, parent, name )
+{
+  KRES::Factory* mFactory = KRES::Factory::self( "contact" );
+
+  if ( mFactory )
+  {
+    mResource = (KABC::Resource*)(mFactory->resource( "sharpdtm", 0, false ));
+    if ( mResource )
+    {
+      createImportAction( i18n( "Import Sharp..." ) );
+      createExportAction( i18n( "Export Sharp..." ) );
+    }
+  }
+}
+
+bool SharpDTMXXPort::exportContacts( const KABC::AddresseeList &list, const QString &data )
+{
+/*US
+  // we can not choose the filename. Therefore use the default to display
+  QString fileName = SlZDataBase::addressbookFileName();
+
+   SlZDataBase* access = new SlZDataBase(fileName,
+                        SlZDataBase::addressbookItems());
+
+  if ( !access ) {
+    QString text( i18n( "Unable to access file '%1'." ).arg( fileName ) );
+    qDebug(text.latin1());
+    KMessageBox::error( parentWidget(), text );
+    addressBook()->error( text );
+    return false;
+  }
+
+  KABC::SharpDTMConverter mConverter;
+
+  bool res = mConverter.init();
+  if (!res)
+  {
+    QString text( i18n( "Unable to initialize sharpdtm converter.<br>Most likely a problem with the category file." ) );
+    qDebug(text);
+    KMessageBox::error( parentWidget(), text );
+    delete access;
+    return false;
+  }
+
+  //Now check if the file has already entries, and ask the user if he wants to delete them first.
+  if (access->count() > 0)
+  {
+    QString text( i18n( "Do you want to remove<br>all existing entries from<br>%1<br>before exporting.?" ) );
+    if ( KMessageBox::questionYesNo( parentWidget(), text.arg( fileName ) ) == KMessageBox::Yes ) {
+      // Clean the database..
+      access->deleteCard(0, SlZDataBase::AllCard );
+    }
+  }
+
+  KABC::Addressee::List::ConstIterator it;
+  for ( it = list.begin(); it != list.end(); ++it ) {
+    CardId c;
+    res = access->editNewCard();
+
+    if (res == true)
+    {
+    	res = mConverter.addresseeToSharp( *it, access, c );
+
+        if (res == true)
+          access->finishEditCard(&c);
+        else
+          access->cancelEditCard();
+	}
+  }
+
+  delete access;
+
+  return true;
+*/
+
+  if (mResource == 0)
+    return false;
+
+  // we can not choose the filename. Therefore use the default to display
+  QString fileName = mResource->fileName();
+
+  if ( fileName.isEmpty() )
+    return false;
+
+  //Now check if the file has already entries, and ask the user if he wants to delete them first.
+  if (mResource->count() > 0)
+  {
+    QString text( i18n( "Do you want to remove<br>all existing entries from<br>%1<br>before exporting.?" ) );
+    if ( KMessageBox::questionYesNo( parentWidget(), text.arg( fileName ) ) == KMessageBox::Yes ) {
+      // Clean the database..
+      mResource->clear();
+    }
+  }
+
+  KABC::AddressBook tmpAB;
+
+  tmpAB.addResource( mResource );
+
+//US debug
+  QPtrList<KABC::Resource> kabcResources = tmpAB.resources();
+  QPtrListIterator<KABC::Resource> resIt( kabcResources );
+  KABC::Resource *resource;
+  while ( ( resource = resIt.current() ) != 0 ) {
+    ++resIt;
+  	qDebug("tmpAB has resource: %s", resource->identifier().latin1());
+  }
+
+
+  KABC::Addressee::List::ConstIterator it;
+  for ( it = list.begin(); it != list.end(); ++it ) {
+    tmpAB.insertAddressee(*it);
+  }
+
+  KABC::Ticket * ticket = mResource->requestSaveTicket();
+  return tmpAB.save( ticket );
+
+
+}
+
+KABC::AddresseeList SharpDTMXXPort::importContacts( const QString& ) const
+{
+/*US
+  KABC::AddresseeList adrlst;
+
+  QString fileName = SlZDataBase::addressbookFileName();
+
+  // the last parameter in the SlZDataBase constructor means "readonly"
+  SlZDataBase* access = new SlZDataBase(fileName,
+                        SlZDataBase::addressbookItems(), NULL, true);
+
+
+  if ( !access ) {
+    QString text( i18n( "Unable to access file '%1'." ).arg( fileName ) );
+    qDebug(text.latin1());
+    addressBook()->error( text );
+    KMessageBox::error( parentWidget(), text );
+    return KABC::AddresseeList();
+  }
+
+  KABC::SharpDTMConverter mConverter;
+
+  bool res = mConverter.init();
+  if (!res)
+  {
+    QString text( i18n( "Unable to initialize sharp converter.<br>Most likely a problem with the category file." ) );
+    qDebug(text);
+    KMessageBox::error( parentWidget(), text );
+    delete access;
+    return KABC::AddresseeList();
+  }
+
+
+  { //create a new scope
+    CardId id;
+
+    for (bool res=access->first(); res == true; res=access->next()) {
+      id = access->cardId();
+
+      KABC::Addressee addressee;
+
+      res = mConverter.sharpToAddressee( id, access, addressee );
+
+      if ( !addressee.isEmpty() && res )
+      {
+        adrlst.append( addressee );
+      }
+    }
+  }
+
+  delete access;
+
+  return adrlst;
+*/
+
+  if (mResource == 0)
+    return KABC::AddresseeList();
+
+  KABC::AddresseeList adrlst;
+
+  QString fileName = mResource->fileName();
+
+  if ( fileName.isEmpty() )
+    return KABC::AddresseeList();
+
+  mResource->setFileName( fileName );
+
+
+  KABC::AddressBook tmpAB;
+
+  tmpAB.addResource( mResource );
+
+//US debug
+  QPtrList<KABC::Resource> kabcResources = tmpAB.resources();
+  QPtrListIterator<KABC::Resource> resIt( kabcResources );
+  KABC::Resource *resource;
+  while ( ( resource = resIt.current() ) != 0 ) {
+    ++resIt;
+  	qDebug("tmpAB has resource: %s", resource->identifier().latin1());
+  }
+
+  bool res = tmpAB.load();
+
+  return tmpAB.allAddressees();
+
+
+}
diff --git a/kaddressbook/xxport/sharpdtm_xxport.h b/kaddressbook/xxport/sharpdtm_xxport.h
new file mode 100644
index 0000000..43fd434
--- a/dev/null
+++ b/kaddressbook/xxport/sharpdtm_xxport.h
@@ -0,0 +1,60 @@
+/*
+    This file is part of KAddressbook.
+    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+    As a special exception, permission is given to link this program
+    with any edition of Qt, and distribute the resulting executable,
+    without including the source code for Qt in the source distribution.
+*/
+
+/*
+Enhanced Version of the file for platform independent KDE tools.
+Copyright (c) 2004 Ulf Schenk
+
+$Id$
+*/
+
+#ifndef SHARPDTM_XXPORT_H
+#define SHARPDTM_XXPORT_H
+
+#include <xxportobject.h>
+
+class SharpDTMXXPort : public XXPortResourceObject
+{
+  Q_OBJECT
+
+  public:
+    SharpDTMXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name = 0 );
+
+    QString identifier() const { return "qtopia"; }
+
+  public slots:
+    bool exportContacts( const KABC::AddresseeList &list, const QString &data );
+    KABC::AddresseeList importContacts( const QString &data ) const;
+
+};
+
+class SharpDTMXXPortFactory : public XXPortFactory
+{
+  public:
+    XXPortObject *xxportObject( KABC::AddressBook *ab, QWidget *parent, const char *name )
+    {
+      return new SharpDTMXXPort( ab, parent, name );
+    }
+};
+
+#endif
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index 4819341..acf6419 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -20,97 +20,97 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <qfile.h>
 #include <qtextstream.h>
 
 #include <kabc/vcardconverter.h>
 #include <kabc/vcardparser/vcardtool.h>
 #include <kfiledialog.h>
 #ifndef KAB_EMBEDDED
 #include <kio/netaccess.h>
 #endif //KAB_EMBEDDED
 
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
 #include <kurl.h>
 
 #include "xxportmanager.h"
 
 #include "vcard_xxport.h"
 
 #ifndef KAB_EMBEDDED
 
 class VCardXXPortFactory : public XXPortFactory
 {
   public:
     XXPortObject *xxportObject( KABC::AddressBook *ab, QWidget *parent, const char *name )
     {
       return new VCardXXPort( ab, parent, name );
     }
 };
 #endif //KAB_EMBEDDED
 
 
 extern "C"
 {
 #ifndef KAB_EMBEDDED
   void *init_libkaddrbk_vcard_xxport()
 #else //KAB_EMBEDDED
-  void *init_kaddrbk_vcard_xxport()
+  void *init_microkaddrbk_vcard_xxport()
 #endif //KAB_EMBEDDED
   {
     return ( new VCardXXPortFactory() );
   }
 }
 
 
 VCardXXPort::VCardXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name )
   : XXPortObject( ab, parent, name )
 {
   createImportAction( i18n( "Import vCard..." ) );
 //US KABC::VCardConverter does not support the export of 2.1 addressbooks.
 //US createExportAction( i18n( "Export vCard 2.1..." ), "v21" );
   createExportAction( i18n( "Export vCard 3.0..." ), "v30" );
 }
 
 bool VCardXXPort::exportContacts( const KABC::AddresseeList &list, const QString &data )
 {
   QString name;
 
   if ( list.count() == 1 )
     name = list[ 0 ].givenName() + "_" + list[ 0 ].familyName() + ".vcf";
   else
     name = "addressbook.vcf";
 
 #ifndef KAB_EMBEDDED
   QString fileName = KFileDialog::getSaveFileName( name );
 #else //KAB_EMBEDDED
   QString fileName = KFileDialog::getSaveFileName( name, i18n("Save file"), parentWidget() );
 #endif //KAB_EMBEDDED
 
   if ( fileName.isEmpty() )
     return false;
 
   QFile outFile( fileName );
   if ( !outFile.open( IO_WriteOnly ) ) {
     QString text = i18n( "<qt>Unable to open file <b>%1</b> for export.</qt>" );
     KMessageBox::error( parentWidget(), text.arg( fileName ) );
     return false;
   }
 
   QTextStream t( &outFile );
   t.setEncoding( QTextStream::UnicodeUTF8 );
 
   KABC::Addressee::List::ConstIterator it;
   for ( it = list.begin(); it != list.end(); ++it ) {
     KABC::VCardConverter converter;
     QString vcard;
@@ -205,51 +205,52 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
       addrList = parseVCard( data );
 
   }
 #endif //KAB_EMBEDDED
 
   return addrList;
 }
 
 KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const
 {
 
   KABC::VCardTool tool;
   KABC::AddresseeList addrList;
   addrList = tool.parseVCards( data );
   // LR : I switched to the code, which is in current cvs HEAD
   /*
   uint numVCards = data.contains( "BEGIN:VCARD", false );
   QStringList dataList = QStringList::split( "\r\n\r\n", data );
 
   for ( uint i = 0; i < numVCards && i < dataList.count(); ++i ) {
     KABC::Addressee addr;
     bool ok = false;
 
     if ( dataList[ i ].contains( "VERSION:3.0" ) )
       ok = converter.vCardToAddressee( dataList[ i ], addr, KABC::VCardConverter::v3_0 );
     else if ( dataList[ i ].contains( "VERSION:2.1" ) )
       ok = converter.vCardToAddressee( dataList[ i ], addr, KABC::VCardConverter::v2_1 );
     else {
       KMessageBox::sorry( parentWidget(), i18n( "Not supported vCard version." ) );
       continue;
     }
 
     if ( !addr.isEmpty() && ok )
       addrList.append( addr );
     else {
       QString text = i18n( "The selected file does not include a valid vCard. "
                            "Please check the file and try again." );
       KMessageBox::sorry( parentWidget(), text );
     }
   }
   */
   if ( addrList.isEmpty()  ) {
       QString text = i18n( "The selected file does not\ninclude a valid vCard.\nPlease check the file and try again.\n" );
       KMessageBox::sorry( parentWidget(), text );
   }
   return addrList;
 }
 
+
 #ifndef KAB_EMBEDDED
 #include "vcard_xxport.moc"
 #endif //KAB_EMBEDDED