| -rw-r--r-- | kabc/plugins/sharpdtm/resourcesharpdtm.h | 10 | ||||
| -rw-r--r-- | kabc/plugins/sharpdtm/sharpdtmE.pro | 2 | ||||
| -rw-r--r-- | kaddressbook/xxport/qtopia/qtopia_xxport.cpp | 49 |
3 files changed, 30 insertions, 31 deletions
diff --git a/kabc/plugins/sharpdtm/resourcesharpdtm.h b/kabc/plugins/sharpdtm/resourcesharpdtm.h index 32d0be1..d2e2a52 100644 --- a/kabc/plugins/sharpdtm/resourcesharpdtm.h +++ b/kabc/plugins/sharpdtm/resourcesharpdtm.h @@ -40,7 +40,7 @@ $Id$ namespace KABC { class ResourceConfigWidget; -class QtopiaConverter; +class SharpDTMConverter; /** @internal @@ -83,7 +83,7 @@ public: * Closes the file again. */ virtual void doClose(); - + /** * Requests a save ticket, that is used by @ref save() */ @@ -135,12 +135,12 @@ protected: void unlock( const QString &fileName ); private: - QtopiaConverter* mConverter; - + SharpDTMConverter* mConverter; + QString mFileName; QString mLockUniqueName; - + KDirWatch mDirWatch; }; diff --git a/kabc/plugins/sharpdtm/sharpdtmE.pro b/kabc/plugins/sharpdtm/sharpdtmE.pro index f29be2f..7c7a6d5 100644 --- a/kabc/plugins/sharpdtm/sharpdtmE.pro +++ b/kabc/plugins/sharpdtm/sharpdtmE.pro @@ -3,7 +3,7 @@ CONFIG += qt warn_on #release debug TARGET = microkabc_sharpdtm -INCLUDEPATH += ../.. ../../../external/sharpdtm/include ../../converter/qtopia ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include +INCLUDEPATH += ../.. ../../../external/sharpdtm/include ../../converter/sharpdtm ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include OBJECTS_DIR = obj/$(PLATFORM) diff --git a/kaddressbook/xxport/qtopia/qtopia_xxport.cpp b/kaddressbook/xxport/qtopia/qtopia_xxport.cpp index bf39fdb..c1ed03e 100644 --- a/kaddressbook/xxport/qtopia/qtopia_xxport.cpp +++ b/kaddressbook/xxport/qtopia/qtopia_xxport.cpp @@ -88,9 +88,9 @@ bool QtopiaXXPort::exportContacts( const KABC::AddresseeList &list, const QStrin { // 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()); @@ -100,7 +100,7 @@ bool QtopiaXXPort::exportContacts( const KABC::AddresseeList &list, const QStrin } KABC::QtopiaConverter mConverter; - + bool res = mConverter.init(); if (!res) { @@ -108,11 +108,11 @@ bool QtopiaXXPort::exportContacts( const KABC::AddresseeList &list, const QStrin qDebug(text); KMessageBox::error( parentWidget(), text ); delete access; - return false; + 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 + { //create a new scope AddressBookIterator it(*access); const PimContact* firstcontact = it.toFirst(); if (firstcontact) @@ -128,32 +128,31 @@ bool QtopiaXXPort::exportContacts( const KABC::AddresseeList &list, const QStrin } } } - + KABC::Addressee::List::ConstIterator it; for ( it = list.begin(); it != list.end(); ++it ) { PimContact c; - KABC::Addressee addressee = (*it); - + res = mConverter.addresseeToQtopia( *it, c ); if (res == true) { access->addContact(c); } } - + delete access; - + return true; } KABC::AddresseeList QtopiaXXPort::importContacts( const QString& ) const { 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()); @@ -161,7 +160,7 @@ KABC::AddresseeList QtopiaXXPort::importContacts( const QString& ) const KMessageBox::error( parentWidget(), text ); return KABC::AddresseeList(); } - + KABC::QtopiaConverter mConverter; bool res = mConverter.init(); @@ -173,29 +172,29 @@ KABC::AddresseeList QtopiaXXPort::importContacts( const QString& ) const delete access; return KABC::AddresseeList(); } - - - - { //create a new scope + + + + { //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 ); - + + 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; - + } |