From 9f89ce524f3dc9bb820e32f235a03d0a167b9f89 Mon Sep 17 00:00:00 2001 From: ulf69 Date: Mon, 02 Aug 2004 18:22:39 +0000 Subject: overhaul of the export/import interface to use dynamically loaded resources as base for export and import --- 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 @@ -66,7 +66,7 @@ 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() ); 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 @@ -65,7 +65,7 @@ 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() ); 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 + + 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 + +#include +#include + +//US #include +//US #include + +//US #include "stdaddressbook.h" +#include "resource.h" +#include "tmpaddressbook.h" + +/*US +#include +#include + +#include +#ifndef KAB_EMBEDDED +#include +#endif //KAB_EMBEDDED + +#include +#include +#include +#include +*/ + +#include + + +#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
all existing entries from
%1
before exporting.?" ) ); + if ( KMessageBox::questionYesNo( parentWidget(), text.arg( fileName ) ) == KMessageBox::Yes ) { + // Clean the database.. + tmpAB.clear(); + } + } + qDebug("22222"); + +//US debug + QPtrList kabcResources = tmpAB.resources(); + QPtrListIterator 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 + + 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 + + +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 + + 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 + +#include +#include + +//US #include + +#include "addressbook.h" + +/*US +#include +#include + +#include +#ifndef KAB_EMBEDDED +#include +#endif //KAB_EMBEDDED + +#include +#include +#include +#include +*/ + +#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.
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
all existing entries from
%1
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
all existing entries from
%1
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 kabcResources = tmpAB.resources(); + QPtrListIterator 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.
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 kabcResources = tmpAB.resources(); + QPtrListIterator 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 + + 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 + +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 + +#include +#include + +//US #include + +#include "addressbook.h" + +/*US +#include +#include + +#include +#ifndef KAB_EMBEDDED +#include +#endif //KAB_EMBEDDED + +#include +#include +#include +#include +*/ + +#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.
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
all existing entries from
%1
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
all existing entries from
%1
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 kabcResources = tmpAB.resources(); + QPtrListIterator 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.
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 kabcResources = tmpAB.resources(); + QPtrListIterator 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 + + 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 + +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 @@ -65,7 +65,7 @@ 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() ); @@ -250,6 +250,7 @@ KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const return addrList; } + #ifndef KAB_EMBEDDED #include "vcard_xxport.moc" #endif //KAB_EMBEDDED -- cgit v0.9.0.2