summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/xxport/sharpdtm/sharpdtmE.pro2
-rw-r--r--kaddressbook/xxport/sharpdtm/sharpdtm_xxport.cpp103
2 files changed, 49 insertions, 56 deletions
diff --git a/kaddressbook/xxport/sharpdtm/sharpdtmE.pro b/kaddressbook/xxport/sharpdtm/sharpdtmE.pro
index 6e83853..0425c42 100644
--- a/kaddressbook/xxport/sharpdtm/sharpdtmE.pro
+++ b/kaddressbook/xxport/sharpdtm/sharpdtmE.pro
@@ -10,3 +10,3 @@ DEFINES += KAB_EMBEDDED
-INCLUDEPATH += ../.. ../../../external/sharpdtm/include ../../.. ../../../kabc ../../../kabc/converter/qtopia ../../../microkde ../../../microkde/kdeui ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat $(QPEDIR)/include
+INCLUDEPATH += ../.. ../../../external/sharpdtm/include ../../.. ../../../kabc ../../../kabc/converter/sharpdtm ../../../microkde ../../../microkde/kdeui ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat $(QPEDIR)/include
LIBS += -L$(QPEDIR)/lib
diff --git a/kaddressbook/xxport/sharpdtm/sharpdtm_xxport.cpp b/kaddressbook/xxport/sharpdtm/sharpdtm_xxport.cpp
index 4e6a504..8593814 100644
--- a/kaddressbook/xxport/sharpdtm/sharpdtm_xxport.cpp
+++ b/kaddressbook/xxport/sharpdtm/sharpdtm_xxport.cpp
@@ -55,3 +55,3 @@ $Id$
#include "xxportmanager.h"
-//#include "qtopiaconverter.h"
+#include "sharpdtmconverter.h"
@@ -92,4 +92,4 @@ bool SharpDTMXXPort::exportContacts( const KABC::AddresseeList &list, const QStr
SlZDataBase* access = new SlZDataBase(fileName,
- SlZDataBase::addressbookItems());
-
+ SlZDataBase::addressbookItems());
+
if ( !access ) {
@@ -102,6 +102,5 @@ bool SharpDTMXXPort::exportContacts( const KABC::AddresseeList &list, const QStr
-// KABC::QtopiaConverter mConverter;
-
-// bool res = mConverter.init();
- bool res = true;
+ KABC::SharpDTMConverter mConverter;
+
+ bool res = mConverter.init();
if (!res)
@@ -112,38 +111,33 @@ bool SharpDTMXXPort::exportContacts( const KABC::AddresseeList &list, const QStr
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.
-/*US
- { //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());
- }
- }
+ 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 ) {
- PimContact c;
- KABC::Addressee addressee = (*it);
-
- res = mConverter.addresseeToQtopia( *it, c );
+ CardId c;
+ res = access->editNewCard();
+
if (res == true)
{
- access->addContact(c);
- }
+ res = mConverter.addresseeToSharp( *it, access, c );
+
+ if (res == true)
+ access->finishEditCard(&c);
+ else
+ access->cancelEditCard();
+ }
}
-*/
+
delete access;
-
+
return true;
@@ -154,9 +148,10 @@ KABC::AddresseeList SharpDTMXXPort::importContacts( const QString& ) const
KABC::AddresseeList adrlst;
-
+
QString fileName = SlZDataBase::addressbookFileName();
-
+
+ // the last parameter in the SlZDataBase constructor means "readonly"
SlZDataBase* access = new SlZDataBase(fileName,
- SlZDataBase::addressbookItems());
+ SlZDataBase::addressbookItems(), NULL, true);
+
-
if ( !access ) {
@@ -168,4 +163,4 @@ KABC::AddresseeList SharpDTMXXPort::importContacts( const QString& ) const
}
-/*US
- KABC::QtopiaConverter mConverter;
+
+ KABC::SharpDTMConverter mConverter;
@@ -180,15 +175,14 @@ KABC::AddresseeList SharpDTMXXPort::importContacts( const QString& ) const
}
-
-
-
- { //create a new scope
- AddressBookIterator it(*access);
-
- for (it.toFirst(); it.current(); ++it) {
- const PimContact*contact = it.current();
-
+
+
+ { //create a new scope
+ CardId id;
+
+ for (bool res=access->first(); res == true; res=access->next()) {
+ id = access->cardId();
+
KABC::Addressee addressee;
-
- res = mConverter.qtopiaToAddressee( (*contact), addressee );
-
+
+ res = mConverter.sharpToAddressee( id, access, addressee );
+
if ( !addressee.isEmpty() && res )
@@ -199,8 +193,7 @@ KABC::AddresseeList SharpDTMXXPort::importContacts( const QString& ) const
}
-*/
-
+
delete access;
-
+
return adrlst;
-
+
}