summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kaddressbook/xxport/sharpdtm/sharpdtmE.pro2
-rw-r--r--kaddressbook/xxport/sharpdtm/sharpdtm_xxport.cpp51
2 files changed, 23 insertions, 30 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
@@ -8,7 +8,7 @@ DESTDIR = $(QPEDIR)/lib
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
LIBS += -lmicrokde
LIBS += -lmicrokabc
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
@@ -53,7 +53,7 @@ $Id$
*/
#include "xxportmanager.h"
-//#include "qtopiaconverter.h"
+#include "sharpdtmconverter.h"
#include "sharpdtm_xxport.h"
@@ -100,10 +100,9 @@ bool SharpDTMXXPort::exportContacts( const KABC::AddresseeList &list, const QStr
return false;
}
-// KABC::QtopiaConverter mConverter;
+ KABC::SharpDTMConverter mConverter;
-// bool res = mConverter.init();
- bool res = true;
+ bool res = mConverter.init();
if (!res)
{
QString text( i18n( "Unable to initialize sharpdtm converter.<br>Most likely a problem with the category file." ) );
@@ -114,36 +113,31 @@ bool SharpDTMXXPort::exportContacts( const KABC::AddresseeList &list, const QStr
}
//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)
+ 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..
-
- AddressBookIterator it2(*access);
- for (it2.toFirst(); it2.current(); ++it2) {
- access->removeContact(*it2.current());
- }
- }
+ access->deleteCard(0, SlZDataBase::AllCard );
}
}
KABC::Addressee::List::ConstIterator it;
for ( it = list.begin(); it != list.end(); ++it ) {
- PimContact c;
- KABC::Addressee addressee = (*it);
+ CardId c;
+ res = access->editNewCard();
- res = mConverter.addresseeToQtopia( *it, c );
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;
@@ -155,8 +149,9 @@ KABC::AddresseeList SharpDTMXXPort::importContacts( const QString& ) const
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 ) {
@@ -166,8 +161,8 @@ KABC::AddresseeList SharpDTMXXPort::importContacts( const QString& ) const
KMessageBox::error( parentWidget(), text );
return KABC::AddresseeList();
}
-/*US
- KABC::QtopiaConverter mConverter;
+
+ KABC::SharpDTMConverter mConverter;
bool res = mConverter.init();
if (!res)
@@ -180,16 +175,15 @@ KABC::AddresseeList SharpDTMXXPort::importContacts( const QString& ) const
}
-
{ //create a new scope
- AddressBookIterator it(*access);
+ CardId id;
- for (it.toFirst(); it.current(); ++it) {
- const PimContact*contact = it.current();
+ 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 )
{
@@ -197,7 +191,6 @@ KABC::AddresseeList SharpDTMXXPort::importContacts( const QString& ) const
}
}
}
-*/
delete access;